Update mapping engine framework.
Propagating changes from blankslate branch.