Added Command support that got missing in the merge