Improvements to mappings