Enhance event writer