Improvements to reporting toolset