Added more to state manager