Added a remapping functionnality