Improve MouseEvent