Extract OnlyCollector to top level