DDF-241: converted to use new catalog-core-api-impl classes