api: Registration improvements.