Improve Drag and Drop.. TODO fix require error