diff --git a/helm/development.yaml b/helm/development.yaml
index dfbcaae..65394e3 100644
--- a/helm/development.yaml
+++ b/helm/development.yaml
@@ -69,8 +69,9 @@ ingress:
     cert-manager.io/cluster-issuer: "letsencrypt-prod"
     acme.cert-manager.io/http01-edit-in-place: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    nginx.org/proxy-connect-timeout: "120s"
-    nginx.org/proxy-read-timeout: "120s"
+    nginx.org/proxy-connect-timeout: "480s"
+    nginx.org/proxy-read-timeout: "480s"
+    nginx.org/proxy-send-timeout: "480s"
     nginx.org/proxy-buffers: "8 16k"
     nginx.org/proxy-buffer-size: "16k"
     nginx.org/proxy-busy-buffers-size: "64k"
diff --git a/helm/production.yaml b/helm/production.yaml
index fdda1a8..cf0c399 100644
--- a/helm/production.yaml
+++ b/helm/production.yaml
@@ -76,11 +76,13 @@ ingress:
     nginx.org/proxy-busy-buffers-size: "64k"
     nginx.org/location-snippets: |
       add_header Access-Control-Allow-Origin *;
-  hosts:
-    - host: api-prod.datausa.io
+  customHosts:
+    - host: api-varnish.datausa.io
       paths:
-        - /
+        - path: /
+          service: varnish-tesseract-api
+          port: 8080
   tls:
     - secretName: tesseract-api-ingress-tls
       hosts: 
-        - api-prod.datausa.io
+        - api-varnish.datausa.io
diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml
index ff77c6a..84cf5e6 100644
--- a/helm/templates/ingress.yaml
+++ b/helm/templates/ingress.yaml
@@ -26,18 +26,35 @@ spec:
     {{- end }}
   {{- end }}
   rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ . }}
-            pathType: Prefix
-            backend:
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $servicePort }}
-          {{- end }}
-    {{- end }}
+    {{ if .Values.ingress.customHosts }}
+      {{- range .Values.ingress.customHosts }}
+      - host: {{ .host | quote }}
+        http:
+          paths:
+            {{- range .paths }}
+            - path: {{ .path }}
+              pathType: Prefix
+              backend:
+                service:
+                  name: {{ .service }}
+                  port:
+                    number: {{ .port }}
+            {{- end }}
+      {{- end }}
+    {{ else }}
+      {{- range .Values.ingress.hosts }}
+      - host: {{ .host | quote }}
+        http:
+          paths:
+            {{- range .paths }}
+            - path: {{ . }}
+              pathType: Prefix
+              backend:
+                service:
+                  name: {{ $fullName }}
+                  port:
+                    number: {{ $servicePort }}
+            {{- end }}
+      {{- end }}
+    {{ end }}
 {{- end }}
diff --git a/pyproject.toml b/pyproject.toml
index a37b498..c14ad44 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,10 +6,10 @@ authors = ["Francisco Abarzua <git.id@frabarz.cl>"]
 license = "MIT"
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 logiclayer = "^0.2.1"
-logiclayer-complexity = "^0.2.1"
-tesseract-olap = {extras = ["clickhouse"], version = "^0.7.0"}
+logiclayer-complexity = "^0.4.1"
+tesseract-olap = {extras = ["clickhouse"], version = "^0.8.3"}
 uvicorn = {extras = ["standard"], version = "^0.18.0"}
 
 [tool.poetry.dev-dependencies]
diff --git a/requirements.txt b/requirements.txt
index caec3f3..b1eaa0d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,42 +1,47 @@
-anyio==3.7.0
-asynch==0.2.2
-asyncio==3.4.3
-backports-zoneinfo==0.2.1
-certifi==2023.5.7
-ciso8601==2.3.0
-click==8.1.3
-clickhouse-cityhash==1.0.2.4
-economic-complexity==0.1.3
-exceptiongroup==1.1.1
-fastapi==0.95.2
-h11==0.14.0
-httpcore==0.17.2
-httptools==0.5.0
-httpx==0.24.1
-idna==3.4
-immutables==0.19
-leb128==1.0.5
-logiclayer==0.2.1
-logiclayer-complexity==0.2.1
-lxml==4.9.2
-lz4==4.3.2
-numpy==1.24.3
-orjson==3.9.0
-pandas==1.5.3
-pydantic==1.10.8
-pypika==0.48.9
-python-dateutil==2.8.2
-python-dotenv==1.0.0
-pytz==2023.3
-pyyaml==6.0
-six==1.16.0
-sniffio==1.3.0
-starlette==0.27.0
-tesseract-olap==0.7.2
-typing-extensions==4.6.3
-tzlocal==5.0.1
-uvicorn==0.22.0
-uvloop==0.17.0
-watchfiles==0.19.0
-websockets==11.0.3
-zstd==1.5.5.1
+annotated-types==0.6.0 ; python_version >= "3.8" and python_version < "4.0"
+anyio==4.3.0 ; python_version >= "3.8" and python_version < "4.0"
+asynch==0.2.3 ; python_version >= "3.8" and python_version < "4.0"
+asyncio==3.4.3 ; python_version >= "3.8" and python_version < "4.0"
+backports-zoneinfo==0.2.1 ; python_version >= "3.8" and python_version < "3.9"
+certifi==2024.2.2 ; python_version >= "3.8" and python_version < "4.0"
+ciso8601==2.3.1 ; python_version >= "3.8" and python_version < "4.0"
+click==8.1.7 ; python_version >= "3.8" and python_version < "4.0"
+colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows"
+economic-complexity==0.2.2 ; python_version >= "3.8" and python_version < "4.0"
+exceptiongroup==1.2.0 ; python_version >= "3.8" and python_version < "3.11"
+fastapi==0.110.0 ; python_version >= "3.8" and python_version < "4.0"
+h11==0.14.0 ; python_version >= "3.8" and python_version < "4.0"
+httpcore==1.0.4 ; python_version >= "3.8" and python_version < "4.0"
+httptools==0.6.1 ; python_version >= "3.8" and python_version < "4.0"
+httpx==0.27.0 ; python_version >= "3.8" and python_version < "4.0"
+idna==3.6 ; python_version >= "3.8" and python_version < "4.0"
+immutables==0.20 ; python_version >= "3.8" and python_version < "4.0"
+leb128==1.0.7 ; python_version >= "3.8" and python_version < "4.0"
+logiclayer-complexity==0.4.1 ; python_version >= "3.8" and python_version < "4.0"
+logiclayer==0.2.1 ; python_version >= "3.8" and python_version < "4.0"
+lxml==4.9.4 ; python_version >= "3.8" and python_version < "4.0"
+lz4==4.3.3 ; python_version >= "3.8" and python_version < "4.0"
+numpy==1.24.4 ; python_version >= "3.8" and python_version < "3.9"
+numpy==1.26.4 ; python_version >= "3.9" and python_version < "4.0"
+orjson==3.9.15 ; python_version >= "3.8" and python_version < "4.0"
+pandas==2.0.3 ; python_version >= "3.8" and python_version < "4.0"
+pydantic-core==2.16.3 ; python_version >= "3.8" and python_version < "4.0"
+pydantic==2.6.4 ; python_version >= "3.8" and python_version < "4.0"
+pypika==0.48.9 ; python_version >= "3.8" and python_version < "4.0"
+python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "4.0"
+python-dotenv==1.0.1 ; python_version >= "3.8" and python_version < "4.0"
+pytz==2024.1 ; python_version >= "3.8" and python_version < "4.0"
+pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "4.0"
+six==1.16.0 ; python_version >= "3.8" and python_version < "4.0"
+sniffio==1.3.1 ; python_version >= "3.8" and python_version < "4.0"
+starlette==0.36.3 ; python_version >= "3.8" and python_version < "4.0"
+tesseract-olap==0.8.3 ; python_version >= "3.8" and python_version < "4.0"
+tesseract-olap[clickhouse]==0.8.3 ; python_version >= "3.8" and python_version < "4.0"
+typing-extensions==4.10.0 ; python_version >= "3.8" and python_version < "4.0"
+tzdata==2024.1 ; python_version >= "3.8" and python_version < "4.0"
+tzlocal==5.2 ; python_version >= "3.8" and python_version < "4.0"
+uvicorn[standard]==0.18.3 ; python_version >= "3.8" and python_version < "4.0"
+uvloop==0.19.0 ; sys_platform != "win32" and sys_platform != "cygwin" and platform_python_implementation != "PyPy" and python_version >= "3.8" and python_version < "4.0"
+watchfiles==0.21.0 ; python_version >= "3.8" and python_version < "4.0"
+websockets==12.0 ; python_version >= "3.8" and python_version < "4.0"
+zstd==1.5.5.1 ; python_version >= "3.8" and python_version < "4.0"
diff --git a/schema/acs_ygl_language_spoken_at_home_by_english_ability_2016_1.xml b/schema/acs_ygl_language_spoken_at_home_by_english_ability_2016_1.xml
deleted file mode 100644
index 937e0eb..0000000
--- a/schema/acs_ygl_language_spoken_at_home_by_english_ability_2016_1.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<Schema name="tesseract-api" default_locale="en"> 
-  <Cube name="acs_ygl_language_spoken_at_home_by_english_ability_2016_1" subset_table="true">
-      <Annotation name="source_name">Census Bureau</Annotation>
-      <Annotation name="source_description">The American Community Survey (ACS) is conducted by the US Census and sent to a portion of the population every year.</Annotation>
-      <Annotation name="dataset_name">ACS 1-year Estimate</Annotation>
-      <Annotation name="dataset_link">http://www.census.gov/programs-surveys/acs/</Annotation>
-      <Annotation name="table_id">B16001</Annotation>
-      <!--<Annotation name="topic">Diversity</Annotation>
-      <Annotation name="subtopic">Heritage</Annotation>-->
-
-      <Table name="acs_ygl_language_spoken_at_home_by_english_ability_2016_1"/>
-
-      <Dimension name="Geography" foreign_key="geoid" default_hierarchy="Nation">
-        <Hierarchy name="Nation" > <!--default_member="Nation.US"-->
-          <Table name="shapes2017_us" />
-          <Level key_column="geoid" name="Nation" name_column="name" key_type="str"/>
-        </Hierarchy>
-        <!--<Hierarchy name="Tract">
-          <Table name="shapes2017_tracts" />
-          <Level key_column="state_id" name="State" name_column="state_name" key_type="str" />
-          <Level key_column="county_id" name="County" name_column="county_name" key_type="str" />
-          <Level key_column="geoid" name="Tract" name_column="name" key_type="str">
-            <Property name="Area Tract" key_column="aland" />
-          </Level>
-        </Hierarchy>-->
-        <Hierarchy name="Place">
-          <Table name="shapes2017_places" />
-          <Level key_column="state_id" name="State Place" name_column="state_name" key_type="str"/>
-          <Level key_column="geoid" name="Place" name_column="name" key_type="str">
-            <Property name="Area Place" key_column="aland" />
-          </Level>
-        </Hierarchy>
-        <Hierarchy name="County">
-          <Table name="shapes2017_counties" />
-          <Level key_column="state_id" name="State County" name_column="state_name" key_type="str"/>
-          <Level key_column="geoid" name="County" name_column="name" key_type="str">
-            <Property name="Area County" key_column="aland" />
-          </Level>
-        </Hierarchy>
-        <Hierarchy name="State">
-          <Table name="shapes2017_states" />
-          <Level key_column="geoid" name="State" name_column="name" key_type="str">
-            <Property name="Area State" key_column="aland" />
-          </Level>
-        </Hierarchy>
-        <Hierarchy name="MSA">
-          <Table name="shapes2017_msas" />
-          <Level key_column="geoid" name="MSA" name_column="name" key_type="str">
-            <Property name="Area MSA" key_column="aland" />
-          </Level>
-        </Hierarchy>
-        <Hierarchy name="PUMA">
-          <Table name="shapes2017_pumas" />
-          <Level key_column="state_id" name="State Puma" name_column="state_name" />
-          <Level key_column="geoid" name="PUMA" name_column="name" key_type="str">
-            <Property name="Area Puma" key_column="aland10" />
-          </Level>
-        </Hierarchy>
-        <!--<Hierarchy name="Zip">
-          <Table name="shapes2017_zips" />
-          <Level key_column="geoid" name="Zip" name_column="zcta5ce10" key_type="str">
-            <Property name="Area" key_column="aland10" />
-          </Level>
-        </Hierarchy>
-        <Hierarchy name="County Subdivision">
-          <Table name="county_subdivisions" schema="shapes2017"/>
-          <Level key_column="state_id" name="State" name_column="state_name" key_type="str"/>
-          <Level key_column="county_id" name="County" name_column="county_name" key_type="str"/>
-          <Level key_column="geoid" name="County Subdivision" name_column="name" key_type="str">
-            <Property name="Area" key_column="aland" />
-          </Level>
-        </Hierarchy>
-        <Hierarchy name="Place-Tract">
-          <Table name="shapes2017_tracts" />
-          <Level key_column="place_id" name="Place" name_column="place_description" key_type="str" />
-          <Level key_column="geoid" name="Place-Tract" name_column="name" key_type="str" >
-            <Property name="Area" key_column="aland" />
-          </Level>
-        </Hierarchy>
-        <Hierarchy name="MSA-Tract">
-          <Table name="shapes2017_tracts" />
-          <Level key_column="msa_id" name="MSA" name_column="msa_description" key_type="str" />
-          <Level key_column="geoid" name="MSA-Tract" name_column="name" key_type="str">
-            <Property name="Area" key_column="aland" />
-          </Level>
-        </Hierarchy>-->
-      </Dimension>
-
-      <Dimension name="Year" foreign_key="year" type="time">
-        <Hierarchy name="Year" primary_key="year">
-          <Level name="Year" key_column="year" key_type="u16"/>
-        </Hierarchy>
-      </Dimension>
-  
-      <Dimension foreign_key="dim_0" name="Language Spoken at Home">
-      
-        <Hierarchy name="Language Spoken at Home">
-          <InlineTable name="dim_0_table" format="tuples">
-            <Row>("member_0_code", "member_0")</Row>
-            <Row>(0, "Speak Only English")</Row>
-            <Row>(1, "Spanish")</Row>
-            <Row>(2, "French (Incl. Cajun)")</Row>
-            <Row>(3, "Haitian")</Row>
-            <Row>(4, "Italian")</Row>
-            <Row>(5, "Portuguese")</Row>
-            <Row>(6, "German")</Row>
-            <Row>(7, "Yiddish, Pennsylvania Dutch or Other West Germanic Languages")</Row>
-            <Row>(8, "Greek")</Row>
-            <Row>(9, "Russian")</Row>
-            <Row>(10, "Polish")</Row>
-            <Row>(11, "Serbo-Croatian")</Row>
-            <Row>(12, "Ukrainian or Other Slavic Languages")</Row>
-            <Row>(13, "Armenian")</Row>
-            <Row>(14, "Persian (Incl. Farsi, Dari)")</Row>
-            <Row>(15, "Gujarati")</Row>
-            <Row>(16, "Hindi")</Row>
-            <Row>(17, "Urdu")</Row>
-            <Row>(18, "Punjabi")</Row>
-            <Row>(19, "Bengali")</Row>
-            <Row>(20, "Nepali, Marathi, or Other Indic Languages")</Row>
-            <Row>(21, "Other Indo-European Languages")</Row>
-            <Row>(22, "Telugu")</Row>
-            <Row>(23, "Tamil")</Row>
-            <Row>(24, "Malayalam, Kannada, or Other Dravidian Languages")</Row>
-            <Row>(25, "Chinese (Incl. Mandarin, Cantonese)")</Row>
-            <Row>(26, "Japanese")</Row>
-            <Row>(27, "Korean")</Row>
-            <Row>(28, "Hmong")</Row>
-            <Row>(29, "Vietnamese")</Row>
-            <Row>(30, "Khmer")</Row>
-            <Row>(31, "Thai, Lao, or Other Tai-Kadai Languages")</Row>
-            <Row>(32, "Other Languages of Asia")</Row>
-            <Row>(33, "Tagalog (Incl. Filipino)")</Row>
-            <Row>(34, "Ilocano, Samoan, Hawaiian, or Other Austronesian Languages")</Row>
-            <Row>(35, "Arabic")</Row>
-            <Row>(36, "Hebrew")</Row>
-            <Row>(37, "Amharic, Somali, or Other Afro-Asiatic Languages")</Row>
-            <Row>(38, "Yoruba, Twi, Igbo, or Other Languages of Western Africa")</Row>
-            <Row>(39, "Swahili or Other Languages of Central, Eastern, &amp; Southern Africa")</Row>
-            <Row>(40, "Navajo")</Row>
-            <Row>(41, "Other Native Languages of North America")</Row>
-            <Row>(42, "Other &amp; Unspecified Languages")</Row>
-          </InlineTable>
-        <Level key_column="member_0_code" name="Language Spoken at Home" name_column="member_0"/>
-      </Hierarchy>
-    </Dimension>
-  
-    <Dimension foreign_key="dim_1" name="English Ability">
-      
-      <Hierarchy name="English Ability">
-        <InlineTable name="dim_1_table" format="tuples">
-          <Row>("member_0_code", "member_0")</Row>
-          <Row>(0,"Speak English&quot;very Well&quot;")</Row>
-          <Row>(1,"Speak English Less Than&quot;very Well&quot;")</Row>
-        </InlineTable>
-        <Level key_column="member_0_code" name="English Ability" name_column="member_0"/>
-      </Hierarchy>
-    </Dimension>
-
-    <Measure aggregator="sum" key_column="mea" name="Languages Spoken">
-      <Annotation name="aggregation_method">SUM</Annotation>
-      <Annotation name="units_of_measurement">People</Annotation>
-    </Measure>
-  </Cube>
-</Schema>
\ No newline at end of file
diff --git a/schema/bls_ces.xml b/schema/bls_ces.xml
new file mode 100644
index 0000000..ad1f50e
--- /dev/null
+++ b/schema/bls_ces.xml
@@ -0,0 +1,37 @@
+<Schema name="datausa" default_locale="en">
+    <Cube name="bls_ces">
+        <Annotation name="source_name">Bureau of Labor Statistics</Annotation>
+        <Annotation name="source_description">The Bureau of Labor Statistics (BLS) of the U.S. Department of Labor is the principal federal agency responsible for measuring labor market activity, working conditions, and price changes in the economy.</Annotation>
+        <Annotation name="dataset_name">Current Employment Statistics</Annotation>
+        <Annotation name="dataset_link">https://www.bls.gov/ces/</Annotation>
+        <Annotation name="topic">Economy</Annotation>
+        <Annotation name="subtopic">Industry</Annotation>
+
+        <Table name="bls_ces"/>
+
+        <Dimension name="Year" foreign_key="year" type="time">  
+            <Annotation name="dim_type">TIME</Annotation>
+            <Hierarchy name="Year" primary_key="year">
+                <Level name="Year" key_column="year" key_type="u16"/>
+            </Hierarchy>
+        </Dimension>
+
+        <DimensionUsage name="BLS Industry Flat" source="BLS Industry Flat" foreign_key="naics_code" />
+
+        <Measure aggregator="avg" key_column="avg_hrly_earnings" name="Industry Average Hourly Earnings" visible="true">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">AVG</Annotation>
+            <Annotation name="units_of_measurement">USD</Annotation>
+        </Measure>
+        <Measure aggregator="avg" key_column="avg_weekly_hours" name="Industry Average Weekly Hours" visible="true">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">AVG</Annotation>
+            <Annotation name="units_of_measurement">Hours</Annotation>
+        </Measure>
+        <Measure aggregator="sum" key_column="employees_thousands" name="Industry Employees Thousands" visible="true">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">SUM</Annotation>
+            <Annotation name="units_of_measurement">Employees</Annotation>
+        </Measure>
+    </Cube>
+</Schema>
\ No newline at end of file
diff --git a/schema/bls_employment_industry_only.xml b/schema/bls_employment_industry_only.xml
index 6dd0992..88029af 100644
--- a/schema/bls_employment_industry_only.xml
+++ b/schema/bls_employment_industry_only.xml
@@ -17,10 +17,10 @@
           </Hierarchy>
         </Dimension>
 
-        <Dimension name="Employment State" foreign_key="state_id" >
-          <Hierarchy name="Employment State" primary_key="state_id">
+        <Dimension name="State" foreign_key="state_id" >
+          <Hierarchy name="State" primary_key="state_id">
             <Table name="dim_state" />
-            <Level name="Employment State" key_column="state_id" name_column="state_name" key_type="str"/>
+            <Level name="State" key_column="state_id" name_column="state_name" key_type="str"/>
           </Hierarchy>
         </Dimension>
 
diff --git a/schema/bls_employment_supersector_only.xml b/schema/bls_employment_supersector_only.xml
index a3fd025..b95d07f 100644
--- a/schema/bls_employment_supersector_only.xml
+++ b/schema/bls_employment_supersector_only.xml
@@ -16,10 +16,10 @@
           </Hierarchy>
         </Dimension>
 
-        <Dimension name="Employment State" foreign_key="state_id" >
-          <Hierarchy name="Employment State" primary_key="state_id">
+        <Dimension name="State" foreign_key="state_id" >
+          <Hierarchy name="State" primary_key="state_id">
             <Table name="dim_state" />
-            <Level name="Employment State" key_column="state_id" name_column="state_name" key_type="str"/>
+            <Level name="State" key_column="state_id" name_column="state_name" key_type="str"/>
           </Hierarchy>
         </Dimension>
 
diff --git a/schema/bls_flat_industry.xml b/schema/bls_flat_industry.xml
new file mode 100644
index 0000000..4148416
--- /dev/null
+++ b/schema/bls_flat_industry.xml
@@ -0,0 +1,8 @@
+<Schema name="tesseract-api" default_locale="en">
+    <SharedDimension name="BLS Industry Flat">
+        <Hierarchy name="BLS Industry Flat">
+            <Table name="dim_flat_bls_industry" />
+            <Level key_column="bls_code" name_column="name" name="Industry" key_type="str"/>
+        </Hierarchy>
+    </SharedDimension>
+</Schema>
diff --git a/schema/bls_growth_industry.xml b/schema/bls_growth_industry.xml
new file mode 100644
index 0000000..63df256
--- /dev/null
+++ b/schema/bls_growth_industry.xml
@@ -0,0 +1,54 @@
+<Schema name="tesseract-api" default_locale="en">
+    <Cube name="bls_growth_industry">
+        <Annotation name="source_name">Bureau of Labor Statistics</Annotation>
+        <Annotation name="source_description">The Bureau of Labor Statistics (BLS) of the U.S. Department of Labor is the principal federal agency responsible for measuring labor market activity, working conditions, and price changes in the economy.</Annotation>
+        <Annotation name="dataset_name">BLS Statistics by Industry, Growth</Annotation>
+        <Annotation name="dataset_link">https://www.bls.gov/bls/industry.htm</Annotation>
+        <Annotation name="topic">Economy</Annotation>
+        <Annotation name="subtopic">Industry</Annotation>
+
+        <Table name="bls_growth_industry" />
+
+        <Dimension name="Year" foreign_key="year" type="time">  
+            <Annotation name="dim_type">TIME</Annotation>
+            <Hierarchy name="Year" primary_key="year">
+                <Level name="Year" key_column="year" key_type="u16"/>
+            </Hierarchy>
+        </Dimension>
+
+        <DimensionUsage name="BLS Industry Flat" source="BLS Industry Flat" foreign_key="naics_code" />
+      
+        <Measure aggregator="avg" key_column="emp" name="Industry Jobs">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">SUM</Annotation>
+            <Annotation name="units_of_measurement">Jobs</Annotation>
+        </Measure>
+
+        <Measure aggregator="avg" key_column="emp_change" name="Industry Jobs Change">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">SUM</Annotation>
+            <Annotation name="units_of_measurement">Jobs</Annotation>
+        </Measure>
+
+        <Measure aggregator="avg" key_column="emp_carc" name="Industry Jobs CARC">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">CARC</Annotation>
+            <Annotation name="units_of_measurement">Rate</Annotation>
+            <Annotation name="details">Compound Annual Rate of Change</Annotation>
+        </Measure>
+
+        <Measure aggregator="avg" key_column="output_billions" name="Industry Output">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">SUM</Annotation>
+            <Annotation name="units_of_measurement">USD</Annotation>
+            <Annotation name="details">Billions of Chained 2009 Dollars</Annotation>
+        </Measure>
+        
+        <Measure aggregator="avg" key_column="output_carc" name="Industry Output CARC">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">CARC</Annotation>
+            <Annotation name="units_of_measurement">Rate</Annotation>
+            <Annotation name="details">Compound Annual Rate of Change</Annotation>
+        </Measure>
+    </Cube>
+</Schema>
\ No newline at end of file
diff --git a/schema/bls_growth_occupation.xml b/schema/bls_growth_occupation.xml
new file mode 100644
index 0000000..4d33bc9
--- /dev/null
+++ b/schema/bls_growth_occupation.xml
@@ -0,0 +1,52 @@
+<Schema name="datausa" default_locale="en">
+    <Cube name="bls_growth_occupation">
+        <Annotation name="source_name">Bureau of Labor Statistics</Annotation>
+        <Annotation name="source_description">The Bureau of Labor Statistics (BLS) of the U.S. Department of Labor is the principal federal agency responsible for measuring labor market activity, working conditions, and price changes in the economy.</Annotation>
+        <Annotation name="dataset_name">BLS Statistics by Occupation, Growth</Annotation>
+        <Annotation name="dataset_link">https://www.bls.gov/bls/occupation.htm</Annotation>
+        <Annotation name="topic">Economy</Annotation>
+        <Annotation name="subtopic">Occupation</Annotation>
+
+        <Table name="bls_growth_occupation"  />
+
+        <Dimension name="Year" foreign_key="year" type="time">  
+            <Annotation name="dim_type">TIME</Annotation>
+            <Hierarchy name="Year" primary_key="year">
+                <Level name="Year" key_column="year" key_type="u16"/>
+            </Hierarchy>
+        </Dimension>
+
+        <DimensionUsage name="BLS Occupation Flat" source="BLS Occupation Flat" foreign_key="bls_soc" />
+
+        <Measure aggregator="avg" key_column="emp" name="Occupation Employment">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">SUM</Annotation>
+            <Annotation name="units_of_measurement">Employment</Annotation>
+        </Measure>
+
+        <Measure aggregator="avg" key_column="emp_pct" name="Occupation Employment Percent">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">Percent</Annotation>
+            <Annotation name="units_of_measurement">Percent</Annotation>
+        </Measure>
+
+        <Measure aggregator="avg" key_column="emp_change" name="Occupation Employment Change">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">Change</Annotation>
+            <Annotation name="units_of_measurement">Employment</Annotation>
+        </Measure>
+
+        <Measure aggregator="avg" key_column="emp_change_pct" name="Occupation Employment Change Percent">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">Change Percent</Annotation>
+            <Annotation name="units_of_measurement">Percent</Annotation>
+        </Measure>
+
+        <Measure aggregator="avg" key_column="occ_openings" name="Occupation Employment Openings">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">SUM</Annotation>
+            <Annotation name="units_of_measurement">Openings</Annotation>
+            <Annotation name="details">Projected Occupation Openings</Annotation>
+        </Measure>
+    </Cube>
+</Schema>
\ No newline at end of file
diff --git a/schema/bls_occupation_flat.xml b/schema/bls_occupation_flat.xml
new file mode 100644
index 0000000..263d779
--- /dev/null
+++ b/schema/bls_occupation_flat.xml
@@ -0,0 +1,8 @@
+<Schema name="tesseract-api" default_locale="en">
+    <SharedDimension name="BLS Occupation Flat">
+        <Hierarchy name="BLS Occupation Flat">
+            <Table name="dim_flat_bls_occupation"/>
+            <Level key_column="bls_code" name_column="name" name="Occupation"/>
+        </Hierarchy>
+    </SharedDimension>
+</Schema>
\ No newline at end of file
diff --git a/schema/health_estimates_of_chronically_homeless_individuals.xml b/schema/health_estimates_of_chronically_homeless_individuals.xml
new file mode 100644
index 0000000..76f8586
--- /dev/null
+++ b/schema/health_estimates_of_chronically_homeless_individuals.xml
@@ -0,0 +1,33 @@
+<Schema name="datausa" default_locale="en">
+    <Cube name="health_estimates_of_chronically_homeless_individuals">
+        <Annotation name="source_name">Department of Housing and Urban Development (HUD)</Annotation>
+        <Annotation name="source_description">Part 1 of the Annual Homeless Assessment Report to Congress (AHAR) provides Point-inTime (PIT) estimates, offering a snapshot of homelessness—both sheltered and unsheltered— on a single night. The PIT counts also provide an estimate of the number of people experiencing homelessness within particular homeless populations, such as people with chronic patterns of homelessness and veterans experiencing homelessness.</Annotation>
+        <Annotation name="source_link">http://hud.gov/</Annotation>
+        <Annotation name="dataset_name">The 2017 Annual Homeless Assessment Report (AHAR) to Congress, Part 1</Annotation>
+        <Annotation name="dataset_link">https://www.hudexchange.info/resources/documents/2017-AHAR-Part-1.pdf</Annotation>
+        <Annotation name="subtopic">Drivers of Health</Annotation>
+        <Annotation name="topic">Health</Annotation>
+
+        <Table name="health_estimates_of_chronically_homeless_individuals"/>
+
+        <Dimension name="Year" foreign_key="year" type="time">  
+            <Hierarchy name="Year" primary_key="year">
+                <Level name="Year" key_column="year" key_type="u16"/>
+            </Hierarchy>
+        </Dimension>
+
+        <Dimension name="Geography" foreign_key="geo">
+            <Annotation name="dim_type">GEOGRAPHY</Annotation>
+
+            <Hierarchy name="State">
+                <Table name="states_shapes2017"/>
+                <Level key_column="geoid"  name="State" name_column="name"/>
+            </Hierarchy>
+        </Dimension>
+
+        <Measure aggregator="median" name="Estimates of Chronically Homeless Individuals" key_column="state_chronically_homeless_individuals">
+            <Annotation name="details">A chronically homeless individual refers to an individual with a disability who has been continuously homeless for one year or more or has experienced at least four episodes of homelessness in the last three years where the combined length of time homeless in those occasions is at least 12 months.</Annotation>
+            <Annotation name="units_of_measurement">Number</Annotation>
+        </Measure>
+    </Cube>
+</Schema>
\ No newline at end of file
diff --git a/schema/health_opioid_overdose_deathrate.xml b/schema/health_opioid_overdose_deathrate.xml
new file mode 100644
index 0000000..d998e80
--- /dev/null
+++ b/schema/health_opioid_overdose_deathrate.xml
@@ -0,0 +1,42 @@
+<Schema name="datausa" default_locale="en">
+    <Cube name="health_opioid_overdose_deathrate" subset_table="true">
+        <Annotation name="source_name">Kaiser Family Foundation</Annotation>
+        <Annotation name="source_description">State Health Facts provides free, up-to-date, health data for all 50 states, the District of Columbia, the United States, counties, territories, and other geographies.</Annotation>
+        <Annotation name="source_link">https://www.kff.org/</Annotation>
+        <Annotation name="dataset_name">State Health Facts</Annotation>
+        <Annotation name="dataset_link">https://www.kff.org/other/state-indicator/opioid-overdose-death-rates/?currentTimeframe=0&amp;sortModel=%7B%22colId%22:%22Location%22,%22sort%22:%22asc%22%7D</Annotation>
+        <Annotation name="subtopic">Behavioral Health Conditions</Annotation>
+        <Annotation name="topic">Health</Annotation>
+
+        <Table name="health_opioid_overdose_deathrate"/>
+
+        <Dimension name="Year" foreign_key="year" type="time">  
+            <Hierarchy name="Year">
+                <Level name="Year" key_column="year" key_type="u16"/>
+            </Hierarchy>
+        </Dimension>
+
+        <Dimension name="Geography" foreign_key="geo" default_hierarchy="Nation">
+            <Hierarchy name="Nation">
+                <Table name="us_nation"/>
+                <Level key_column="geoid"  name="Nation" name_column="name"/>
+            </Hierarchy>
+
+            <Hierarchy name="State">
+                <Table name="states_shapes2017"/>
+                <Level key_column="geoid"  name="State" name_column="name"/>
+            </Hierarchy>
+
+            <Hierarchy name="County">
+                <Table name="counties_shapes2017"/>
+                <Level key_column="state_id"  name="State County" name_column="state_name"/>
+                <Level key_column="geoid"  name="County" name_column="name"/>
+            </Hierarchy>
+        </Dimension>
+
+        <Measure aggregator="median" name="Opioid overdose death rate" key_column="opioid_overdose_deathrate">
+            <Annotation name="details">Among the deaths with drug overdose as the underlying cause, the type of opioid involved is indicated by ICD-10 multiple cause-of-death codes. Age-adjusted death rates were calculated by applying age-specific death rates to the 2000 U.S. standard population age distribution.</Annotation>
+            <Annotation name="units_of_measurement">People</Annotation>
+        </Measure>
+    </Cube>
+</Schema>
\ No newline at end of file
diff --git a/schema/onet_by_pums.xml b/schema/onet_by_pums.xml
index 00263e9..a1ab8aa 100644
--- a/schema/onet_by_pums.xml
+++ b/schema/onet_by_pums.xml
@@ -20,29 +20,23 @@
         </Dimension>
 
         <Measure aggregator="avg" key_column="im" name="IM Value">
-            <Annotations>
-                <Annotation name="aggregation_method">NONE</Annotation>
-                <Annotation name="units_of_measurement">NONE</Annotation>
-                <Annotation name="details">Not used for presentation</Annotation>
-                <Annotation name="hide_in_ui">true</Annotation>
-            </Annotations>
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="units_of_measurement">NONE</Annotation>
+            <Annotation name="details">Not used for presentation</Annotation>
+            <Annotation name="hide_in_ui">true</Annotation>
         </Measure>
 
         <Measure aggregator="avg" key_column="lv" name="LV Value">
-            <Annotations>
-                <Annotation name="aggregation_method">NONE</Annotation>
-                <Annotation name="units_of_measurement">NONE</Annotation>
-                <Annotation name="details">Not used for presentation</Annotation>
-                <Annotation name="hide_in_ui">true</Annotation>
-            </Annotations>
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="units_of_measurement">NONE</Annotation>
+            <Annotation name="details">Not used for presentation</Annotation>
+            <Annotation name="hide_in_ui">true</Annotation>
         </Measure>
 
         <Measure aggregator="avg" key_column="total_score" name="Total Score">
-            <Annotations>
-                <Annotation name="aggregation_method">NONE</Annotation>
-                <Annotation name="units_of_measurement">NONE</Annotation>
-                <Annotation name="details">Calculated by IM Value * LV Value</Annotation>
-            </Annotations>
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="units_of_measurement">NONE</Annotation>
+            <Annotation name="details">Calculated by IM Value * LV Value</Annotation>
         </Measure>
     </Cube>
 </Schema>
\ No newline at end of file
diff --git a/schema/usa_spending.xml b/schema/usa_spending.xml
new file mode 100644
index 0000000..2e6e539
--- /dev/null
+++ b/schema/usa_spending.xml
@@ -0,0 +1,103 @@
+<Schema name="datausa" default_locale="en">
+    <Cube name="usa_spending" subset_table="true">
+        <Annotation name="source_name">USAspending.gov</Annotation>
+        <Annotation name="source_link">https://www.usaspending.gov/</Annotation>
+        <Annotation name="dataset_name">Award Data Archive</Annotation>
+        <Annotation name="dataset_link">https://www.usaspending.gov/</Annotation>
+        <Annotation name="topic">Economy</Annotation>
+        <Annotation name="subtopic">Government Spending</Annotation>
+        <Annotation name="source_description">USA Spending provides a big-picture view of the federal spending landscape.</Annotation>
+
+        <Table name="usa_spending"  />
+        
+        <Dimension name="Geography" foreign_key="fips_county" default_hierarchy="Nation">
+            <Hierarchy name="Nation" >
+                <Table name="us_nation"/>
+                <Level key_column="geoid"  name="Nation" name_column="name"/>
+            </Hierarchy>
+        
+            <Hierarchy name="County" >
+              <Table name="counties_shapes2017" />
+              <Level name="State" key_column="state_id" name_column="state_name" />
+              <Level name="County" key_column="geoid" name_column="name" />
+            </Hierarchy>
+        </Dimension>
+
+        <Dimension name="Action Date" type="time" foreign_key="action_date">
+          <Annotation name="dim_type">TIME</Annotation>
+    
+          <Hierarchy name="Action Date" >
+            <Table name="dim_date"/>
+            <Level name="Year" key_column="year"   />
+            <Level name="Quarter" key_column="quarter" />
+            <Level name="Month" key_column="month"  />
+            <Level name="Day" key_column="date_id" name_column="day"/>
+          </Hierarchy>
+        </Dimension>
+
+        <Dimension name="Fiscal Year" foreign_key="fiscal_year" type="time">  
+            <Hierarchy name="Fiscal Year">
+                <Level name="Fiscal Year" key_column="fiscal_year" key_type="u16"/>
+            </Hierarchy>
+        </Dimension>
+
+        <Dimension foreign_key="transaction_type_id" name="Transaction Type">
+      
+          <Hierarchy name="Transaction Type">
+            <InlineTable name="dim_type" format="tuples">
+              <Row>("transaction_type_id", "transaction_type", "transaction_type_parent")</Row>
+              <Row>(0, "Contract", "Contract")</Row>
+              <Row>(2, "Block grant", "Grant")</Row>
+              <Row>(3, "Formula grant", "Grant")</Row>
+              <Row>(4, "Project grant", "Grant")</Row>
+              <Row>(5, "Cooperative agreement", "Grant")</Row>
+              <Row>(6, "Direct payment for specified use, as a subsidy or other non-reimbursable direct financial aid", "Direct payments")</Row>
+              <Row>(7, "Direct loan", "Loans")</Row>
+              <Row>(8, "Guaranteed/insured loan", "Loans")</Row>
+              <Row>(9, "Insurance", "Other")</Row>
+              <Row>(10, "Direct payment with unrestricted use (retirement, pension, veterans benefits, etc.)", "Direct payments")</Row>
+              <Row>(11, "Other reimbursable, contingent, intangible, or indirect financial assistance", "Other")</Row>
+            </InlineTable>
+
+            <Level name="Transaction Type Parent" key_column="transaction_type_parent"  />
+            <Level name="Transaction Type" key_column="transaction_type_id" name_column="transaction_type"  />
+          </Hierarchy>
+        </Dimension>
+
+        <Dimension name="Agency" foreign_key="award_subagency_id">
+            <Hierarchy name="Agency">
+                <Table name="dim_agency"/>
+                <Level name="Department" key_column="agency_code" name_column="agency" />
+                <Level name="Agency" key_column="sub_agency_code" name_column="sub_agency" />
+            </Hierarchy>
+        </Dimension>
+
+        <Dimension name="Product Service Code" foreign_key="psc">
+            <Annotation name="dim_type">PSC</Annotation>
+
+            <Hierarchy name="Product Service Code">
+                <Table name="dim_psc" />
+                <Level name="PSC Group" key_column="psc_code" name_column="psc"/>
+                <Level name="PSC Sub Group" key_column="sub_psc_code" name_column="sub_psc" />
+            </Hierarchy>
+        </Dimension>
+
+        <Dimension name="NAPCS" foreign_key="napcs_code">
+            <Annotation name="dim_type">NAPCS</Annotation>
+            <Hierarchy name="NAPCS" >
+                <Table name="dim_napcs" />
+                <Level name="NAPCS Section" key_column="napcs2" name_column="napcs2_title" />
+                <Level name="NAPCS Group" key_column="napcs3" name_column="napcs3_title" />
+                <Level name="NAPCS Class" key_column="napcs5" name_column="napcs5_title" />
+            </Hierarchy>
+        </Dimension>
+
+        <Measure aggregator="sum" key_column="obligation_amt" name="Obligation Amount">
+            <Annotation name="units_of_measurement">USD</Annotation>
+        </Measure>
+        <Measure aggregator="sum" key_column="total_loan_value" name="Total Loan Value">
+            <Annotation name="units_of_measurement">USD</Annotation>
+        </Measure>
+  </Cube>  
+  
+</Schema>
\ No newline at end of file