Improved domain model.