fixup! Use FeatureStoreId instead of String