The Query model classes have been refactored.
The Query model classes have been refactored again (Condition class has been moved back)
Condition checking util and support classes have been added.