Expiration functionality added