DDF-351 Removed catalog framework dependency