Refactored RegistratedUser to User