Extract CaseMapper
Simplify code in StepMapper