Switch to class version