new structure for waivers