Added code to ignore missing substructs