Updating to CodeGenAPI 2.2