Adding support for 'case'