Performance improvements in structuring
More performance improvements in structuring
Slight speedup in variable graph