Simplified logic in DomainMapper