Users model refactoring