improved extrapolation report infrastructure