Protocol structure changes