Adding more case types