Added the different states and manager