Finish migration to SuperClasses for customizer