Adapt to new AlgoW classes