Domain Model Update
Merge branch 'master' of https://github.com/yann-malherbe/amt