Improved mapper utility