Improve access to state data