Added new KeyEventHandler