Added engine-based routing