Fixed Findbugs false positive
Added support for bridging nodes