Added location fields to User