Changed how commands are generated