Updates to reflect api changes