Use FeatureStoreId instead of String