Add more keycode support