Make command line client consume the same API