update for v2.0 api