Updated user model class