My Registration refactoring