Added model querying conditions
Merge branch 'develop' into feature/access-control