All persistent state moved into m_state object.