Improve mouse support