Support for M2.4 API changes