Added switch statement support