Improvements to reporting and groups