Feature/improve bridge reachability