Update assertion message
Refactor drag-and-drop methods