Improve status reporting