Keyboard handling update