Improvements

Improvements to UserMsg & EventCollector