Fine tuning the Waiver document handling