improved incident reporting module