Upgrade version to 2.2, replace version lookup mechanism