Collect more data in Analysis and fix reporters related bug