diff --git a/crawlers/mooncrawl/mooncrawl/settings.py b/crawlers/mooncrawl/mooncrawl/settings.py
index 9b0a9197..d49690ae 100644
--- a/crawlers/mooncrawl/mooncrawl/settings.py
+++ b/crawlers/mooncrawl/mooncrawl/settings.py
@@ -40,6 +40,23 @@ DOCS_TARGET_PATH = "docs"
 
 # Crawler label
 CRAWLER_LABEL = "moonworm-alpha"
+VIEW_STATE_CRAWLER_LABEL = "view-state-alpha"
+METADATA_CRAWLER_LABEL = "metadata-crawler"
+
+
+MOONSTREAM_STATE_CRAWLER_DB_STATEMENT_TIMEOUT_MILLIS = 30000
+MOONSTREAM_STATE_CRAWLER_DB_STATEMENT_TIMEOUT_MILLIS_RAW = os.environ.get(
+    "MOONSTREAM_QUERY_API_DB_STATEMENT_TIMEOUT_MILLIS"
+)
+try:
+    if MOONSTREAM_STATE_CRAWLER_DB_STATEMENT_TIMEOUT_MILLIS_RAW is not None:
+        MOONSTREAM_STATE_CRAWLER_DB_STATEMENT_TIMEOUT_MILLIS = int(
+            MOONSTREAM_STATE_CRAWLER_DB_STATEMENT_TIMEOUT_MILLIS_RAW
+        )
+except:
+    raise Exception(
+        f"Could not parse MOONSTREAM_QUERY_API_DB_STATEMENT_TIMEOUT_MILLIS as int: {MOONSTREAM_STATE_CRAWLER_DB_STATEMENT_TIMEOUT_MILLIS_RAW}"
+    )
 
 # Geth connection address
 MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI = os.environ.get(
diff --git a/crawlers/mooncrawl/setup.py b/crawlers/mooncrawl/setup.py
index 0392c09c..7b14e8eb 100644
--- a/crawlers/mooncrawl/setup.py
+++ b/crawlers/mooncrawl/setup.py
@@ -62,6 +62,11 @@ setup(
             "moonworm-crawler=mooncrawl.moonworm_crawler.cli:main",
             "nft=mooncrawl.nft.cli:main",
             "statistics=mooncrawl.stats_worker.dashboard:main",
+<<<<<<< Updated upstream
+=======
+            "state-crawler=mooncrawl.state_crawler.cli:main",
+            "metadata-crawler=mooncrawl.metadata_crawler.cli:main",
+>>>>>>> Stashed changes
         ]
     },
 )