Integrated the command-line client