Rework domains to single entry

Closes #1619