added cmd support