Refinements to interpolate_data