cde core-refactor