Update for cement 2.4 compatibility