Added basic interpolator management