Update for Client Report extension, add new tokens