removed dependency on domain-id