API changes from 1.5 to 1.6.