Added some mappings
Merge origin/master