Updated for domain migration