Improving DomainDetailsHandler