Update to match latest api changes