Added support for switch statements