Added initial keyboard support