Migrate code to the new collector-template

Migrate code to the new collector-template. This will possibly improve efficiency and the resource usage for the collector.