Merged DFA and State modules