Added comparator based map, testing not yet finished [ci skip]