Added compatibility on domain provision