Add new mapping
Merge branch