Refactoring registration