Changes in ROY to cover all the functional cases and fit the latest changes in push server