Added Support for new RHPWatch