Improved domain objects for json serialization/deserialization.