More towards porting the hypergraph and pebbler