Refactoring of output data scheme.
Adapting data generator to latest output scheme changes.
Adapting classes to latest output data changes.