Debugged new structure to Report generation.