Fix DOM node importing
Add metrics