Added support for message expiration