More domain refactoring.