Completed structure changes.