Added Command support