Upgrade for supporting cement 2.2