Updated Userclasses