Updated CR mapping