Extending existing implementation, EventCollector implementation is still faulty.