Add StateManager