Unnecessary template argument removed
KeyboardInput added