Refactored GeoIP wrapper and CMS Tagging codes