Updated PR which re-populates MetadataStore