Interpolator class added