Refactored User in model