Add support for restart events