Fixed: building routes