[minor] Domains support WIP