RegistrationManager re-refact :)