Add updated implementaion of the java-client-lib