Added comparators and filters