Added skeleton for resurected waivers mechanism