Updating for api changes