Moving AuthBundle out of Estimator and into Engine