Update for latest definition changes.