Add Collector support