Added university and ciy fields to user model