Added mouse handling