Add support for new configuration mechanism and add new events
New event types