Better drag and drop support