Adding dblclick support