v0.15: comparators are refactored