Added support for interpolation