Added data for structure and state.