Added keyboard support