small refactoring to sdmx 2 directives API