Refactor CoreHA