Support domains on upstream