Added an expiration mechanism