Use alternative domain model
Merge pull request #11 from cssu/feature/alternative-domain-model

Use alternative domain model