Add ConnectoAttachedMetadata and DataStoreMetadata