Update to use new keyboard and mouse handlers