Refactor: don't use deprecated code
Refactor: do not resolve nodes in advance, hide impl details