Update to new celerity mapper