Changes for MouseButton handling