Refactors to user model