Feature/event listener context