Added support for RHPWatch