Added estimator selection support