Update according to api changes