Changes to domain and subdomain controllers