additonal fixes to the domain model base types