Change the way to disable default key mappings
Refactoring