User class updated