Refactor drop event, add more data to payload