Change state machine models to have connections defined explicitly