More changes in order to enable the drag and drop utility