added support for domain changes