Add switch and case