Updated CDD and NSR mapping