Add isolation for new e/g clustering