Handling of parametrization and inclusion/exclusion of metadata graph. Some refactoring