Added the dispatcher and save state controls to the state manager