Adding support of riemann-health