Updates for 6.0