Support event buffering