Improved mapping module