Update to v2.2.0 api