Revert "domain model change"

This reverts commit 2534d213121f337ef5ff38e4858fec0e0351339b.