Improve Mouse Class