Add collector support