Update for v2.2