Improved mouse support