Core changes to the class version