Updated for server-side "graph" representation