Add logging to collector and extractor