Added drag & drop support