Refactor regional map/table code