Rewritting CLIClient (RSA support)