added support to cli clients and a simple CLI client