Added event buffer support