Improve cmd structure