TBD-1138 : for drag and drop