Update for domain changes