Restructuring to add sub-states.