Initial 7.0 changes