Updated the CBM converter, now with a better mapping