Update for api changes