Add possibility to generate events