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