Make domain mode work in core distribution