JFG-469 Refactor InformationCollector
Merge pull request #272 from kgribov/master

JFG-469 Refactor InformationCollector