Changes for new version of api