Adding EventBuffer design