Refactor User model