Fixed command API again.
Fixed conflicted (MERGE)