More structure added.