Updates to mapping