Refactoring of IEstimator