Compatibility with Cement 2.4