Added Switch class