Changes to rq2 services