More refactores domain objects!