Reduce connectivity of event_context classes