More responsiveness for reporting. Issue: #370