Changed from type and format to zone and type for classification.