Properly use unique id for domain pillow
Revert change to make domain mapping