Got a extensible domain model sorted