Updates to User model