Improved mapping