Classes updated for switch