Added support for "in", "not in", "is", "is not" comparators
Added support for "for-endfor" and "for-empty-endfor"