modified CaseModel.ts