Add modular routing