Updated to support isolator v3