Feature/generator event handler