Refactor DC support.