Also use the new macros for mouse event