redesign the mapping adding operation
Merge master/master