[WIP] Featurestructure extensions