Added support for event_location and production_location