More updates to the User class.