Unfinished changes for array interpolation