#136 partially re-worked DnD support for diagrams