Clients: Add riemann_wrapper