Update support for domains