Rework ActionBags interface