Update to comply with WWRD update of the API