RegistrationAction refactoring