Added new fields to user model