Add keyboard + mouse support