CDB-3133 Moar routes