Add switch case to 3.1