Update to 2.2 snippet and API