[936] Use EventCollector if possible