Add CaseSteps and Subclasses