More refactored Domain Objects