Added support for domain stripping