Add switch statement