added country, region, cluster, city, sector and neighborhood tables, modified other tables