Adding keyboard support