Divide collector into separate just-collector, legacy-proxy and new-collector/decoder