Added some TODO for the generation of events