revised domain model