Update for new RoS API