Added support for OnExpiration block