Changed construction to tag nodes with properties.