Several structure changes.