Added events, updated configuration