Enterprise-Class Routing Enhancements