Domain: Improving DomainCtrl