Fix double-adding issue
Add NonEstimatingEstimator for all field data classes that don't currently pre-estimate