Added multiple states and transitions per state