Add expiration conditions