Better report handling