User class improvement