Improved state data organization