SQL Changes to support Waiver and Event Speedup