#121: renamed Comparator to CompareOperator
#122: support for Currency