Added domain handling.