         let remove = original != nil && new == nil
 
         if add {
-            dom.insertComment(comment: "Comment", at: range)
+// TODO: Load with CommentAttachment's payload
+            dom.replace(range, with: "Comment")
         } else if remove {
 // TODO: FIXME. Proper removeComment support
 //            dom.remove(element: .hr, at: range)

        let remove = original != nil && new == nil

        if add {
            dom.insertHorizontalRuler(at: range)
        } else if remove {
            dom.remove(element: .hr, at: range)
        }

                return
            }

            dom.replace(range, with: urlToAdd)
        } else if removeImageUrl {
            dom.removeImage(spanning: range)
        }
