Added domain building visitors for surrogates