Added scaffolding for events