Add isolation support