fixed & extended multi-root support