Update for 6.0.x