#: Domain structure refactor