Added option for numeric comparator... to be tested