Case renamed to CaseModel and simplified