Added support for keyboard selection