Marginals are now indexed on node and edge ids