Updated to work with world map charts and gauge charts