Modify the mapping functions