FIX Integrate command line clients for Client and Server