Added fields to UserModel