Updated CDD and SHHS mapping