Adding in support for quantifiers