Updated user model