Add expiry switch to the change since it's a world-cup specific change