Split case types out