Added Switch Type