Improve advanced optimization readiness