Updated the expiration mechanism