Changed how commands are processed