Updates for v2.2