Added mouse event support