Changes due to IEstimator refactoring