Added mouse support