Added calculated ids and node tree for use as a node lookup.