Changed User class