adding interpolation support