[CDF-205] - CDF core-refactor