Adding 'case' support back in