StructureStore no longer used here