Added TreatmentType to GridSetup