Move meta data enrichment feature to place where meta data is available