Rework domains to single entry
Merge pull request #1633 from spumko/domains

Rework domains to single entry