Added automata
Optimized imports