Added additional mouse support