Updated Client, Cluster to use new Stream methods