Improved edited node data model