Added classes for boolean model
Merge branch 'feature/core' into develop