API changes for 1.6.x