Update for Client Report extension, add suport dashboard tokens