Adding in Riemann support