Moved persistent state into state hash