Added support for Keyboard input