Added StateManager