Add interpolation support