Added more support for mouse move