trying to add EstimatorMap, not very good
use EstimatorBundle to substitute EstimatorMap and EstimatorVector
merge from dev