Added key mappings
Merged