Added support for keyboard