Refactoring Registration