Support re-working pieces due to invalidity or expiration