[OEM-224] refactoring of new reporting system