Additional expiration related functionality