Now uses the zone and controller GUIDs.