Added States and StateManagers