remake domain mapping