New resolution model syntax
Merge branch 'master' of https://github.com/diverse-project/kcvl