Updated for Cement 2.2