Update to reflect api changes