Fixed some conflicts
Simplified interface for sending events (arrivals / departures).