Renamed subtype to zone