Added two interpolators to analysis.js