Add expiration to events