Added cmd support