Added new switches (#238)