enhance cli command