Update for library changes
Add keyboard support