Add second level of class generation for customisation overrides