Improved mapping method.
Modify doc