Fix template detection
Remove path class
Now a multimap
More stuff