Adding support for drag-and-drop