Support additional collectors
Merge pull request #1 from otherinbox/bp/support_additional_collectors

Support additional collectors