improve look
Imports
Update library
Use RegistrationClientInterface
Improve location