Add switch statement support