Node is now using Graph for query building