[partial] Adding a tree structure to organize the report information