Added some mouse support