Updates to User class