Refactoring key mapping. Ref #75