Added RegistrationHandler