update for consolidation of node and edge types