diff --git a/.gitignore b/.gitignore
index 8970ed2c..30e306d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -173,6 +173,7 @@ deployments
 logs
 
 # local data
+clickhouse_data
 postgres-data
 parquet-data
 data
diff --git a/docker-compose.yml b/docker-compose.yml
index b2eb8762..7a470d9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
         soft: 262144
         hard: 262144
     volumes:
-      - clickhouse_data:/var/lib/clickhouse
+      - ./clickhouse_data:/var/lib/clickhouse
       - ./parquet-data:/var/lib/clickhouse/user_files/parquet-data
     ports:
       - 8123:8123
@@ -85,6 +85,8 @@ services:
     image: ghcr.io/synthetixio/data/extractors:${VERSION}
     build:
       context: ./extractors
+    networks:
+      - data
     env_file:
       - .env
     volumes:
diff --git a/extractors/pyproject.toml b/extractors/pyproject.toml
index b83cd141..1e94666e 100644
--- a/extractors/pyproject.toml
+++ b/extractors/pyproject.toml
@@ -5,6 +5,7 @@ description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
+    "clickhouse-connect>=0.8.9",
     "cryo==0.3.0",
     "duckdb>=1.1.3",
     "maturin>=1.7.7",
diff --git a/extractors/src/clean.py b/extractors/src/clean.py
index 7633fcb9..784bf99a 100644
--- a/extractors/src/clean.py
+++ b/extractors/src/clean.py
@@ -5,6 +5,7 @@
 from eth_utils import decode_hex
 import polars as pl
 import duckdb
+from .insert import insert_data
 
 
 def fix_labels(labels):
@@ -58,7 +59,7 @@ def decode_output(contract, function_name, call):
 
 
 def camel_to_snake(name):
-    name = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", name).lower()
+    name = re.sub(r"(?<!^)(?=[A-Z])", "_", name).lower()
     return name
 
 
@@ -75,7 +76,12 @@ def get_labels(contract, function_name):
     return input_names, output_names
 
 
-def clean_data(chain_name, protocol, contract, function_name, write=True):
+def clean_data(
+    chain_name, protocol, contract, contract_name, function_name, write=True
+):
+    function_name_snake = camel_to_snake(function_name)
+    contract_name_snake = camel_to_snake(contract_name)
+    directory_name = f"{contract_name_snake}_function_{function_name_snake}"
     input_labels, output_labels = get_labels(contract, function_name)
 
     # fix labels
@@ -86,7 +92,7 @@ def clean_data(chain_name, protocol, contract, function_name, write=True):
     df = duckdb.sql(
         f"""
         SELECT DISTINCT *
-        FROM '../parquet-data/extractors/raw/{chain_name}/{protocol}/{function_name}/*.parquet'
+        FROM '../parquet-data/extractors/raw/{chain_name}/{protocol}/{directory_name}/*.parquet'
         WHERE
             call_data IS NOT NULL
             AND output_data IS NOT NULL
@@ -127,7 +133,7 @@ def clean_data(chain_name, protocol, contract, function_name, write=True):
 
     # write the data
     if write:
-        file_path = f"../parquet-data/extractors/clean/{chain_name}/{protocol}/{function_name}.parquet"
+        file_path = f"../parquet-data/extractors/clean/{chain_name}/{protocol}/{directory_name}/{directory_name}.parquet"
 
         ensure_directory_exists(file_path)
         # write the data
@@ -137,6 +143,9 @@ def clean_data(chain_name, protocol, contract, function_name, write=True):
         """
         )
 
+        # insert to clickhouse
+        insert_data(chain_name, protocol, contract_name_snake, function_name_snake)
+
     return df
 
 
diff --git a/extractors/src/extract.py b/extractors/src/extract.py
index 89d21d3e..0ebdc938 100644
--- a/extractors/src/extract.py
+++ b/extractors/src/extract.py
@@ -1,7 +1,7 @@
 import cryo
 from synthetix import Synthetix
 from .constants import CHAIN_CONFIGS
-from .clean import clean_data, clean_blocks
+from .clean import clean_data, clean_blocks, camel_to_snake
 
 
 def get_synthetix(chain_config):
@@ -38,7 +38,9 @@ def extract_data(
     # get synthetix
     chain_config = CHAIN_CONFIGS[network_id]
     snx = get_synthetix(chain_config)
-    output_dir = f"/parquet-data/extractors/raw/{chain_config['name']}/{protocol}/{function_name}"
+    function_name_snake = camel_to_snake(function_name)
+    contract_name_snake = camel_to_snake(contract_name)
+    output_dir = f"/parquet-data/extractors/raw/{chain_config['name']}/{protocol}/{contract_name_snake}_function_{function_name_snake}"
 
     # encode the call data
     contract = snx.contracts[package_name][contract_name]["contract"]
@@ -61,7 +63,9 @@ def extract_data(
     )
 
     if clean:
-        df_clean = clean_data(chain_config["name"], protocol, contract, function_name)
+        df_clean = clean_data(
+            chain_config["name"], protocol, contract, contract_name, function_name
+        )
         return df_clean
 
 
diff --git a/extractors/src/insert.py b/extractors/src/insert.py
new file mode 100644
index 00000000..2895ea28
--- /dev/null
+++ b/extractors/src/insert.py
@@ -0,0 +1,25 @@
+import re
+import clickhouse_connect
+from clickhouse_connect.driver.client import Client
+
+CLICKHOUSE_INTERNAL_PATH = (
+    "/var/lib/clickhouse/user_files/parquet-data/extractors/clean"
+)
+RAW_DATA_PATH = "/parquet-data/extractors/raw"
+CLEAN_DATA_PATH = "/parquet-data/extractors/clean"
+
+
+def convert_case(name):
+    snake_case = re.sub(r"(?<!^)(?=[A-Z])", "_", name).lower()
+    return snake_case
+
+
+def insert_data(network: str, protocol: str, contract_name: str, function_name: str):
+    client: Client = clickhouse_connect.get_client(
+        host="clickhouse", port=8123, user="default"
+    )
+    table_name = f"raw_{network}.{protocol}_{contract_name}_function_{function_name}"
+    file_path = f"{CLICKHOUSE_INTERNAL_PATH}/{network}/{protocol}/{contract_name}_function_{function_name}/*.parquet"
+    query = f"insert into {table_name} select * from file('{file_path}', 'Parquet')"
+    client.command(query)
+    client.close()
diff --git a/extractors/uv.lock b/extractors/uv.lock
index 9810fc50..3eefb59e 100644
--- a/extractors/uv.lock
+++ b/extractors/uv.lock
@@ -147,6 +147,39 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/12/90/3c9ff0512038035f59d279fddeb79f5f1eccd8859f06d6163c58798b9487/certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8", size = 167321 },
 ]
 
+[[package]]
+name = "cffi"
+version = "1.17.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pycparser" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz", hash = "sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824", size = 516621 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5a/84/e94227139ee5fb4d600a7a4927f322e1d4aea6fdc50bd3fca8493caba23f/cffi-1.17.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4", size = 183178 },
+    { url = "https://files.pythonhosted.org/packages/da/ee/fb72c2b48656111c4ef27f0f91da355e130a923473bf5ee75c5643d00cca/cffi-1.17.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c", size = 178840 },
+    { url = "https://files.pythonhosted.org/packages/cc/b6/db007700f67d151abadf508cbfd6a1884f57eab90b1bb985c4c8c02b0f28/cffi-1.17.1-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36", size = 454803 },
+    { url = "https://files.pythonhosted.org/packages/1a/df/f8d151540d8c200eb1c6fba8cd0dfd40904f1b0682ea705c36e6c2e97ab3/cffi-1.17.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5", size = 478850 },
+    { url = "https://files.pythonhosted.org/packages/28/c0/b31116332a547fd2677ae5b78a2ef662dfc8023d67f41b2a83f7c2aa78b1/cffi-1.17.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff", size = 485729 },
+    { url = "https://files.pythonhosted.org/packages/91/2b/9a1ddfa5c7f13cab007a2c9cc295b70fbbda7cb10a286aa6810338e60ea1/cffi-1.17.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99", size = 471256 },
+    { url = "https://files.pythonhosted.org/packages/b2/d5/da47df7004cb17e4955df6a43d14b3b4ae77737dff8bf7f8f333196717bf/cffi-1.17.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93", size = 479424 },
+    { url = "https://files.pythonhosted.org/packages/0b/ac/2a28bcf513e93a219c8a4e8e125534f4f6db03e3179ba1c45e949b76212c/cffi-1.17.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3", size = 484568 },
+    { url = "https://files.pythonhosted.org/packages/d4/38/ca8a4f639065f14ae0f1d9751e70447a261f1a30fa7547a828ae08142465/cffi-1.17.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8", size = 488736 },
+    { url = "https://files.pythonhosted.org/packages/86/c5/28b2d6f799ec0bdecf44dced2ec5ed43e0eb63097b0f58c293583b406582/cffi-1.17.1-cp312-cp312-win32.whl", hash = "sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65", size = 172448 },
+    { url = "https://files.pythonhosted.org/packages/50/b9/db34c4755a7bd1cb2d1603ac3863f22bcecbd1ba29e5ee841a4bc510b294/cffi-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903", size = 181976 },
+    { url = "https://files.pythonhosted.org/packages/8d/f8/dd6c246b148639254dad4d6803eb6a54e8c85c6e11ec9df2cffa87571dbe/cffi-1.17.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f3a2b4222ce6b60e2e8b337bb9596923045681d71e5a082783484d845390938e", size = 182989 },
+    { url = "https://files.pythonhosted.org/packages/8b/f1/672d303ddf17c24fc83afd712316fda78dc6fce1cd53011b839483e1ecc8/cffi-1.17.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2", size = 178802 },
+    { url = "https://files.pythonhosted.org/packages/0e/2d/eab2e858a91fdff70533cab61dcff4a1f55ec60425832ddfdc9cd36bc8af/cffi-1.17.1-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3", size = 454792 },
+    { url = "https://files.pythonhosted.org/packages/75/b2/fbaec7c4455c604e29388d55599b99ebcc250a60050610fadde58932b7ee/cffi-1.17.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683", size = 478893 },
+    { url = "https://files.pythonhosted.org/packages/4f/b7/6e4a2162178bf1935c336d4da8a9352cccab4d3a5d7914065490f08c0690/cffi-1.17.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5", size = 485810 },
+    { url = "https://files.pythonhosted.org/packages/c7/8a/1d0e4a9c26e54746dc08c2c6c037889124d4f59dffd853a659fa545f1b40/cffi-1.17.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4", size = 471200 },
+    { url = "https://files.pythonhosted.org/packages/26/9f/1aab65a6c0db35f43c4d1b4f580e8df53914310afc10ae0397d29d697af4/cffi-1.17.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd", size = 479447 },
+    { url = "https://files.pythonhosted.org/packages/5f/e4/fb8b3dd8dc0e98edf1135ff067ae070bb32ef9d509d6cb0f538cd6f7483f/cffi-1.17.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed", size = 484358 },
+    { url = "https://files.pythonhosted.org/packages/f1/47/d7145bf2dc04684935d57d67dff9d6d795b2ba2796806bb109864be3a151/cffi-1.17.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9", size = 488469 },
+    { url = "https://files.pythonhosted.org/packages/bf/ee/f94057fa6426481d663b88637a9a10e859e492c73d0384514a17d78ee205/cffi-1.17.1-cp313-cp313-win32.whl", hash = "sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d", size = 172475 },
+    { url = "https://files.pythonhosted.org/packages/7c/fc/6a8cb64e5f0324877d503c854da15d76c1e50eb722e320b15345c4d0c6de/cffi-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a", size = 182009 },
+]
+
 [[package]]
 name = "charset-normalizer"
 version = "3.4.0"
@@ -203,6 +236,41 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/61/44/0a53aec8ba1a8c0987b73f64262c4e500fbed97c2533630c77b63d32afb3/ckzg-1.0.2-cp312-cp312-win_amd64.whl", hash = "sha256:c3e1a9a72695e777497e95bb2213316a1138f82d1bb5d67b9c029a522d24908e", size = 69856 },
 ]
 
+[[package]]
+name = "clickhouse-connect"
+version = "0.8.9"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "certifi" },
+    { name = "lz4" },
+    { name = "pytz" },
+    { name = "urllib3" },
+    { name = "zstandard" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/77/b9/0b5e77ced32c86901799de8efe7f2663615e6a2760d75d97465609bd65d4/clickhouse_connect-0.8.9.tar.gz", hash = "sha256:a391af86fdf33769543e1df1dfaa28bf60b466fcfddce575c5fb1182e9e84a5a", size = 89251 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d3/79/254281d6d6a5931af7e09c4f7503b12842931a202de258747c409243e975/clickhouse_connect-0.8.9-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:ce4e59ad6c7fe6e822c65a16a9294ea47843bad7d5163c01786b789d71b7a883", size = 259950 },
+    { url = "https://files.pythonhosted.org/packages/17/1e/109497c1100095055f1a975780cdaf74ec9d83d4732695eaf7102e1caec9/clickhouse_connect-0.8.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:045e27f0102ff8caf24c00b25d38b45ca91d61aaab9ecae79cb123dd4edf8a44", size = 251640 },
+    { url = "https://files.pythonhosted.org/packages/2d/48/08c4374a17ea4eb89fb38b4d66860aadef94584d470b445880df8e9dac7b/clickhouse_connect-0.8.9-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:251743c3d0da37644f568dbef811390948ec3e870c769055212dfdb24b96c60a", size = 1056844 },
+    { url = "https://files.pythonhosted.org/packages/f1/36/1bfbfb3a5647326db567d4847072c01db2354e47e9243e5f81fda054579f/clickhouse_connect-0.8.9-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d4a1358005a6d32d3ab0fbc9989ae99cd5eedc34522b920bddf51787e46506c8", size = 1075144 },
+    { url = "https://files.pythonhosted.org/packages/2c/a0/d091388dc50447676566574ff89d2673596eb5895bc67fca21eab53e01c5/clickhouse_connect-0.8.9-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a49095c40cdae2350b435b16ec45bb71da1eb40ba65a1b8f1082734d9efddf51", size = 1030256 },
+    { url = "https://files.pythonhosted.org/packages/a9/ce/a13451e0c53076d5848b167a9f344cc28e3ce0777b7d17bdc6ddfee5fca8/clickhouse_connect-0.8.9-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:d6fe22e987949bec4af358c4c454eb5c7dc222cdc102bf62abcc1ccde0439e9d", size = 1056191 },
+    { url = "https://files.pythonhosted.org/packages/10/f2/5de2ed2d11c5c71bb8769a70fb0c5b2d02f8b6cb6f5e64340f1b14dad159/clickhouse_connect-0.8.9-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:36680e02f19fc9a94deed85c8e03f254d1dbfde36dd1ad32205d7371ad264c09", size = 1071779 },
+    { url = "https://files.pythonhosted.org/packages/a7/58/fcd0b2913bbf4b920114505a4465db5a169bef5a87c4d41fd64a9da0a011/clickhouse_connect-0.8.9-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:952179569824b436f9cb4c3c7d5deeeba713fe26dbf31df210ca286e92362441", size = 1098191 },
+    { url = "https://files.pythonhosted.org/packages/38/c4/2fcedce0931d616ad66fdeda2b90760d466cfa28d2f89c7d2259296ebc71/clickhouse_connect-0.8.9-cp312-cp312-win32.whl", hash = "sha256:4e780a7879a3743a1e403b859a7eda7e39ad3b436305948a611a0586b7bf9634", size = 227445 },
+    { url = "https://files.pythonhosted.org/packages/ea/4c/6163a671c897f82cd9e090ed578b7b16063d3dbc9c25fb4c2a5759690078/clickhouse_connect-0.8.9-cp312-cp312-win_amd64.whl", hash = "sha256:70da6a4809dfdb67d8e315a7426fcbdd544e692655c54f79792fc79c96d6a721", size = 245473 },
+    { url = "https://files.pythonhosted.org/packages/d7/37/17821aba5d1c807941f30cb3f02271690d174026ee7fd4c02c6b77088105/clickhouse_connect-0.8.9-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:6648ac9465040cb8953ee587b144ecb8246e80d5b04561f2a493e494a991c856", size = 257191 },
+    { url = "https://files.pythonhosted.org/packages/99/7b/e60e18a7575eca486b971a0b94c032bf7920fb4656644673c5502d5d60ac/clickhouse_connect-0.8.9-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:7197b9b61ff7f6f0c295b67ecce9c6a4d5424edde5d3e009ee8511adc961908e", size = 248817 },
+    { url = "https://files.pythonhosted.org/packages/6c/02/d162b720e76e9227ccdd501d40bec3ef0a6d66179397185eca836632215d/clickhouse_connect-0.8.9-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7d77583a216afa0605690bdb7a9c6eb26d3380388489b401bd5a24a68e8e9d56", size = 1039790 },
+    { url = "https://files.pythonhosted.org/packages/08/c9/7cf5b67b7c272c620e72b5267da3f1be87df957cf3375e1cb2f58bcf973c/clickhouse_connect-0.8.9-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba1f641d11d74d707621cf9402b8c60a964a8d867e6803feaca84380133942cf", size = 1058496 },
+    { url = "https://files.pythonhosted.org/packages/d2/6b/29fd0ef493d05ac3f381634d7dd8d9d9aba8415b99b9218c262f1e50dacf/clickhouse_connect-0.8.9-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c2397a87599aef5e4bca79a710e466deb5ac3916529ffcae3e358f5ecd5f73d1", size = 1013789 },
+    { url = "https://files.pythonhosted.org/packages/0b/4b/37a5ff8e417913771e0ff06cbcd50d9b9c2aa2603072cad7844762c3d782/clickhouse_connect-0.8.9-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:787e36f22e9862738a12e14678035a78f97b3fee68ac7e79046f6d3631534360", size = 1040952 },
+    { url = "https://files.pythonhosted.org/packages/85/e6/55f082b52a91ddb833115610866c50855fa7f845833e0c69b8cca64ba37e/clickhouse_connect-0.8.9-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:a7db38572d228cbb6561260ca9d44b81443a79abed5782e917ce163d3190df6f", size = 1056431 },
+    { url = "https://files.pythonhosted.org/packages/f9/08/56f73f4db77ebc3bd12a564147fc1ca4ee66513a2f14b372338fd1d32787/clickhouse_connect-0.8.9-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4b12d23f37c50811897b5abd2a9e05d0c04bcd38c9c105d08c1cb70a4d1b2fe9", size = 1083811 },
+    { url = "https://files.pythonhosted.org/packages/0d/9a/37778f8036ad4d2272a2bb6d96acb14da450621eae34c199039ca4d7d736/clickhouse_connect-0.8.9-cp313-cp313-win32.whl", hash = "sha256:782c445162c54132ae63a196720f97b586aa1d4f41be539ccb80dd10f3089ad7", size = 226711 },
+    { url = "https://files.pythonhosted.org/packages/05/62/4078f4ac36e728d6fd225933a183951438678454945f319bea60b9ec02c3/clickhouse_connect-0.8.9-cp313-cp313-win_amd64.whl", hash = "sha256:9fd596df27667a0528d613973a051075af4f9977f738a5a63686a52c0f00b2e3", size = 244406 },
+]
+
 [[package]]
 name = "cryo"
 version = "0.3.0"
@@ -385,6 +453,7 @@ name = "extractors"
 version = "0.1.0"
 source = { virtual = "." }
 dependencies = [
+    { name = "clickhouse-connect" },
     { name = "cryo" },
     { name = "duckdb" },
     { name = "maturin" },
@@ -399,6 +468,7 @@ dependencies = [
 
 [package.metadata]
 requires-dist = [
+    { name = "clickhouse-connect", specifier = ">=0.8.9" },
     { name = "cryo", specifier = "==0.3.0" },
     { name = "duckdb", specifier = ">=1.1.3" },
     { name = "maturin", specifier = ">=1.7.7" },
@@ -525,6 +595,21 @@ version = "1.2.0"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/83/63/21480e8ecc218b9b15672d194ea79da8a7389737c21d8406254306733cac/lru-dict-1.2.0.tar.gz", hash = "sha256:13c56782f19d68ddf4d8db0170041192859616514c706b126d0df2ec72a11bd7", size = 10895 }
 
+[[package]]
+name = "lz4"
+version = "4.3.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a4/31/ec1259ca8ad11568abaf090a7da719616ca96b60d097ccc5799cd0ff599c/lz4-4.3.3.tar.gz", hash = "sha256:01fe674ef2889dbb9899d8a67361e0c4a2c833af5aeb37dd505727cf5d2a131e", size = 171509 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/4d/6f/081811b17ccaec5f06b3030756af2737841447849118a6e1078481a78c6c/lz4-4.3.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:e36cd7b9d4d920d3bfc2369840da506fa68258f7bb176b8743189793c055e43d", size = 254213 },
+    { url = "https://files.pythonhosted.org/packages/53/4d/8e04ef75feff8848ba3c624ce81c7732bdcea5f8f994758afa88cd3d7764/lz4-4.3.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:31ea4be9d0059c00b2572d700bf2c1bc82f241f2c3282034a759c9a4d6ca4dc2", size = 212354 },
+    { url = "https://files.pythonhosted.org/packages/a3/04/257a72d6a879dbc8c669018989f776fcdd5b4bf3c2c51c09a54f1ca31721/lz4-4.3.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:33c9a6fd20767ccaf70649982f8f3eeb0884035c150c0b818ea660152cf3c809", size = 1238643 },
+    { url = "https://files.pythonhosted.org/packages/d9/93/4a7e489156fa7ded03ba9cde4a8ca7f373672b5787cac9a0391befa752a1/lz4-4.3.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bca8fccc15e3add173da91be8f34121578dc777711ffd98d399be35487c934bf", size = 1265014 },
+    { url = "https://files.pythonhosted.org/packages/fd/a4/f84ebc23bc7602623b1b003b4e1120cbf86fb03a35c595c226be1985449b/lz4-4.3.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e7d84b479ddf39fe3ea05387f10b779155fc0990125f4fb35d636114e1c63a2e", size = 1184881 },
+    { url = "https://files.pythonhosted.org/packages/de/3d/8ba48305378e84908221de143a21ba0c0ce52778893865cf85b66b1068da/lz4-4.3.3-cp312-cp312-win32.whl", hash = "sha256:337cb94488a1b060ef1685187d6ad4ba8bc61d26d631d7ba909ee984ea736be1", size = 87241 },
+    { url = "https://files.pythonhosted.org/packages/c4/5d/7b70965a0692de29af2af1007fe837f46fd456bbe2aa8f838a8543a3b5cb/lz4-4.3.3-cp312-cp312-win_amd64.whl", hash = "sha256:5d35533bf2cee56f38ced91f766cd0038b6abf46f438a80d50c52750088be93f", size = 99776 },
+]
+
 [[package]]
 name = "maturin"
 version = "1.7.7"
@@ -764,6 +849,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/c8/11/fabf6ecabb1fe5b7d96889228ca2a9158c4c3bb732e3b8ee3f7f6d40b703/pyarrow-18.1.0-cp313-cp313t-manylinux_2_28_x86_64.whl", hash = "sha256:b76130d835261b38f14fc41fdfb39ad8d672afb84c447126b84d5472244cfaba", size = 40043567 },
 ]
 
+[[package]]
+name = "pycparser"
+version = "2.22"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c/pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6", size = 172736 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/13/a3/a812df4e2dd5696d1f351d58b8fe16a405b234ad2886a0dab9183fb78109/pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc", size = 117552 },
+]
+
 [[package]]
 name = "pycryptodome"
 version = "3.21.0"
@@ -1173,3 +1267,46 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/f5/d5/688db678e987c3e0fb17867970700b92603cadf36c56e5fb08f23e822a0c/yarl-1.18.3-cp313-cp313-win_amd64.whl", hash = "sha256:578e281c393af575879990861823ef19d66e2b1d0098414855dd367e234f5b3c", size = 315723 },
     { url = "https://files.pythonhosted.org/packages/f5/4b/a06e0ec3d155924f77835ed2d167ebd3b211a7b0853da1cf8d8414d784ef/yarl-1.18.3-py3-none-any.whl", hash = "sha256:b57f4f58099328dfb26c6a771d09fb20dbbae81d20cfb66141251ea063bd101b", size = 45109 },
 ]
+
+[[package]]
+name = "zstandard"
+version = "0.23.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "cffi", marker = "platform_python_implementation == 'PyPy'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ed/f6/2ac0287b442160a89d726b17a9184a4c615bb5237db763791a7fd16d9df1/zstandard-0.23.0.tar.gz", hash = "sha256:b2d8c62d08e7255f68f7a740bae85b3c9b8e5466baa9cbf7f57f1cde0ac6bc09", size = 681701 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7b/83/f23338c963bd9de687d47bf32efe9fd30164e722ba27fb59df33e6b1719b/zstandard-0.23.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:b4567955a6bc1b20e9c31612e615af6b53733491aeaa19a6b3b37f3b65477094", size = 788713 },
+    { url = "https://files.pythonhosted.org/packages/5b/b3/1a028f6750fd9227ee0b937a278a434ab7f7fdc3066c3173f64366fe2466/zstandard-0.23.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1e172f57cd78c20f13a3415cc8dfe24bf388614324d25539146594c16d78fcc8", size = 633459 },
+    { url = "https://files.pythonhosted.org/packages/26/af/36d89aae0c1f95a0a98e50711bc5d92c144939efc1f81a2fcd3e78d7f4c1/zstandard-0.23.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b0e166f698c5a3e914947388c162be2583e0c638a4703fc6a543e23a88dea3c1", size = 4945707 },
+    { url = "https://files.pythonhosted.org/packages/cd/2e/2051f5c772f4dfc0aae3741d5fc72c3dcfe3aaeb461cc231668a4db1ce14/zstandard-0.23.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:12a289832e520c6bd4dcaad68e944b86da3bad0d339ef7989fb7e88f92e96072", size = 5306545 },
+    { url = "https://files.pythonhosted.org/packages/0a/9e/a11c97b087f89cab030fa71206963090d2fecd8eb83e67bb8f3ffb84c024/zstandard-0.23.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d50d31bfedd53a928fed6707b15a8dbeef011bb6366297cc435accc888b27c20", size = 5337533 },
+    { url = "https://files.pythonhosted.org/packages/fc/79/edeb217c57fe1bf16d890aa91a1c2c96b28c07b46afed54a5dcf310c3f6f/zstandard-0.23.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72c68dda124a1a138340fb62fa21b9bf4848437d9ca60bd35db36f2d3345f373", size = 5436510 },
+    { url = "https://files.pythonhosted.org/packages/81/4f/c21383d97cb7a422ddf1ae824b53ce4b51063d0eeb2afa757eb40804a8ef/zstandard-0.23.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:53dd9d5e3d29f95acd5de6802e909ada8d8d8cfa37a3ac64836f3bc4bc5512db", size = 4859973 },
+    { url = "https://files.pythonhosted.org/packages/ab/15/08d22e87753304405ccac8be2493a495f529edd81d39a0870621462276ef/zstandard-0.23.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:6a41c120c3dbc0d81a8e8adc73312d668cd34acd7725f036992b1b72d22c1772", size = 4936968 },
+    { url = "https://files.pythonhosted.org/packages/eb/fa/f3670a597949fe7dcf38119a39f7da49a8a84a6f0b1a2e46b2f71a0ab83f/zstandard-0.23.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:40b33d93c6eddf02d2c19f5773196068d875c41ca25730e8288e9b672897c105", size = 5467179 },
+    { url = "https://files.pythonhosted.org/packages/4e/a9/dad2ab22020211e380adc477a1dbf9f109b1f8d94c614944843e20dc2a99/zstandard-0.23.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9206649ec587e6b02bd124fb7799b86cddec350f6f6c14bc82a2b70183e708ba", size = 4848577 },
+    { url = "https://files.pythonhosted.org/packages/08/03/dd28b4484b0770f1e23478413e01bee476ae8227bbc81561f9c329e12564/zstandard-0.23.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:76e79bc28a65f467e0409098fa2c4376931fd3207fbeb6b956c7c476d53746dd", size = 4693899 },
+    { url = "https://files.pythonhosted.org/packages/2b/64/3da7497eb635d025841e958bcd66a86117ae320c3b14b0ae86e9e8627518/zstandard-0.23.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:66b689c107857eceabf2cf3d3fc699c3c0fe8ccd18df2219d978c0283e4c508a", size = 5199964 },
+    { url = "https://files.pythonhosted.org/packages/43/a4/d82decbab158a0e8a6ebb7fc98bc4d903266bce85b6e9aaedea1d288338c/zstandard-0.23.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:9c236e635582742fee16603042553d276cca506e824fa2e6489db04039521e90", size = 5655398 },
+    { url = "https://files.pythonhosted.org/packages/f2/61/ac78a1263bc83a5cf29e7458b77a568eda5a8f81980691bbc6eb6a0d45cc/zstandard-0.23.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a8fffdbd9d1408006baaf02f1068d7dd1f016c6bcb7538682622c556e7b68e35", size = 5191313 },
+    { url = "https://files.pythonhosted.org/packages/e7/54/967c478314e16af5baf849b6ee9d6ea724ae5b100eb506011f045d3d4e16/zstandard-0.23.0-cp312-cp312-win32.whl", hash = "sha256:dc1d33abb8a0d754ea4763bad944fd965d3d95b5baef6b121c0c9013eaf1907d", size = 430877 },
+    { url = "https://files.pythonhosted.org/packages/75/37/872d74bd7739639c4553bf94c84af7d54d8211b626b352bc57f0fd8d1e3f/zstandard-0.23.0-cp312-cp312-win_amd64.whl", hash = "sha256:64585e1dba664dc67c7cdabd56c1e5685233fbb1fc1966cfba2a340ec0dfff7b", size = 495595 },
+    { url = "https://files.pythonhosted.org/packages/80/f1/8386f3f7c10261fe85fbc2c012fdb3d4db793b921c9abcc995d8da1b7a80/zstandard-0.23.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:576856e8594e6649aee06ddbfc738fec6a834f7c85bf7cadd1c53d4a58186ef9", size = 788975 },
+    { url = "https://files.pythonhosted.org/packages/16/e8/cbf01077550b3e5dc86089035ff8f6fbbb312bc0983757c2d1117ebba242/zstandard-0.23.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:38302b78a850ff82656beaddeb0bb989a0322a8bbb1bf1ab10c17506681d772a", size = 633448 },
+    { url = "https://files.pythonhosted.org/packages/06/27/4a1b4c267c29a464a161aeb2589aff212b4db653a1d96bffe3598f3f0d22/zstandard-0.23.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d2240ddc86b74966c34554c49d00eaafa8200a18d3a5b6ffbf7da63b11d74ee2", size = 4945269 },
+    { url = "https://files.pythonhosted.org/packages/7c/64/d99261cc57afd9ae65b707e38045ed8269fbdae73544fd2e4a4d50d0ed83/zstandard-0.23.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2ef230a8fd217a2015bc91b74f6b3b7d6522ba48be29ad4ea0ca3a3775bf7dd5", size = 5306228 },
+    { url = "https://files.pythonhosted.org/packages/7a/cf/27b74c6f22541f0263016a0fd6369b1b7818941de639215c84e4e94b2a1c/zstandard-0.23.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:774d45b1fac1461f48698a9d4b5fa19a69d47ece02fa469825b442263f04021f", size = 5336891 },
+    { url = "https://files.pythonhosted.org/packages/fa/18/89ac62eac46b69948bf35fcd90d37103f38722968e2981f752d69081ec4d/zstandard-0.23.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f77fa49079891a4aab203d0b1744acc85577ed16d767b52fc089d83faf8d8ed", size = 5436310 },
+    { url = "https://files.pythonhosted.org/packages/a8/a8/5ca5328ee568a873f5118d5b5f70d1f36c6387716efe2e369010289a5738/zstandard-0.23.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ac184f87ff521f4840e6ea0b10c0ec90c6b1dcd0bad2f1e4a9a1b4fa177982ea", size = 4859912 },
+    { url = "https://files.pythonhosted.org/packages/ea/ca/3781059c95fd0868658b1cf0440edd832b942f84ae60685d0cfdb808bca1/zstandard-0.23.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:c363b53e257246a954ebc7c488304b5592b9c53fbe74d03bc1c64dda153fb847", size = 4936946 },
+    { url = "https://files.pythonhosted.org/packages/ce/11/41a58986f809532742c2b832c53b74ba0e0a5dae7e8ab4642bf5876f35de/zstandard-0.23.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:e7792606d606c8df5277c32ccb58f29b9b8603bf83b48639b7aedf6df4fe8171", size = 5466994 },
+    { url = "https://files.pythonhosted.org/packages/83/e3/97d84fe95edd38d7053af05159465d298c8b20cebe9ccb3d26783faa9094/zstandard-0.23.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a0817825b900fcd43ac5d05b8b3079937073d2b1ff9cf89427590718b70dd840", size = 4848681 },
+    { url = "https://files.pythonhosted.org/packages/6e/99/cb1e63e931de15c88af26085e3f2d9af9ce53ccafac73b6e48418fd5a6e6/zstandard-0.23.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:9da6bc32faac9a293ddfdcb9108d4b20416219461e4ec64dfea8383cac186690", size = 4694239 },
+    { url = "https://files.pythonhosted.org/packages/ab/50/b1e703016eebbc6501fc92f34db7b1c68e54e567ef39e6e59cf5fb6f2ec0/zstandard-0.23.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:fd7699e8fd9969f455ef2926221e0233f81a2542921471382e77a9e2f2b57f4b", size = 5200149 },
+    { url = "https://files.pythonhosted.org/packages/aa/e0/932388630aaba70197c78bdb10cce2c91fae01a7e553b76ce85471aec690/zstandard-0.23.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:d477ed829077cd945b01fc3115edd132c47e6540ddcd96ca169facff28173057", size = 5655392 },
+    { url = "https://files.pythonhosted.org/packages/02/90/2633473864f67a15526324b007a9f96c96f56d5f32ef2a56cc12f9548723/zstandard-0.23.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fa6ce8b52c5987b3e34d5674b0ab529a4602b632ebab0a93b07bfb4dfc8f8a33", size = 5191299 },
+    { url = "https://files.pythonhosted.org/packages/b0/4c/315ca5c32da7e2dc3455f3b2caee5c8c2246074a61aac6ec3378a97b7136/zstandard-0.23.0-cp313-cp313-win32.whl", hash = "sha256:a9b07268d0c3ca5c170a385a0ab9fb7fdd9f5fd866be004c4ea39e44edce47dd", size = 430862 },
+    { url = "https://files.pythonhosted.org/packages/a2/bf/c6aaba098e2d04781e8f4f7c0ba3c7aa73d00e4c436bcc0cf059a66691d1/zstandard-0.23.0-cp313-cp313-win_amd64.whl", hash = "sha256:f3513916e8c645d0610815c257cbfd3242adfd5c4cfa78be514e5a3ebb42a41b", size = 495578 },
+]
diff --git a/indexers/scripts/clean.py b/indexers/scripts/clean_parquet.py
similarity index 56%
rename from indexers/scripts/clean.py
rename to indexers/scripts/clean_parquet.py
index d456a588..397fd38d 100644
--- a/indexers/scripts/clean.py
+++ b/indexers/scripts/clean_parquet.py
@@ -2,37 +2,49 @@
 from pathlib import Path
 import pandas as pd
 import os
+from utils import convert_case
+
+RAW_DATA_PATH = "/parquet-data/indexers/raw"
+CLEAN_DATA_PATH = "/parquet-data/indexers/clean"
 
 
 def clean_parquet_files(network_name: str, protocol_name: str):
-    source_base = f"/parquet-data/indexers/raw/{network_name}/{protocol_name}"
-    target_base = f"/parquet-data/indexers/clean/{network_name}/{protocol_name}"
+    raw_path = Path(f"{RAW_DATA_PATH}/{network_name}/{protocol_name}")
+    clean_path = Path(f"{CLEAN_DATA_PATH}/{network_name}/{protocol_name}")
+
+    if not raw_path.exists():
+        raise ValueError(f"Source path {raw_path} does not exist")
 
-    protocol_path = Path(source_base)
-    if not protocol_path.exists():
-        raise ValueError(f"Source path {source_base} does not exist")
-    Path(target_base).mkdir(parents=True, exist_ok=True)
+    clean_path.mkdir(parents=True, exist_ok=True)
 
-    for block_range_dir in protocol_path.iterdir():
+    for block_range_dir in sorted(raw_path.iterdir()):
         if not block_range_dir.is_dir():
             continue
+        if "temp" in block_range_dir.name:
+            continue
         block_range = block_range_dir.name
 
+        empty_files = 0
+        written_files = 0
         for parquet_file in block_range_dir.glob("*.parquet"):
             event_name = parquet_file.stem
-            event_dir = Path(target_base) / event_name
+            event_dir = clean_path / event_name
             output_file = event_dir / f"{event_name}_{block_range}.parquet"
-
-            # Skip if file already exists
             if output_file.exists():
                 continue
-
             df = pd.read_parquet(parquet_file)
             if df.empty:
+                empty_files += 1
                 continue
+            df.columns = [convert_case(col) for col in df.columns]
             event_dir.mkdir(parents=True, exist_ok=True)
             df.to_parquet(output_file, index=False)
-        print(f"Processed {protocol_name} {block_range}")
+            written_files += 1
+        print(
+            f"Processed {network_name}.{protocol_name}.{block_range}:\n"
+            f"\t empty raw files {empty_files}\n"
+            f"\t written files {written_files}"
+        )
 
 
 if __name__ == "__main__":
diff --git a/indexers/scripts/import_parquet.py b/indexers/scripts/import_parquet.py
new file mode 100644
index 00000000..0433bc9d
--- /dev/null
+++ b/indexers/scripts/import_parquet.py
@@ -0,0 +1,62 @@
+import argparse
+import os
+from pathlib import Path
+import clickhouse_connect
+from utils import create_table_from_schema, insert_data_from_path
+
+CLICKHOUSE_INTERNAL_PATH = "/var/lib/clickhouse/user_files/parquet-data/indexers/clean"
+CLEAN_DATA_PATH = "/parquet-data/indexers/clean"
+SCHEMAS_PATH = "/parquet-data/indexers/schemas"
+
+
+def init_tables_from_schemas(client, network_name: str, protocol_name: str):
+    print(f"Initializing tables for {network_name} {protocol_name}")
+    schema_path = Path(f"{SCHEMAS_PATH}/{network_name}/{protocol_name}")
+    db_name = f"raw_{network_name}"
+
+    for schema_file in schema_path.glob("*.sql"):
+        event_name = schema_file.stem
+        table_name = f"{protocol_name}_{event_name}"
+
+        client.command(f"drop table if exists {db_name}.{table_name}")
+        create_table_from_schema(client, str(schema_file))
+
+
+def import_parquet_files(client, network_name: str, protocol_name: str):
+    print(f"Inserting {network_name} {protocol_name} data into tables")
+    clean_path = Path(f"{CLEAN_DATA_PATH}/{network_name}/{protocol_name}")
+    db_name = f"raw_{network_name}"
+
+    for event_name in clean_path.iterdir():
+        if not event_name.is_dir():
+            continue
+        event_name = event_name.name
+        table_name = f"{protocol_name}_{event_name}"
+        file_path = f"{CLICKHOUSE_INTERNAL_PATH}/{network_name}/{protocol_name}/{event_name}/*.parquet"
+
+        insert_data_from_path(client, db_name, table_name, file_path)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--network_name", type=str)
+    parser.add_argument("--protocol_name", type=str)
+    args = parser.parse_args()
+
+    network_name = os.getenv("NETWORK_NAME") or args.network_name
+    protocol_name = os.getenv("PROTOCOL_NAME") or args.protocol_name
+
+    if network_name is None or protocol_name is None:
+        raise ValueError("Network and protocol must be provided")
+
+    client = clickhouse_connect.get_client(
+        host="clickhouse",
+        port=8123,
+        username="default",
+    )
+
+    db_name = f"raw_{network_name}"
+    client.command(f"CREATE DATABASE IF NOT EXISTS {db_name}")
+
+    init_tables_from_schemas(client, network_name, protocol_name)
+    import_parquet_files(client, network_name, protocol_name)
diff --git a/indexers/scripts/listener.py b/indexers/scripts/listener.py
index 90e8d405..54fc09bc 100644
--- a/indexers/scripts/listener.py
+++ b/indexers/scripts/listener.py
@@ -1,24 +1,16 @@
-import argparse
-import os
 from pathlib import Path
 import time
-import re
 import pandas as pd
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler
 import clickhouse_connect
-from clickhouse_connect.driver.client import Client
+from utils import create_table_from_path, insert_data_from_path, convert_case
 
 CLICKHOUSE_INTERNAL_PATH = "/var/lib/clickhouse/user_files/parquet-data/indexers/clean"
 RAW_DATA_PATH = "/parquet-data/indexers/raw"
 CLEAN_DATA_PATH = "/parquet-data/indexers/clean"
 
 
-def convert_case(name):
-    snake_case = re.sub(r"(?<!^)(?=[A-Z])", "_", name).lower()
-    return snake_case
-
-
 class FolderEventHandler(FileSystemEventHandler):
     def __init__(self):
         super().__init__()
@@ -75,10 +67,14 @@ def _clean_parquet(self, path: str):
             table_name = f"{protocol_name}_{event_name}"
             clickhouse_file_path = f"{self.clickhouse_path}/{network_name}/{protocol_name}/{event_name}/{event_name}_{block_range}.parquet"
             if not self.client.command(f"exists {db_name}.{table_name}"):
-                self._create_table_from_file(db_name, table_name, clickhouse_file_path)
+                create_table_from_path(
+                    self.client, db_name, table_name, clickhouse_file_path
+                )
                 tables_created += 1
             else:
-                self._insert_data_from_file(db_name, table_name, clickhouse_file_path)
+                insert_data_from_path(
+                    self.client, db_name, table_name, clickhouse_file_path
+                )
                 data_insertions += 1
 
         print(
@@ -87,24 +83,6 @@ def _clean_parquet(self, path: str):
             f"tables created {tables_created}, data insertions {data_insertions}"
         )
 
-    def _create_table_from_file(self, db_name: str, table_name: str, file_path: str):
-        query = (
-            f"create table if not exists {db_name}.{table_name} "
-            f"engine = MergeTree order by tuple() as "
-            f"select * from file('{file_path}', 'Parquet')"
-        )
-        try:
-            self.client.command(query)
-        except Exception as e:
-            print(f"Error creating table {db_name}.{table_name}: {e}")
-
-    def _insert_data_from_file(self, db_name: str, table_name: str, file_path: str):
-        query = f"insert into {db_name}.{table_name} select * from file('{file_path}', 'Parquet')"
-        try:
-            self.client.command(query)
-        except Exception as e:
-            print(f"Error inserting data into {db_name}.{table_name}: {e}")
-
 
 def main():
     event_handler = FolderEventHandler()
diff --git a/indexers/scripts/utils.py b/indexers/scripts/utils.py
new file mode 100644
index 00000000..f28f2e96
--- /dev/null
+++ b/indexers/scripts/utils.py
@@ -0,0 +1,30 @@
+import re
+from clickhouse_connect.driver.client import Client
+
+
+def create_table_from_schema(client: Client, path: str):
+    try:
+        with open(path, "r") as file:
+            query = file.read()
+    except FileNotFoundError:
+        print(f"Schema file {path} not found")
+        return
+    try:
+        client.command(query)
+    except Exception as e:
+        print(f"Error creating table from schema {path}: {e}")
+
+
+def insert_data_from_path(client: Client, db_name: str, table_name: str, path: str):
+    query = (
+        f"insert into {db_name}.{table_name} select * from file('{path}', 'Parquet')"
+    )
+    try:
+        client.command(query)
+    except Exception as e:
+        print(f"Error inserting data into {db_name}.{table_name}: {e}")
+
+
+def convert_case(name):
+    snake_case = re.sub(r"(?<!^)(?=[A-Z])", "_", name).lower()
+    return snake_case
diff --git a/indexers/utils/clickhouse_schema.py b/indexers/utils/clickhouse_schema.py
index b1e7edd8..b59dc415 100644
--- a/indexers/utils/clickhouse_schema.py
+++ b/indexers/utils/clickhouse_schema.py
@@ -1,6 +1,10 @@
 import re
 from pathlib import Path
-from web3._utils.abi import get_abi_input_names, get_abi_input_types
+from web3._utils.abi import (
+    get_abi_input_names,
+    get_abi_input_types,
+    get_abi_output_types,
+)
 
 
 def to_snake(name):
@@ -9,10 +13,8 @@ def to_snake(name):
 
 
 def map_to_clickhouse_type(sol_type):
-    if sol_type in ["bytes32", "address", "string"]:
+    if sol_type in ["address", "string"] or sol_type.startswith("bytes"):
         return "String"
-    elif re.search(r"\(.*\)|\[\[$", sol_type):
-        return "JSON"
     elif re.match(r"uint\d+$", sol_type):
         bit_size = int(re.search(r"\d+", sol_type).group())
         if bit_size <= 8:
@@ -43,27 +45,38 @@ def map_to_clickhouse_type(sol_type):
             return "Int256"
     elif sol_type == "bool":
         return "Bool"
-    elif sol_type.endswith("[]"):
-        base_type = sol_type[:-2]
-        clickhouse_type = f"Array({map_to_clickhouse_type(base_type)})"
-        return clickhouse_type
+    elif sol_type.endswith("[]") or re.search(r"\(.*\)|\[\[$", sol_type):
+        return "String"
     raise ValueError(f"Type {sol_type} not mapped")
 
 
-def generate_clickhouse_schema(event_name, fields, network_name, protocol_name):
-    query = [
-        f"CREATE TABLE IF NOT EXISTS raw_{network_name}.{protocol_name}_{event_name} (",
-        " `id` String,",
-        " `block_number` UInt64,",
-        " `block_timestamp` DateTime64(3, 'UTC'),",
-        " `transaction_hash` String,",
-        " `contract` String,",
-        " `event_name` String,",
-    ]
+def generate_clickhouse_schema(event_name, fields, network_name, abi_type="event"):
+    table_name = f"raw_{network_name}.{event_name}"
+    if abi_type == "event":
+        query = [
+            f"CREATE TABLE IF NOT EXISTS {table_name} (",
+            " `id` String,",
+            " `block_number` UInt64,",
+            " `block_timestamp` DateTime64(3, 'UTC'),",
+            " `transaction_hash` String,",
+            " `contract` String,",
+            " `event_name` String,",
+        ]
+    elif abi_type == "function":
+        query = [
+            f"CREATE TABLE IF NOT EXISTS {table_name} (",
+            " `block_number` UInt64,",
+            " `contract_address` String,",
+            " `chain_id` UInt64,",
+            " `file_location` String,",
+        ]
+    else:
+        raise ValueError(f"Unknown ABI type {abi_type}")
+
     for field_name, field_type in fields:
         if field_name == "id":
             clickhouse_type = "String"
-            query.append(f" `param_id` String,")
+            query.append(" `param_id` String,")
         else:
             clickhouse_type = map_to_clickhouse_type(field_type)
             query.append(f" `{to_snake(field_name)}` {clickhouse_type},")
@@ -89,12 +102,13 @@ def process_abi_schemas(client, abi, path, contract_name, network_name, protocol
         output_path: Path where schema files will be saved
         contract_name: Name of the contract (used for namespacing)
     """
+    # do events
     events = [item for item in abi if item["type"] == "event"]
 
     for event in events:
         event_name = to_snake(event["name"])
         contract_name = to_snake(contract_name)
-        event_name = f"{contract_name}_event_{event_name}"
+        event_name = f"{protocol_name}_{contract_name}_event_{event_name}"
 
         input_names = get_abi_input_names(event)
         input_types = get_abi_input_types(event)
@@ -104,12 +118,56 @@ def process_abi_schemas(client, abi, path, contract_name, network_name, protocol
             event_name=event_name,
             fields=fields,
             network_name=network_name,
-            protocol_name=protocol_name,
         )
-        print(schema)
         client.command(schema)
         save_clickhouse_schema(path=path, event_name=event_name, schema=schema)
 
+    # do functions
+    functions = [item for item in abi if item["type"] == "function"]
+
+    for f in functions:
+        function_name = to_snake(f["name"])
+        contract_name = to_snake(contract_name)
+        function_name = f"{protocol_name}_{contract_name}_function_{function_name}"
+
+        input_types = get_abi_input_types(f)
+        input_names = get_abi_input_names(f)
+        input_names = [
+            f"input_{ind}" if name == "" else name
+            for ind, name in enumerate(input_names)
+        ]
+        output_types = get_abi_output_types(f)
+        output_names = [
+            o["name"] if "name" in o else f"output_{ind}"
+            for ind, o in enumerate(f["outputs"])
+        ]
+        output_names = [
+            f"output_{ind}" if name == "" else name
+            for ind, name in enumerate(output_names)
+        ]
+
+        all_names = input_names + output_names
+        all_types = input_types + output_types
+
+        no_outputs = len(output_types) == 0
+        empty_names = "" in all_names
+        type_mismatch = len(all_names) != len(all_types)
+        if no_outputs or empty_names or type_mismatch:
+            continue
+        else:
+            print(f"Running query for {function_name}")
+        fields = list(zip(all_names, all_types))
+
+        schema = generate_clickhouse_schema(
+            event_name=function_name,
+            fields=fields,
+            network_name=network_name,
+            abi_type="function",
+        )
+        client.command(schema)
+        save_clickhouse_schema(path=path, event_name=function_name, schema=schema)
+
+    # do the blocks
     block_schema = (
         f"CREATE TABLE IF NOT EXISTS raw_{network_name}.{protocol_name}_block (\n"
         " `number` UInt64,\n"