Added switch class