Added interpolation handling