Added Riemann VM support