Added query processing factories
Theme factory
Fixed indent/parse error
Merge branch 'feature/entity-modeling' into develop