Updated User model fields