Integrated the data structure for state properties.