Before Adding substructure variables