Added some more data collection support utils