Some structure changes.