Added expiration handler.