Added location fields to event