Further structure changes.