Little structure changes.