changed case_type and subtype to fields and used collections