added extra substructure variables.