Prepare Metadata refactoring
Update Metadata refactoring : dispatch to packages.