AEROGEAR-788 - update to use the updated APIs