Added more case handling