Improve cdp command