Added automatic expiration period