CDA Refactor