Changes to DFA class