adds support for spoon models without the complete classpath
merges conflict