Edits to EstimatorClass