Added Query constructor, Match constructor