User class updates