More dependency isolation