Work on Switch class