Upgrade to 2.2.0 API