Added double click handling