Add compatibility with new Riemann func interface