Added mouse click support