Add multidomain support