Improved mapping method.