Initial EventQuery2 implementation
Simplified class Constraint
removed
Updated description and TODO