Class Switcher rebuild