Update for Client Report, fix token value bug, and fixing compatiple with new version of Stream plugin (2.0)