Added context to events