Improved Mouse  class