Change super class generation