Better document modeling for the domain model.