Upgrade entropy estimator