Fixed: void-initialization
Added: new event types