Changed commands to state machines (-SM) version