Extended the interpolations capabilities