Update changes in 6.0