Edited StringMatch and its comparator