Modified extrapolation infrastructure