Better handling to the kit_url