Automaton and State classes rebuilt