Work on state manager