JFG-469 Refactor InformationCollector