Added command line client