update changes for domain model config branch