Improved domain objects