Added mouse-support