Updated with routing, and subscription wait.