Adding RHQ integration