Changes in domain mapping method