Added support for up/down key