Address comments: replace home-made Keys with standard KeyCode