Improve the User model