NOREF: Restructuring the class definition for these yaml files