Introduced expiration timeout management