Broader keyboard support