Improve cd mapping