Added multipath support