Added drag&drop support