Keyboard support added