More work on the User class