Update to support v1 api