Refactoring Registration model