move MetaDataExtension handling to be together