Added location/sex to user model