Update for 6.0 changes