Added missing changes to class change callback