Feature/event generator