Add support for delayed events