UPD: Completed Drag and Drop support