Turbulence Model Upgrades for Swirling Flows