Added generation of default events