Updated for ThematicMap
Updated paths