Refactor Mapping.
Implement mapping of basic shortcuts.