Follow CollectorPlugin API change