Switch to new mapping pipeline