[ARCH] 'Domain model improvements'