Updated version of reporting module