Added double click support