More work on StructureComponent