Update for 6.0 API changes.