Merge branch 'issue-24' into 'develop-v2.1.1'

Issue 24 : simplify modeling with only instances of kind / state / property

See merge request !27