Updated state manager structure