Added features: add switch, delete switch