Moving the state actions from Automaton to States for a more fine-grained control