diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ce757865..0df7dbe8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog], and this project adheres to [Semantic Versioning].
 
-## [Unreleased]
+## [8.0.0b2] - 2024-06-27
 
 ### Added
 
 - env: Added `DIPDUP_JSON_LOG` environment variable to enable JSON logging.
+- cli: Added `--pre` flag to `self` group commands to install pre-release versions.
 
 ### Fixed
 
@@ -1503,7 +1504,8 @@ This release contains no changes except for the version number.
 [semantic versioning]: https://semver.org/spec/v2.0.0.html
 
 <!-- Versions -->
-[Unreleased]: https://github.com/dipdup-io/dipdup/compare/8.0.0b1...HEAD
+[Unreleased]: https://github.com/dipdup-io/dipdup/compare/8.0.0b2...HEAD
+[8.0.0b2]: https://github.com/dipdup-io/dipdup/compare/8.0.0b1...8.0.0b2
 [8.0.0b1]: https://github.com/dipdup-io/dipdup/compare/8.0.0a1...8.0.0b1
 [7.5.7]: https://github.com/dipdup-io/dipdup/compare/7.5.6...7.5.7
 [7.5.6]: https://github.com/dipdup-io/dipdup/compare/7.5.5...7.5.6
diff --git a/Makefile b/Makefile
index 028290d1e..db7034895 100644
--- a/Makefile
+++ b/Makefile
@@ -95,6 +95,6 @@ before_release: ## Prepare for a new release after updating version in pyproject
 	make update
 	make demos
 	make test
-	make docs_build
+	make docs
 
 ##
\ No newline at end of file
diff --git a/docs/7.references/1.cli.md b/docs/7.references/1.cli.md
index 6229a4a72..f17c2eab1 100644
--- a/docs/7.references/1.cli.md
+++ b/docs/7.references/1.cli.md
@@ -448,6 +448,12 @@ Discord:               <a class="reference external" href="https://discord.gg/aG
 <dd><p>Install DipDup from local path.</p>
 </dd></dl>
 
+<dl class="std option">
+<dt class="sig sig-object std" id="cmdoption-dipdup-self-install-pre">
+<span class="sig-name descname"><span class="pre">--pre</span></span><span class="sig-prename descclassname"></span></dt>
+<dd><p>Include pre-release versions.</p>
+</dd></dl>
+
 </section>
 
 
@@ -486,6 +492,12 @@ Discord:               <a class="reference external" href="https://discord.gg/aG
 <dd><p>Force reinstall.</p>
 </dd></dl>
 
+<dl class="std option">
+<dt class="sig sig-object std" id="cmdoption-dipdup-self-update-pre">
+<span class="sig-name descname"><span class="pre">--pre</span></span><span class="sig-prename descclassname"></span></dt>
+<dd><p>Include pre-release versions.</p>
+</dd></dl>
+
 </section>
 </section>
 </section>
\ No newline at end of file
diff --git a/docs/7.references/4.models.md b/docs/7.references/4.models.md
index d50d58107..865ac206e 100644
--- a/docs/7.references/4.models.md
+++ b/docs/7.references/4.models.md
@@ -833,7 +833,6 @@ description: "Models reference"
 <dd class="field-odd"><ul class="simple">
 <li><p><strong>mainnet</strong> – mainnet</p></li>
 <li><p><strong>ghostnet</strong> – ghostnet</p></li>
-<li><p><strong>mumbainet</strong> – mumbainet</p></li>
 <li><p><strong>nairobinet</strong> – nairobinet</p></li>
 <li><p><strong>oxfordnet</strong> – oxfordnet</p></li>
 <li><p><strong>parisnet</strong> – parisnet</p></li>
diff --git a/docs/8.examples/_demos_table.md b/docs/8.examples/_demos_table.md
index 287fcf3f3..d9a60af09 100644
--- a/docs/8.examples/_demos_table.md
+++ b/docs/8.examples/_demos_table.md
@@ -1,22 +1,22 @@
 <!-- markdownlint-disable first-line-h1 -->
 | name | network | description | source |
 |-|-|-|-|
-| demo_blank |  | Empty config for a fresh start | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_blank) |
-| demo_evm_events | EVM | ERC-20 token transfers (from event logs) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_evm_events) |
-| demo_evm_transactions | EVM | ERC-20 token transfers (from transactions) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_evm_transactions) |
-| demo_evm_uniswap | EVM | Uniswap V3 pools, positions, etc. (advanced, uses TimescaleDB) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_evm_uniswap) |
-| demo_starknet_events | EVM | ERC-20 token transfers (from events) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_starknet_events) |
-| demo_tezos_auction | Tezos | NFT marketplace (TzColors) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_auction) |
-| demo_tezos_big_maps | Tezos | Indexing specific big maps | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_big_maps) |
-| demo_tezos_dao | Tezos | DAO registry (Homebase DAO) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_dao) |
-| demo_tezos_dex | Tezos | DEX balances and liquidity (Quipuswap) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_dex) |
-| demo_tezos_domains | Tezos | Domain name service (Tezos Domains) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_domains) |
-| demo_tezos_etherlink | Tezos | Etherlink smart rollup transactions | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_etherlink) |
-| demo_tezos_events | Tezos | Processing contract events | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_events) |
-| demo_tezos_factories | Tezos | Example of spawning indexes in runtime | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_factories) |
-| demo_tezos_head | Tezos | Processing head block metadata (realtime only) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_head) |
-| demo_tezos_nft_marketplace | Tezos | NFT marketplace (hic at nunc) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_nft_marketplace) |
-| demo_tezos_raw | Tezos | Process raw operations without filtering and typed payloads | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_raw) |
-| demo_tezos_token | Tezos | FA1.2 token contract operations | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_token) |
-| demo_tezos_token_balances | Tezos | FA1.2 token balances | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_token_balances) |
-| demo_tezos_token_transfers | Tezos | FA1.2 token transfers | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b1/src/demo_tezos_token_transfers) |
+| demo_blank |  | Empty config for a fresh start | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_blank) |
+| demo_evm_events | EVM | ERC-20 token transfers (from event logs) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_evm_events) |
+| demo_evm_transactions | EVM | ERC-20 token transfers (from transactions) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_evm_transactions) |
+| demo_evm_uniswap | EVM | Uniswap V3 pools, positions, etc. (advanced, uses TimescaleDB) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_evm_uniswap) |
+| demo_starknet_events | Starknet | ERC-20 token transfers (from events) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_starknet_events) |
+| demo_tezos_auction | Tezos | NFT marketplace (TzColors) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_auction) |
+| demo_tezos_big_maps | Tezos | Indexing specific big maps | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_big_maps) |
+| demo_tezos_dao | Tezos | DAO registry (Homebase DAO) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_dao) |
+| demo_tezos_dex | Tezos | DEX balances and liquidity (Quipuswap) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_dex) |
+| demo_tezos_domains | Tezos | Domain name service (Tezos Domains) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_domains) |
+| demo_tezos_etherlink | Tezos | Etherlink smart rollup transactions | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_etherlink) |
+| demo_tezos_events | Tezos | Processing contract events | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_events) |
+| demo_tezos_factories | Tezos | Example of spawning indexes in runtime | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_factories) |
+| demo_tezos_head | Tezos | Processing head block metadata (realtime only) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_head) |
+| demo_tezos_nft_marketplace | Tezos | NFT marketplace (hic at nunc) | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_nft_marketplace) |
+| demo_tezos_raw | Tezos | Process raw operations without filtering and typed payloads | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_raw) |
+| demo_tezos_token | Tezos | FA1.2 token contract operations | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_token) |
+| demo_tezos_token_balances | Tezos | FA1.2 token balances | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_token_balances) |
+| demo_tezos_token_transfers | Tezos | FA1.2 token transfers | [link](https://github.com/dipdup-io/dipdup/tree/8.0.0b2/src/demo_tezos_token_transfers) |
diff --git a/docs/9.release-notes/1.v8.0.md b/docs/9.release-notes/1.v8.0.md
index 5795668e3..0cc844f1e 100644
--- a/docs/9.release-notes/1.v8.0.md
+++ b/docs/9.release-notes/1.v8.0.md
@@ -1,5 +1,5 @@
 ---
-title: 8.0.0b1
+title: 8.0.0b2
 description: DipDup 8.0 release notes
 ---
 
@@ -18,23 +18,23 @@ Welcome to DipDup 8.0 release notes! In this major release, we continue expandin
 
 ## GM, Starknet users
 
-[Starknet](https://docs.starknet.io/) is a permissionless zero-knowledge (ZK) rollup that operates on top of Ethereum, enabling dApps to achieve massive computation scale without compromising on Ethereum’s composability and security.
+[Starknet](https://docs.starknet.io/) is a permissionless zero-knowledge (ZK) rollup that operates on top of Ethereum, enabling dApps to achieve massive computational scale without compromising on Ethereum’s composability and security.
 
-We welcome Starknet to the big family of DipDup-supported networks! DipDup 8.0 introduces a new index kind `starknet.events` and a new datasource `starknet.subsquid` to work with Starknet events; more data types to come in the future.
+We welcome Starknet to the large family of DipDup-supported networks! DipDup 8.0 introduces a new index kind `starknet.events` and a new datasource `starknet.subsquid` to work with Starknet events. More datasources and index kinds will be added soon.
 
-Starknet contracts are written in [Cairo](https://github.com/starkware-libs/cairo), a custom-built and specialized programming language. But as a DipDup user, you don't need to know Cairo to start working with Starknet. Just add the index definition to your project and DipDup will generate Python types and handler stubs for you.
+Starknet contracts are written in [Cairo](https://github.com/starkware-libs/cairo), a specialized programming language. It's not EVM-compatible, but many concepts are similar. But as a DipDup user, you don't need to know the difference in detail to start working with Starknet. Just add the index definition to your project, place the contract ABI to `abi/<typename>/cairo_abi.json` and DipDup will generate Python types and handler stubs for you. You can use [Starkscan](https://starkscan.co/contract/0x068f5c6a61780768455de69077e07e89787839bf8166decfbf92b645209c0fb8#class-code-history) explorer to get the ABI and other information about the contract.
 
-To start creating your indexer, run `dipdup new` and select `demo_starknet_events` project as a template.
+To start building your indexer, run `dipdup new` and select the `demo_starknet_events` project as a template.
 
 ## Updated Python 3.12 environment
 
-DipDup 8.0 indexers now run on Python 3.12 bringing new language features and performance improvements to the table. Core dependencies were updated to the latest versions. Notable updates include:
+One of the DipDup features is a unified Python environment for all projects to simplify project deployment and maintenance. DipDup 8.0 indexers now run on Python 3.12 bringing new language features and performance improvements to the table. Core dependencies have been updated to the latest versions. Notable updates include:
 
 - pydantic 2.7 with significantly faster (de)serialization and powerful validators.
 - tortoise-orm 0.21.2 with better Pydantic integration and a bunch of bugfixes and optimizations.
 - web3 6.19 with the latest EIP and RPC changes.
 
-See the changelog for the full list. The result is a higher and more consistent indexing throughput. We have no proper benchmarking suite yet (it's hard to define a reliable metric for the indexing framework since performance is highly dependent on the indexer logic itself) but in-vivo tests show 10-20% performance improvement on average.
+See the changelog for a full list. One of the side effects of this update is a higher and more consistent indexing throughput. We do not yet have a proper benchmarking suite, but in vivo tests show an average performance improvement of 10-20%. Actual performance depends on the project and the network being indexed. We're still far from the fastest indexers in the competition, but making progress.
 
 ## New config specification
 
@@ -64,7 +64,7 @@ Existing projects require semi-automatic migration. Please follow the steps belo
 
 <!-- TODO: Remove arguments after dash and subdomain with a stable release -->
 1. Make sure you have Python 3.12 installed.
-2. Update the current DipDup installation. Run `dipdup self uninstall`, then `curl -Lsf https://dev.dipdup.io/install.py | python3.12 - -f -v 8.0.0b1`.
+2. Update the current DipDup installation. Run `dipdup self uninstall`, then `curl -Lsf https://dev.dipdup.io/install.py | python3.12 - --pre`.
 3. Enter the project directory, but do not activate the virtual environment. Run the `dipdup migrate` command. It will update your config files and generate a new package structure. Modules requiring manual migration will be moved to `<module>.old` path; leave them as is for now. Review and commit the changes.
 4. Run `dipdup init --base --force` command to update pyproject.toml and other metadata files. Recreate and enter the virtual environment. For PDM run `rm -rf .venv pdm.lock && pdm venv create python3.12 && pdm install && $(pdm venv activate)`. For Poetry run `rm -rf .venv poetry.lock && poetry install && poetry shell`. Review and commit the changes.
 5. Move the callback function bodies from `<module>.old` to `<module>` files. Review and commit the changes.
diff --git a/docs/9.release-notes/_8.0_changelog.md b/docs/9.release-notes/_8.0_changelog.md
index 8cc327310..cd7011528 100644
--- a/docs/9.release-notes/_8.0_changelog.md
+++ b/docs/9.release-notes/_8.0_changelog.md
@@ -3,6 +3,7 @@
 
 ### Added
 
+- cli: Added `--pre` flag to `self` group commands to install pre-release versions.
 - cli: Added `--raw` option to `config export` command to dump config preserving the original structure.
 - cli: Added `package verify` command to check the package consistency.
 - cli: Added full project migration support for 3.0 spec.
diff --git a/docs/_curl-spell.md b/docs/_curl-spell.md
index 372870d30..604edceae 100644
--- a/docs/_curl-spell.md
+++ b/docs/_curl-spell.md
@@ -1,4 +1,4 @@
 <!-- markdownlint-disable first-line-h1 -->
 ```shell [Terminal]
-curl -Lsf https://dev.dipdup.io/install.py | python3.12  -v '8.0.0b1'
+curl -Lsf https://dev.dipdup.io/install.py | python3.12 - --pre
 ```
diff --git a/pdm.lock b/pdm.lock
index 07f4996f6..de448e6c4 100644
--- a/pdm.lock
+++ b/pdm.lock
@@ -4,8 +4,8 @@
 [metadata]
 groups = ["default", "dev", "docs"]
 strategy = ["cross_platform", "inherit_metadata"]
-lock_version = "4.4.1"
-content_hash = "sha256:b0273bc60c8b364d0fe729e3a68d38c3af44877c5f9b6f6342bd6f9df209e37b"
+lock_version = "4.4.2"
+content_hash = "sha256:b1715759a61f2f3686ede298474d9ff6f1379123da7305b9f34617e2d900f5e3"
 
 [[package]]
 name = "aiohttp"
@@ -1746,33 +1746,34 @@ files = [
 
 [[package]]
 name = "ruff"
-version = "0.4.10"
+version = "0.5.0"
 requires_python = ">=3.7"
 summary = "An extremely fast Python linter and code formatter, written in Rust."
 groups = ["dev"]
 files = [
-    {file = "ruff-0.4.10-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:5c2c4d0859305ac5a16310eec40e4e9a9dec5dcdfbe92697acd99624e8638dac"},
-    {file = "ruff-0.4.10-py3-none-macosx_11_0_arm64.whl", hash = "sha256:a79489607d1495685cdd911a323a35871abfb7a95d4f98fc6f85e799227ac46e"},
-    {file = "ruff-0.4.10-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1dd1681dfa90a41b8376a61af05cc4dc5ff32c8f14f5fe20dba9ff5deb80cd6"},
-    {file = "ruff-0.4.10-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c75c53bb79d71310dc79fb69eb4902fba804a81f374bc86a9b117a8d077a1784"},
-    {file = "ruff-0.4.10-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:18238c80ee3d9100d3535d8eb15a59c4a0753b45cc55f8bf38f38d6a597b9739"},
-    {file = "ruff-0.4.10-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:d8f71885bce242da344989cae08e263de29752f094233f932d4f5cfb4ef36a81"},
-    {file = "ruff-0.4.10-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:330421543bd3222cdfec481e8ff3460e8702ed1e58b494cf9d9e4bf90db52b9d"},
-    {file = "ruff-0.4.10-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9e9b6fb3a37b772628415b00c4fc892f97954275394ed611056a4b8a2631365e"},
-    {file = "ruff-0.4.10-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0f54c481b39a762d48f64d97351048e842861c6662d63ec599f67d515cb417f6"},
-    {file = "ruff-0.4.10-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:67fe086b433b965c22de0b4259ddfe6fa541c95bf418499bedb9ad5fb8d1c631"},
-    {file = "ruff-0.4.10-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:acfaaab59543382085f9eb51f8e87bac26bf96b164839955f244d07125a982ef"},
-    {file = "ruff-0.4.10-py3-none-musllinux_1_2_i686.whl", hash = "sha256:3cea07079962b2941244191569cf3a05541477286f5cafea638cd3aa94b56815"},
-    {file = "ruff-0.4.10-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:338a64ef0748f8c3a80d7f05785930f7965d71ca260904a9321d13be24b79695"},
-    {file = "ruff-0.4.10-py3-none-win32.whl", hash = "sha256:ffe3cd2f89cb54561c62e5fa20e8f182c0a444934bf430515a4b422f1ab7b7ca"},
-    {file = "ruff-0.4.10-py3-none-win_amd64.whl", hash = "sha256:67f67cef43c55ffc8cc59e8e0b97e9e60b4837c8f21e8ab5ffd5d66e196e25f7"},
-    {file = "ruff-0.4.10-py3-none-win_arm64.whl", hash = "sha256:dd1fcee327c20addac7916ca4e2653fbbf2e8388d8a6477ce5b4e986b68ae6c0"},
-    {file = "ruff-0.4.10.tar.gz", hash = "sha256:3aa4f2bc388a30d346c56524f7cacca85945ba124945fe489952aadb6b5cd804"},
+    {file = "ruff-0.5.0-py3-none-linux_armv6l.whl", hash = "sha256:ee770ea8ab38918f34e7560a597cc0a8c9a193aaa01bfbd879ef43cb06bd9c4c"},
+    {file = "ruff-0.5.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:38f3b8327b3cb43474559d435f5fa65dacf723351c159ed0dc567f7ab735d1b6"},
+    {file = "ruff-0.5.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:7594f8df5404a5c5c8f64b8311169879f6cf42142da644c7e0ba3c3f14130370"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:adc7012d6ec85032bc4e9065110df205752d64010bed5f958d25dbee9ce35de3"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d505fb93b0fabef974b168d9b27c3960714d2ecda24b6ffa6a87ac432905ea38"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9dc5cfd3558f14513ed0d5b70ce531e28ea81a8a3b1b07f0f48421a3d9e7d80a"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:db3ca35265de239a1176d56a464b51557fce41095c37d6c406e658cf80bbb362"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b1a321c4f68809fddd9b282fab6a8d8db796b270fff44722589a8b946925a2a8"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2c4dfcd8d34b143916994b3876b63d53f56724c03f8c1a33a253b7b1e6bf2a7d"},
+    {file = "ruff-0.5.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:81e5facfc9f4a674c6a78c64d38becfbd5e4f739c31fcd9ce44c849f1fad9e4c"},
+    {file = "ruff-0.5.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:e589e27971c2a3efff3fadafb16e5aef7ff93250f0134ec4b52052b673cf988d"},
+    {file = "ruff-0.5.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:d2ffbc3715a52b037bcb0f6ff524a9367f642cdc5817944f6af5479bbb2eb50e"},
+    {file = "ruff-0.5.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:cd096e23c6a4f9c819525a437fa0a99d1c67a1b6bb30948d46f33afbc53596cf"},
+    {file = "ruff-0.5.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:46e193b36f2255729ad34a49c9a997d506e58f08555366b2108783b3064a0e1e"},
+    {file = "ruff-0.5.0-py3-none-win32.whl", hash = "sha256:49141d267100f5ceff541b4e06552e98527870eafa1acc9dec9139c9ec5af64c"},
+    {file = "ruff-0.5.0-py3-none-win_amd64.whl", hash = "sha256:e9118f60091047444c1b90952736ee7b1792910cab56e9b9a9ac20af94cd0440"},
+    {file = "ruff-0.5.0-py3-none-win_arm64.whl", hash = "sha256:ed5c4df5c1fb4518abcb57725b576659542bdbe93366f4f329e8f398c4b71178"},
+    {file = "ruff-0.5.0.tar.gz", hash = "sha256:eb641b5873492cf9bd45bc9c5ae5320648218e04386a5f0c264ad6ccce8226a1"},
 ]
 
 [[package]]
 name = "sentry-sdk"
-version = "2.6.0"
+version = "2.7.1"
 requires_python = ">=3.6"
 summary = "Python client for Sentry (https://sentry.io)"
 groups = ["default"]
@@ -1781,8 +1782,8 @@ dependencies = [
     "urllib3>=1.26.11",
 ]
 files = [
-    {file = "sentry_sdk-2.6.0-py2.py3-none-any.whl", hash = "sha256:422b91cb49378b97e7e8d0e8d5a1069df23689d45262b86f54988a7db264e874"},
-    {file = "sentry_sdk-2.6.0.tar.gz", hash = "sha256:65cc07e9c6995c5e316109f138570b32da3bd7ff8d0d0ee4aaf2628c3dd8127d"},
+    {file = "sentry_sdk-2.7.1-py2.py3-none-any.whl", hash = "sha256:ef1b3d54eb715825657cd4bb3cb42bb4dc85087bac14c56b0fd8c21abd968c9a"},
+    {file = "sentry_sdk-2.7.1.tar.gz", hash = "sha256:25006c7e68b75aaa5e6b9c6a420ece22e8d7daec4b7a906ffd3a8607b67c037b"},
 ]
 
 [[package]]
@@ -2167,7 +2168,7 @@ files = [
 
 [[package]]
 name = "web3"
-version = "6.19.0"
+version = "6.20.0"
 requires_python = ">=3.7.2"
 summary = "web3.py"
 groups = ["default"]
@@ -2189,8 +2190,8 @@ dependencies = [
     "websockets>=10.0.0",
 ]
 files = [
-    {file = "web3-6.19.0-py3-none-any.whl", hash = "sha256:fb39683d6aa7586ce0ab0be4be392f8acb62c2503958079d61b59f2a0b883718"},
-    {file = "web3-6.19.0.tar.gz", hash = "sha256:d27fbd4ac5aa70d0e0c516bd3e3b802fbe74bc159b407c34052d9301b400f757"},
+    {file = "web3-6.20.0-py3-none-any.whl", hash = "sha256:ec09882d21378b688210cf29385e82b604bdc18fe5c2e238bf3b5fe2a6e6dbbc"},
+    {file = "web3-6.20.0.tar.gz", hash = "sha256:b04725517502cad4f15e39356eaf7c4fcb0127c7728f83eec8cbafb5b6455f33"},
 ]
 
 [[package]]
diff --git a/pyproject.toml b/pyproject.toml
index 8804fb4cf..1f2c886a3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "dipdup"
 description = "Modular framework for creating selective indexers and featureful backends for dapps"
-version = "8.0.0b1"
+version = "8.0.0b2"
 license = { text = "MIT" }
 authors = [
     { name = "Lev Gorodetskii", email = "dipdup@drsr.io" },
diff --git a/requirements.dev.txt b/requirements.dev.txt
index 4fbdf6b75..ec81207bb 100644
--- a/requirements.dev.txt
+++ b/requirements.dev.txt
@@ -23,7 +23,7 @@ charset-normalizer==3.3.2
 ckzg==1.0.2
 click==8.1.7
 colorama==0.4.6; platform_system == "Windows" or sys_platform == "win32"
-coverage==7.5.3
+coverage[toml]==7.5.3
 crypto-cpp-py==1.4.4
 cytoolz==0.12.3; implementation_name == "cpython"
 datamodel-code-generator==0.25.7
@@ -34,7 +34,7 @@ ecdsa==0.18.0
 email-validator==2.1.1; python_version ~= "3.11"
 eth-abi==5.1.0
 eth-account==0.11.2
-eth-hash==0.7.0
+eth-hash[pycryptodome]==0.7.0
 eth-keyfile==0.8.1
 eth-keys==0.5.1
 eth-rlp==1.0.1
@@ -76,8 +76,8 @@ prometheus-client==0.20.0
 protobuf==5.27.1
 pyarrow==16.1.0
 pycryptodome==3.20.0
-pydantic==2.7.4
 pydantic-core==2.18.4
+pydantic[email]==2.7.4; python_version ~= "3.11"
 pygments==2.18.0
 pyhumps==3.8.0
 pypika-tortoise==0.1.6
@@ -100,8 +100,8 @@ rlp==4.0.1
 rpds-py==0.18.1
 ruamel-yaml==0.18.6
 ruamel-yaml-clib==0.2.8; platform_python_implementation == "CPython" and python_version < "3.13"
-ruff==0.4.10
-sentry-sdk==2.6.0
+ruff==0.5.0
+sentry-sdk==2.7.1
 six==1.16.0
 sniffio==1.3.1
 snowballstemmer==2.2.0
@@ -130,6 +130,6 @@ tzdata==2024.1; platform_system == "Windows"
 tzlocal==5.2
 urllib3==2.2.1
 watchdog==4.0.1
-web3==6.19.0
+web3==6.20.0
 websockets==12.0
 yarl==1.9.4
diff --git a/requirements.txt b/requirements.txt
index aadd529df..26f584edd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,7 +29,7 @@ ecdsa==0.18.0
 email-validator==2.1.1; python_version ~= "3.11"
 eth-abi==5.1.0
 eth-account==0.11.2
-eth-hash==0.7.0
+eth-hash[pycryptodome]==0.7.0
 eth-keyfile==0.8.1
 eth-keys==0.5.1
 eth-rlp==1.0.1
@@ -66,8 +66,8 @@ prometheus-client==0.20.0
 protobuf==5.27.1
 pyarrow==16.1.0
 pycryptodome==3.20.0
-pydantic==2.7.4
 pydantic-core==2.18.4
+pydantic[email]==2.7.4; python_version ~= "3.11"
 pyhumps==3.8.0
 pypika-tortoise==0.1.6
 pysignalr==1.0.0
@@ -84,7 +84,7 @@ rlp==4.0.1
 rpds-py==0.18.1
 ruamel-yaml==0.18.6
 ruamel-yaml-clib==0.2.8; platform_python_implementation == "CPython" and python_version < "3.13"
-sentry-sdk==2.6.0
+sentry-sdk==2.7.1
 six==1.16.0
 sniffio==1.3.1
 sqlparse==0.5.0
@@ -100,6 +100,6 @@ typing-inspect==0.9.0
 tzdata==2024.1; platform_system == "Windows"
 tzlocal==5.2
 urllib3==2.2.1
-web3==6.19.0
+web3==6.20.0
 websockets==12.0
 yarl==1.9.4
diff --git a/schema.json b/schema.json
index 132ca58b3..629780c8b 100644
--- a/schema.json
+++ b/schema.json
@@ -2365,11 +2365,10 @@
       "type": "object"
     },
     "TzipMetadataNetwork": {
-      "description": "Tezos network enum for TZIP-16 metadata.\n\n:param mainnet: mainnet\n:param ghostnet: ghostnet\n:param mumbainet: mumbainet\n:param nairobinet: nairobinet\n:param oxfordnet: oxfordnet\n:param parisnet: parisnet",
+      "description": "Tezos network enum for TZIP-16 metadata.\n\n:param mainnet: mainnet\n:param ghostnet: ghostnet\n:param nairobinet: nairobinet\n:param oxfordnet: oxfordnet\n:param parisnet: parisnet",
       "enum": [
         "mainnet",
         "ghostnet",
-        "mumbainet",
         "nairobinet",
         "oxfordnet",
         "parisnet"
diff --git a/scripts/demos.py b/scripts/demos.py
index 976c2d47d..87ec515b5 100644
--- a/scripts/demos.py
+++ b/scripts/demos.py
@@ -22,11 +22,23 @@
 
 
 def _get_demos() -> dict[str, Path]:
-    return {p.name: p for p in SRC_PATH.iterdir() if p.is_dir() and p.name.startswith(DEMO_PREFIX)}
+    return {
+        p.name: p
+        for p in SRC_PATH.iterdir()
+        if p.is_dir() and p.name.startswith(DEMO_PREFIX)
+        # FIXME: nairobinet is dead
+        if p.name != 'demo_tezos_etherlink'
+    }
 
 
 def _get_projects() -> dict[str, Path]:
-    return {p.name: p for p in PROJECTS_PATH.iterdir() if p.is_dir() and p.name.startswith(DEMO_PREFIX)}
+    return {
+        p.name: p
+        for p in PROJECTS_PATH.iterdir()
+        if p.is_dir() and p.name.startswith(DEMO_PREFIX)
+        # FIXME: nairobinet is dead
+        if p.name != 'demo_tezos_etherlink'
+    }
 
 
 def _render_demo(path: Path) -> None:
diff --git a/scripts/docs.py b/scripts/docs.py
index 9173f319d..d0d8800bc 100755
--- a/scripts/docs.py
+++ b/scripts/docs.py
@@ -696,12 +696,14 @@ def dump_demos() -> None:
     for replay_path in replays:
         replay = answers_from_replay(replay_path)
         package, description = replay['package'], replay['description']
-        if package in TEMPLATES['other']:
-            network = ''
-        elif package in TEMPLATES['evm']:
+        if package in TEMPLATES['evm']:
             network = 'EVM'
         elif package in TEMPLATES['tezos']:
             network = 'Tezos'
+        elif package in TEMPLATES['starknet']:
+            network = 'Starknet'
+        else:
+            network = ''
         demos.append((package, network, description))
 
     # NOTE: Sort by blockchain first, then by package name
diff --git a/src/demo_blank/pyproject.toml b/src/demo_blank/pyproject.toml
index 08f39b66f..34f555117 100644
--- a/src/demo_blank/pyproject.toml
+++ b/src/demo_blank/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_blank"
 version = "0.0.1"
diff --git a/src/demo_evm_events/pyproject.toml b/src/demo_evm_events/pyproject.toml
index 840996483..b5ea3459d 100644
--- a/src/demo_evm_events/pyproject.toml
+++ b/src/demo_evm_events/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_evm_events"
 version = "0.0.1"
diff --git a/src/demo_evm_events/types/eth_usdt/evm_events/transfer.py b/src/demo_evm_events/types/eth_usdt/evm_events/transfer.py
index 6acfc80ca..27a35c7df 100644
--- a/src/demo_evm_events/types/eth_usdt/evm_events/transfer.py
+++ b/src/demo_evm_events/types/eth_usdt/evm_events/transfer.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_evm_transactions/pyproject.toml b/src/demo_evm_transactions/pyproject.toml
index 4683e02c0..248c781f0 100644
--- a/src/demo_evm_transactions/pyproject.toml
+++ b/src/demo_evm_transactions/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_evm_transactions"
 version = "0.0.1"
diff --git a/src/demo_evm_transactions/types/eth_usdt/evm_transactions/transfer.py b/src/demo_evm_transactions/types/eth_usdt/evm_transactions/transfer.py
index 3f9200362..9106e7192 100644
--- a/src/demo_evm_transactions/types/eth_usdt/evm_transactions/transfer.py
+++ b/src/demo_evm_transactions/types/eth_usdt/evm_transactions/transfer.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_evm_uniswap/pyproject.toml b/src/demo_evm_uniswap/pyproject.toml
index 127202510..334229e91 100644
--- a/src/demo_evm_uniswap/pyproject.toml
+++ b/src/demo_evm_uniswap/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_evm_uniswap"
 version = "0.0.1"
diff --git a/src/demo_evm_uniswap/types/factory/evm_events/pool_created.py b/src/demo_evm_uniswap/types/factory/evm_events/pool_created.py
index 6ea82110c..a8ba74054 100644
--- a/src/demo_evm_uniswap/types/factory/evm_events/pool_created.py
+++ b/src/demo_evm_uniswap/types/factory/evm_events/pool_created.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_evm_uniswap/types/pool/evm_events/burn.py b/src/demo_evm_uniswap/types/pool/evm_events/burn.py
index c27007c56..d9961b10b 100644
--- a/src/demo_evm_uniswap/types/pool/evm_events/burn.py
+++ b/src/demo_evm_uniswap/types/pool/evm_events/burn.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_evm_uniswap/types/pool/evm_events/collect.py b/src/demo_evm_uniswap/types/pool/evm_events/collect.py
index 7f9f600ff..4a1b603a6 100644
--- a/src/demo_evm_uniswap/types/pool/evm_events/collect.py
+++ b/src/demo_evm_uniswap/types/pool/evm_events/collect.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_evm_uniswap/types/pool/evm_events/flash.py b/src/demo_evm_uniswap/types/pool/evm_events/flash.py
index fdb35a4bf..389c8d46b 100644
--- a/src/demo_evm_uniswap/types/pool/evm_events/flash.py
+++ b/src/demo_evm_uniswap/types/pool/evm_events/flash.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_evm_uniswap/types/pool/evm_events/initialize.py b/src/demo_evm_uniswap/types/pool/evm_events/initialize.py
index b2609b35c..a4eaf26b7 100644
--- a/src/demo_evm_uniswap/types/pool/evm_events/initialize.py
+++ b/src/demo_evm_uniswap/types/pool/evm_events/initialize.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_evm_uniswap/types/pool/evm_events/mint.py b/src/demo_evm_uniswap/types/pool/evm_events/mint.py
index c43a920e3..2be272e8e 100644
--- a/src/demo_evm_uniswap/types/pool/evm_events/mint.py
+++ b/src/demo_evm_uniswap/types/pool/evm_events/mint.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_evm_uniswap/types/pool/evm_events/swap.py b/src/demo_evm_uniswap/types/pool/evm_events/swap.py
index 4e020cb28..793f114ed 100644
--- a/src/demo_evm_uniswap/types/pool/evm_events/swap.py
+++ b/src/demo_evm_uniswap/types/pool/evm_events/swap.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_evm_uniswap/types/position_manager/evm_events/collect.py b/src/demo_evm_uniswap/types/position_manager/evm_events/collect.py
index a3b04a1dc..52f61f64d 100644
--- a/src/demo_evm_uniswap/types/position_manager/evm_events/collect.py
+++ b/src/demo_evm_uniswap/types/position_manager/evm_events/collect.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_evm_uniswap/types/position_manager/evm_events/decrease_liquidity.py b/src/demo_evm_uniswap/types/position_manager/evm_events/decrease_liquidity.py
index 52b8eff83..bd7fbb997 100644
--- a/src/demo_evm_uniswap/types/position_manager/evm_events/decrease_liquidity.py
+++ b/src/demo_evm_uniswap/types/position_manager/evm_events/decrease_liquidity.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_evm_uniswap/types/position_manager/evm_events/increase_liquidity.py b/src/demo_evm_uniswap/types/position_manager/evm_events/increase_liquidity.py
index bc0003a05..928eade42 100644
--- a/src/demo_evm_uniswap/types/position_manager/evm_events/increase_liquidity.py
+++ b/src/demo_evm_uniswap/types/position_manager/evm_events/increase_liquidity.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_evm_uniswap/types/position_manager/evm_events/transfer.py b/src/demo_evm_uniswap/types/position_manager/evm_events/transfer.py
index f636ce11e..1bfa1e12a 100644
--- a/src/demo_evm_uniswap/types/position_manager/evm_events/transfer.py
+++ b/src/demo_evm_uniswap/types/position_manager/evm_events/transfer.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_starknet_events/pyproject.toml b/src/demo_starknet_events/pyproject.toml
index 5eeeccedb..6753fb8be 100644
--- a/src/demo_starknet_events/pyproject.toml
+++ b/src/demo_starknet_events/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_starknet_events"
 version = "0.0.1"
diff --git a/src/demo_starknet_events/types/stark_usdt/starknet_events/transfer.py b/src/demo_starknet_events/types/stark_usdt/starknet_events/transfer.py
index 09ed75ea7..93d10b579 100644
--- a/src/demo_starknet_events/types/stark_usdt/starknet_events/transfer.py
+++ b/src/demo_starknet_events/types/stark_usdt/starknet_events/transfer.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_auction/pyproject.toml b/src/demo_tezos_auction/pyproject.toml
index 28ea58b65..1bf5ffc72 100644
--- a/src/demo_tezos_auction/pyproject.toml
+++ b/src/demo_tezos_auction/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_auction"
 version = "0.0.1"
diff --git a/src/demo_tezos_auction/types/tzcolors_auction/tezos_parameters/bid.py b/src/demo_tezos_auction/types/tzcolors_auction/tezos_parameters/bid.py
index 80ff563dc..422fd2db2 100644
--- a/src/demo_tezos_auction/types/tzcolors_auction/tezos_parameters/bid.py
+++ b/src/demo_tezos_auction/types/tzcolors_auction/tezos_parameters/bid.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_auction/types/tzcolors_auction/tezos_parameters/create_auction.py b/src/demo_tezos_auction/types/tzcolors_auction/tezos_parameters/create_auction.py
index bc217fd68..5d1c2a494 100644
--- a/src/demo_tezos_auction/types/tzcolors_auction/tezos_parameters/create_auction.py
+++ b/src/demo_tezos_auction/types/tzcolors_auction/tezos_parameters/create_auction.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_auction/types/tzcolors_auction/tezos_parameters/withdraw.py b/src/demo_tezos_auction/types/tzcolors_auction/tezos_parameters/withdraw.py
index 5de54bfb6..a949d2eae 100644
--- a/src/demo_tezos_auction/types/tzcolors_auction/tezos_parameters/withdraw.py
+++ b/src/demo_tezos_auction/types/tzcolors_auction/tezos_parameters/withdraw.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_auction/types/tzcolors_auction/tezos_storage.py b/src/demo_tezos_auction/types/tzcolors_auction/tezos_storage.py
index ff9681ef3..1ecc66836 100644
--- a/src/demo_tezos_auction/types/tzcolors_auction/tezos_storage.py
+++ b/src/demo_tezos_auction/types/tzcolors_auction/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_big_maps/pyproject.toml b/src/demo_tezos_big_maps/pyproject.toml
index fb91b904b..469f31eb5 100644
--- a/src/demo_tezos_big_maps/pyproject.toml
+++ b/src/demo_tezos_big_maps/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_big_maps"
 version = "0.0.1"
diff --git a/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_expiry_map_key.py b/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_expiry_map_key.py
index 63c82d69f..2694f9991 100644
--- a/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_expiry_map_key.py
+++ b/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_expiry_map_key.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_expiry_map_value.py b/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_expiry_map_value.py
index 8e208b6f3..ec9adcd2e 100644
--- a/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_expiry_map_value.py
+++ b/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_expiry_map_value.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_records_key.py b/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_records_key.py
index 96b2bf9f0..22d0847e2 100644
--- a/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_records_key.py
+++ b/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_records_key.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_records_value.py b/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_records_value.py
index c2bb3734e..5ae39de27 100644
--- a/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_records_value.py
+++ b/src/demo_tezos_big_maps/types/name_registry/tezos_big_maps/store_records_value.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dao/pyproject.toml b/src/demo_tezos_dao/pyproject.toml
index a7f6c2d38..895ca09b9 100644
--- a/src/demo_tezos_dao/pyproject.toml
+++ b/src/demo_tezos_dao/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_dao"
 version = "0.0.1"
diff --git a/src/demo_tezos_dao/types/registry/tezos_parameters/propose.py b/src/demo_tezos_dao/types/registry/tezos_parameters/propose.py
index 8f5d86887..c677d6fa6 100644
--- a/src/demo_tezos_dao/types/registry/tezos_parameters/propose.py
+++ b/src/demo_tezos_dao/types/registry/tezos_parameters/propose.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dao/types/registry/tezos_storage.py b/src/demo_tezos_dao/types/registry/tezos_storage.py
index 60687d365..a5ccbca90 100644
--- a/src/demo_tezos_dao/types/registry/tezos_storage.py
+++ b/src/demo_tezos_dao/types/registry/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/pyproject.toml b/src/demo_tezos_dex/pyproject.toml
index ef216f636..004e7e95f 100644
--- a/src/demo_tezos_dex/pyproject.toml
+++ b/src/demo_tezos_dex/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_dex"
 version = "0.0.1"
diff --git a/src/demo_tezos_dex/types/fa12_token/tezos_parameters/transfer.py b/src/demo_tezos_dex/types/fa12_token/tezos_parameters/transfer.py
index bd3bd76e3..9af3bdec8 100644
--- a/src/demo_tezos_dex/types/fa12_token/tezos_parameters/transfer.py
+++ b/src/demo_tezos_dex/types/fa12_token/tezos_parameters/transfer.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/fa12_token/tezos_storage.py b/src/demo_tezos_dex/types/fa12_token/tezos_storage.py
index 823608f34..e8c741eee 100644
--- a/src/demo_tezos_dex/types/fa12_token/tezos_storage.py
+++ b/src/demo_tezos_dex/types/fa12_token/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/fa2_token/tezos_parameters/transfer.py b/src/demo_tezos_dex/types/fa2_token/tezos_parameters/transfer.py
index a9c9ddcd3..8dda71265 100644
--- a/src/demo_tezos_dex/types/fa2_token/tezos_parameters/transfer.py
+++ b/src/demo_tezos_dex/types/fa2_token/tezos_parameters/transfer.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/fa2_token/tezos_storage.py b/src/demo_tezos_dex/types/fa2_token/tezos_storage.py
index 936899e54..66c45f07e 100644
--- a/src/demo_tezos_dex/types/fa2_token/tezos_storage.py
+++ b/src/demo_tezos_dex/types/fa2_token/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/divest_liquidity.py b/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/divest_liquidity.py
index 467f29d33..4916b5cea 100644
--- a/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/divest_liquidity.py
+++ b/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/divest_liquidity.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/invest_liquidity.py b/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/invest_liquidity.py
index 9d2795d71..32286406d 100644
--- a/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/invest_liquidity.py
+++ b/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/invest_liquidity.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/tez_to_token_payment.py b/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/tez_to_token_payment.py
index f02b08d80..b199e2be1 100644
--- a/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/tez_to_token_payment.py
+++ b/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/tez_to_token_payment.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/token_to_tez_payment.py b/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/token_to_tez_payment.py
index a36d2a0dd..8864ff9f5 100644
--- a/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/token_to_tez_payment.py
+++ b/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/token_to_tez_payment.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/transfer.py b/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/transfer.py
index bd3bd76e3..9af3bdec8 100644
--- a/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/transfer.py
+++ b/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/transfer.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/withdraw_profit.py b/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/withdraw_profit.py
index 5cac9d90e..ccd28bee0 100644
--- a/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/withdraw_profit.py
+++ b/src/demo_tezos_dex/types/quipu_fa12/tezos_parameters/withdraw_profit.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa12/tezos_storage.py b/src/demo_tezos_dex/types/quipu_fa12/tezos_storage.py
index 06b839144..a2e18dded 100644
--- a/src/demo_tezos_dex/types/quipu_fa12/tezos_storage.py
+++ b/src/demo_tezos_dex/types/quipu_fa12/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/divest_liquidity.py b/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/divest_liquidity.py
index 467f29d33..4916b5cea 100644
--- a/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/divest_liquidity.py
+++ b/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/divest_liquidity.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/invest_liquidity.py b/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/invest_liquidity.py
index 9d2795d71..32286406d 100644
--- a/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/invest_liquidity.py
+++ b/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/invest_liquidity.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/tez_to_token_payment.py b/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/tez_to_token_payment.py
index f02b08d80..b199e2be1 100644
--- a/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/tez_to_token_payment.py
+++ b/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/tez_to_token_payment.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/token_to_tez_payment.py b/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/token_to_tez_payment.py
index a36d2a0dd..8864ff9f5 100644
--- a/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/token_to_tez_payment.py
+++ b/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/token_to_tez_payment.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/transfer.py b/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/transfer.py
index a9c9ddcd3..8dda71265 100644
--- a/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/transfer.py
+++ b/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/transfer.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/withdraw_profit.py b/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/withdraw_profit.py
index 5cac9d90e..ccd28bee0 100644
--- a/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/withdraw_profit.py
+++ b/src/demo_tezos_dex/types/quipu_fa2/tezos_parameters/withdraw_profit.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_dex/types/quipu_fa2/tezos_storage.py b/src/demo_tezos_dex/types/quipu_fa2/tezos_storage.py
index acd0dfb30..28f1369e1 100644
--- a/src/demo_tezos_dex/types/quipu_fa2/tezos_storage.py
+++ b/src/demo_tezos_dex/types/quipu_fa2/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_domains/pyproject.toml b/src/demo_tezos_domains/pyproject.toml
index c928ebf38..9550b1ce0 100644
--- a/src/demo_tezos_domains/pyproject.toml
+++ b/src/demo_tezos_domains/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_domains"
 version = "0.0.1"
diff --git a/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_expiry_map_key.py b/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_expiry_map_key.py
index 63c82d69f..2694f9991 100644
--- a/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_expiry_map_key.py
+++ b/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_expiry_map_key.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_expiry_map_value.py b/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_expiry_map_value.py
index 8e208b6f3..ec9adcd2e 100644
--- a/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_expiry_map_value.py
+++ b/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_expiry_map_value.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_records_key.py b/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_records_key.py
index 96b2bf9f0..22d0847e2 100644
--- a/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_records_key.py
+++ b/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_records_key.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_records_value.py b/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_records_value.py
index c2bb3734e..5ae39de27 100644
--- a/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_records_value.py
+++ b/src/demo_tezos_domains/types/name_registry/tezos_big_maps/store_records_value.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_etherlink/pyproject.toml b/src/demo_tezos_etherlink/pyproject.toml
index 21b306dc7..03908a72f 100644
--- a/src/demo_tezos_etherlink/pyproject.toml
+++ b/src/demo_tezos_etherlink/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_etherlink"
 version = "0.0.1"
diff --git a/src/demo_tezos_etherlink/types/rollup/tezos_parameters/default.py b/src/demo_tezos_etherlink/types/rollup/tezos_parameters/default.py
index a7689b77a..f4b23ce20 100644
--- a/src/demo_tezos_etherlink/types/rollup/tezos_parameters/default.py
+++ b/src/demo_tezos_etherlink/types/rollup/tezos_parameters/default.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_etherlink/types/rollup/tezos_storage.py b/src/demo_tezos_etherlink/types/rollup/tezos_storage.py
index 308be788d..978c7d363 100644
--- a/src/demo_tezos_etherlink/types/rollup/tezos_storage.py
+++ b/src/demo_tezos_etherlink/types/rollup/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_etherlink/types/ticket_helper/tezos_parameters/default.py b/src/demo_tezos_etherlink/types/ticket_helper/tezos_parameters/default.py
index 0100b0d3e..697663801 100644
--- a/src/demo_tezos_etherlink/types/ticket_helper/tezos_parameters/default.py
+++ b/src/demo_tezos_etherlink/types/ticket_helper/tezos_parameters/default.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_etherlink/types/ticket_helper/tezos_storage.py b/src/demo_tezos_etherlink/types/ticket_helper/tezos_storage.py
index 292ec6b7a..84e94a61a 100644
--- a/src/demo_tezos_etherlink/types/ticket_helper/tezos_storage.py
+++ b/src/demo_tezos_etherlink/types/ticket_helper/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_etherlink/types/ticketer/tezos_parameters/deposit.py b/src/demo_tezos_etherlink/types/ticketer/tezos_parameters/deposit.py
index f7e5215fe..5e295b9a6 100644
--- a/src/demo_tezos_etherlink/types/ticketer/tezos_parameters/deposit.py
+++ b/src/demo_tezos_etherlink/types/ticketer/tezos_parameters/deposit.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_etherlink/types/ticketer/tezos_parameters/withdraw.py b/src/demo_tezos_etherlink/types/ticketer/tezos_parameters/withdraw.py
index 60d67fff0..61d122e09 100644
--- a/src/demo_tezos_etherlink/types/ticketer/tezos_parameters/withdraw.py
+++ b/src/demo_tezos_etherlink/types/ticketer/tezos_parameters/withdraw.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_etherlink/types/ticketer/tezos_storage.py b/src/demo_tezos_etherlink/types/ticketer/tezos_storage.py
index 792b1e887..18ef96185 100644
--- a/src/demo_tezos_etherlink/types/ticketer/tezos_storage.py
+++ b/src/demo_tezos_etherlink/types/ticketer/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_events/pyproject.toml b/src/demo_tezos_events/pyproject.toml
index 2c5439e9e..04e5cfe8f 100644
--- a/src/demo_tezos_events/pyproject.toml
+++ b/src/demo_tezos_events/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_events"
 version = "0.0.1"
diff --git a/src/demo_tezos_events/types/events_contract/tezos_events/move.py b/src/demo_tezos_events/types/events_contract/tezos_events/move.py
index a474d49db..d6bf0a31b 100644
--- a/src/demo_tezos_events/types/events_contract/tezos_events/move.py
+++ b/src/demo_tezos_events/types/events_contract/tezos_events/move.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_events/types/events_contract/tezos_events/roll.py b/src/demo_tezos_events/types/events_contract/tezos_events/roll.py
index d346c683c..48b6af0ea 100644
--- a/src/demo_tezos_events/types/events_contract/tezos_events/roll.py
+++ b/src/demo_tezos_events/types/events_contract/tezos_events/roll.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_factories/pyproject.toml b/src/demo_tezos_factories/pyproject.toml
index 53cede1eb..f2e9f3673 100644
--- a/src/demo_tezos_factories/pyproject.toml
+++ b/src/demo_tezos_factories/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_factories"
 version = "0.0.1"
diff --git a/src/demo_tezos_factories/types/factory/tezos_storage.py b/src/demo_tezos_factories/types/factory/tezos_storage.py
index d53287a5c..e4f723d9b 100644
--- a/src/demo_tezos_factories/types/factory/tezos_storage.py
+++ b/src/demo_tezos_factories/types/factory/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_factories/types/token/tezos_parameters/transfer.py b/src/demo_tezos_factories/types/token/tezos_parameters/transfer.py
index a9c9ddcd3..8dda71265 100644
--- a/src/demo_tezos_factories/types/token/tezos_parameters/transfer.py
+++ b/src/demo_tezos_factories/types/token/tezos_parameters/transfer.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_factories/types/token/tezos_storage.py b/src/demo_tezos_factories/types/token/tezos_storage.py
index 4d3960cb8..680a4212b 100644
--- a/src/demo_tezos_factories/types/token/tezos_storage.py
+++ b/src/demo_tezos_factories/types/token/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_head/pyproject.toml b/src/demo_tezos_head/pyproject.toml
index a7e81aafd..9bbd1e9bc 100644
--- a/src/demo_tezos_head/pyproject.toml
+++ b/src/demo_tezos_head/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_head"
 version = "0.0.1"
diff --git a/src/demo_tezos_nft_marketplace/pyproject.toml b/src/demo_tezos_nft_marketplace/pyproject.toml
index e99227755..d08501a40 100644
--- a/src/demo_tezos_nft_marketplace/pyproject.toml
+++ b/src/demo_tezos_nft_marketplace/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_nft_marketplace"
 version = "0.0.1"
diff --git a/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/cancel_swap.py b/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/cancel_swap.py
index 7d4542fcf..0ffd1f59d 100644
--- a/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/cancel_swap.py
+++ b/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/cancel_swap.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/collect.py b/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/collect.py
index d56b0b682..541e35dfc 100644
--- a/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/collect.py
+++ b/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/collect.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/mint_objkt.py b/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/mint_objkt.py
index 0f914b360..739a9e815 100644
--- a/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/mint_objkt.py
+++ b/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/mint_objkt.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/swap.py b/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/swap.py
index 4cab8263a..d6735ec62 100644
--- a/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/swap.py
+++ b/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_parameters/swap.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_storage.py b/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_storage.py
index 391b89eea..3b39d1dca 100644
--- a/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_storage.py
+++ b/src/demo_tezos_nft_marketplace/types/hen_minter/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_nft_marketplace/types/hen_objkts/tezos_parameters/mint.py b/src/demo_tezos_nft_marketplace/types/hen_objkts/tezos_parameters/mint.py
index 17fecc452..a5bcda272 100644
--- a/src/demo_tezos_nft_marketplace/types/hen_objkts/tezos_parameters/mint.py
+++ b/src/demo_tezos_nft_marketplace/types/hen_objkts/tezos_parameters/mint.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_nft_marketplace/types/hen_objkts/tezos_storage.py b/src/demo_tezos_nft_marketplace/types/hen_objkts/tezos_storage.py
index 633353cd2..d6a3f9fe4 100644
--- a/src/demo_tezos_nft_marketplace/types/hen_objkts/tezos_storage.py
+++ b/src/demo_tezos_nft_marketplace/types/hen_objkts/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_raw/pyproject.toml b/src/demo_tezos_raw/pyproject.toml
index 4fa886c16..2fe1f8476 100644
--- a/src/demo_tezos_raw/pyproject.toml
+++ b/src/demo_tezos_raw/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_raw"
 version = "0.0.1"
diff --git a/src/demo_tezos_token/pyproject.toml b/src/demo_tezos_token/pyproject.toml
index c47494ccb..85011f0a7 100644
--- a/src/demo_tezos_token/pyproject.toml
+++ b/src/demo_tezos_token/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_token"
 version = "0.0.1"
diff --git a/src/demo_tezos_token/types/tzbtc/tezos_parameters/mint.py b/src/demo_tezos_token/types/tzbtc/tezos_parameters/mint.py
index 92b7f12e3..6f774c6c5 100644
--- a/src/demo_tezos_token/types/tzbtc/tezos_parameters/mint.py
+++ b/src/demo_tezos_token/types/tzbtc/tezos_parameters/mint.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_token/types/tzbtc/tezos_parameters/transfer.py b/src/demo_tezos_token/types/tzbtc/tezos_parameters/transfer.py
index bd3bd76e3..9af3bdec8 100644
--- a/src/demo_tezos_token/types/tzbtc/tezos_parameters/transfer.py
+++ b/src/demo_tezos_token/types/tzbtc/tezos_parameters/transfer.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_token/types/tzbtc/tezos_storage.py b/src/demo_tezos_token/types/tzbtc/tezos_storage.py
index 36c82aa23..345c13728 100644
--- a/src/demo_tezos_token/types/tzbtc/tezos_storage.py
+++ b/src/demo_tezos_token/types/tzbtc/tezos_storage.py
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 
 from __future__ import annotations
 
diff --git a/src/demo_tezos_token_balances/pyproject.toml b/src/demo_tezos_token_balances/pyproject.toml
index 62f61ee6f..715a8eb4f 100644
--- a/src/demo_tezos_token_balances/pyproject.toml
+++ b/src/demo_tezos_token_balances/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_token_balances"
 version = "0.0.1"
diff --git a/src/demo_tezos_token_transfers/pyproject.toml b/src/demo_tezos_token_transfers/pyproject.toml
index 3a2dc6fae..9beb6a971 100644
--- a/src/demo_tezos_token_transfers/pyproject.toml
+++ b/src/demo_tezos_token_transfers/pyproject.toml
@@ -1,4 +1,4 @@
-# generated by DipDup 8.0.0b1
+# generated by DipDup 8.0.0b2
 [project]
 name = "demo_tezos_token_transfers"
 version = "0.0.1"
diff --git a/src/dipdup/cli.py b/src/dipdup/cli.py
index b28fb120f..a1dea4b02 100644
--- a/src/dipdup/cli.py
+++ b/src/dipdup/cli.py
@@ -763,6 +763,7 @@ async def self(ctx: click.Context) -> None:
 @click.option('--version', '-v', default=None, help='Install DipDup from specific version.')
 @click.option('--ref', '-r', default=None, help='Install DipDup from specific git ref.')
 @click.option('--path', '-p', default=None, help='Install DipDup from local path.')
+@click.option('--pre', is_flag=True, help='Include pre-release versions.')
 @_cli_wrapper
 async def self_install(
     ctx: click.Context,
@@ -771,6 +772,7 @@ async def self_install(
     version: str | None,
     ref: str | None,
     path: str | None,
+    pre: bool,
 ) -> None:
     """Install DipDup for the current user."""
     import dipdup.install
@@ -783,6 +785,7 @@ async def self_install(
         version=version,
         ref=ref,
         path=path,
+        pre=pre,
         with_pdm=replay is not None and replay['package_manager'] == 'pdm',
         with_poetry=replay is not None and replay['package_manager'] == 'poetry',
     )
@@ -806,11 +809,13 @@ async def self_uninstall(
 @click.pass_context
 @click.option('--quiet', '-q', is_flag=True, help='Use default values for all prompts.')
 @click.option('--force', '-f', is_flag=True, help='Force reinstall.')
+@click.option('--pre', is_flag=True, help='Include pre-release versions.')
 @_cli_wrapper
 async def self_update(
     ctx: click.Context,
     quiet: bool,
     force: bool,
+    pre: bool,
 ) -> None:
     """Update DipDup for the current user."""
     import dipdup.install
@@ -823,6 +828,7 @@ async def self_update(
         version=None,
         ref=None,
         path=None,
+        pre=pre,
         with_pdm=replay is not None and replay['package_manager'] == 'pdm',
         with_poetry=replay is not None and replay['package_manager'] == 'poetry',
     )
diff --git a/src/dipdup/indexes/tezos_operations/parser.py b/src/dipdup/indexes/tezos_operations/parser.py
index ad80a271a..f4cc04ef3 100644
--- a/src/dipdup/indexes/tezos_operations/parser.py
+++ b/src/dipdup/indexes/tezos_operations/parser.py
@@ -36,7 +36,7 @@ def extract_root_outer_type(storage_type: type[BaseModel]) -> type[BaseModel]:
 def is_array_type(storage_type: type[Any]) -> bool:
     """TzKT can return bigmaps as objects or as arrays of key-value objects. Guess it from storage type."""
     # NOTE: list[...]
-    if get_origin(storage_type) == list:
+    if get_origin(storage_type) == list:  # noqa: E721
         return True
 
     # NOTE: Pydantic model with root field subclassing List
@@ -51,7 +51,7 @@ def is_array_type(storage_type: type[Any]) -> bool:
 def get_list_elt_type(list_type: type[Any]) -> type[Any]:
     """Extract list item type from list type"""
     # NOTE: regular list
-    if get_origin(list_type) == list:
+    if get_origin(list_type) == list:  # noqa: E721
         return get_args(list_type)[0]  # type: ignore[no-any-return]
 
     # NOTE: Pydantic model with root field subclassing List
@@ -62,7 +62,7 @@ def get_list_elt_type(list_type: type[Any]) -> type[Any]:
 def get_dict_value_type(dict_type: type[Any], key: str | None = None) -> type[Any]:
     """Extract dict value types from field type"""
     # NOTE: Regular dict
-    if get_origin(dict_type) == dict:
+    if get_origin(dict_type) == dict:  # noqa: E721
         return get_args(dict_type)[1]  # type: ignore[no-any-return]
 
     # NOTE: Pydantic model with root field subclassing Dict
diff --git a/src/dipdup/install.py b/src/dipdup/install.py
index c2b4a9253..1001fac28 100755
--- a/src/dipdup/install.py
+++ b/src/dipdup/install.py
@@ -177,6 +177,7 @@ def install(
     version: str | None,
     ref: str | None,
     path: str | None,
+    pre: bool = False,
     with_pdm: bool = False,
     with_poetry: bool = False,
 ) -> None:
@@ -189,7 +190,12 @@ def install(
     if not quiet:
         env.print()
 
-    force_str = '--force' if force else ''
+    pipx_args = []
+    if force:
+        pipx_args.append('--force')
+    if pre:
+        pipx_args.append('--pip-args="--pre"')
+
     pipx_packages = env._pipx_packages
 
     python_inter_pipx = cast(str, which('python3.12'))
@@ -206,18 +212,18 @@ def install(
 
     if 'dipdup' in pipx_packages and not force:
         echo('Updating DipDup')
-        env.run_cmd('pipx', 'upgrade', 'dipdup', force_str)
+        env.run_cmd('pipx', 'upgrade', 'dipdup', *pipx_args)
     elif path:
         echo(f'Installing DipDup from `{path}`')
-        env.run_cmd('pipx', 'install', '--python', python_inter_pipx, path, force_str)
+        env.run_cmd('pipx', 'install', '--python', python_inter_pipx, path, *pipx_args)
     elif ref:
         url = f'git+{GITHUB}@{ref}'
         echo(f'Installing DipDup from `{url}`')
-        env.run_cmd('pipx', 'install', '--python', python_inter_pipx, url, force_str)
+        env.run_cmd('pipx', 'install', '--python', python_inter_pipx, url, *pipx_args)
     else:
         echo('Installing DipDup from PyPI')
         pkg = 'dipdup' if not version else f'dipdup=={version}'
-        env.run_cmd('pipx', 'install', '--python', python_inter_pipx, pkg, force_str)
+        env.run_cmd('pipx', 'install', '--python', python_inter_pipx, pkg, *pipx_args)
 
     for pm, with_pm in (
         ('pdm', with_pdm),
@@ -225,10 +231,10 @@ def install(
     ):
         if pm in pipx_packages:
             echo(f'Updating `{pm}`')
-            env.run_cmd('pipx', 'upgrade', pm, force_str)
+            env.run_cmd('pipx', 'upgrade', pm, *pipx_args)
         elif with_pm or force or quiet or ask(f'Install `{pm}`?', False):
             echo(f'Installing `{pm}`')
-            env.run_cmd('pipx', 'install', '--python', python_inter_pipx, pm, force_str)
+            env.run_cmd('pipx', 'install', '--python', python_inter_pipx, pm, *pipx_args)
             env._commands[pm] = which(pm)
 
     done(
@@ -274,6 +280,7 @@ def cli() -> None:
     parser.add_argument('-r', '--ref', help='Install DipDup from a specific git ref')
     parser.add_argument('-p', '--path', help='Install DipDup from a local path')
     parser.add_argument('-u', '--uninstall', action='store_true', help='Uninstall DipDup')
+    parser.add_argument('--pre', action='store_true', help='Include pre-release versions')
     parser.add_argument('--with-pdm', action='store_true', help='Install PDM')
     parser.add_argument('--with-poetry', action='store_true', help='Install Poetry')
     args = parser.parse_args()
diff --git a/src/dipdup/models/__init__.py b/src/dipdup/models/__init__.py
index 97d68b187..a7ac86e19 100644
--- a/src/dipdup/models/__init__.py
+++ b/src/dipdup/models/__init__.py
@@ -529,7 +529,7 @@ class CachedModel(Model):
     _cache: LRU[int | str, CachedModel]
 
     def __init_subclass__(cls) -> None:
-        cls._maxsize = getattr(cls.Meta, 'maxsize', None) or 10_000
+        cls._maxsize = getattr(cls.Meta, 'maxsize', None) or 2**14
         cls._hits = 0
         cls._misses = 0
         cls._cache = LRU(cls._maxsize)
diff --git a/src/dipdup/models/tzip_metadata.py b/src/dipdup/models/tzip_metadata.py
index 8bbe22850..ed8bd4eed 100644
--- a/src/dipdup/models/tzip_metadata.py
+++ b/src/dipdup/models/tzip_metadata.py
@@ -6,7 +6,6 @@ class TzipMetadataNetwork(Enum):
 
     :param mainnet: mainnet
     :param ghostnet: ghostnet
-    :param mumbainet: mumbainet
     :param nairobinet: nairobinet
     :param oxfordnet: oxfordnet
     :param parisnet: parisnet
@@ -14,7 +13,6 @@ class TzipMetadataNetwork(Enum):
 
     mainnet = 'mainnet'
     ghostnet = 'ghostnet'
-    mumbainet = 'mumbainet'
     nairobinet = 'nairobinet'
     oxfordnet = 'oxfordnet'
     parisnet = 'parisnet'
diff --git a/src/dipdup/project.py b/src/dipdup/project.py
index ec5aed257..76796ada5 100644
--- a/src/dipdup/project.py
+++ b/src/dipdup/project.py
@@ -48,6 +48,7 @@
         'demo_tezos_nft_marketplace',
         'demo_tezos_raw',
         'demo_tezos_token',
+        'demo_tezos_token_balances',
         'demo_tezos_token_transfers',
     ),
     'starknet': ('demo_starknet_events',),
diff --git a/src/dipdup/sys.py b/src/dipdup/sys.py
index 7ce9d3b31..e40d8c7df 100644
--- a/src/dipdup/sys.py
+++ b/src/dipdup/sys.py
@@ -46,7 +46,7 @@ def set_up_logging() -> None:
         formatter = jsonlogger.JsonFormatter(  # type: ignore[no-untyped-call]
             json_default=orjson.dumps,
             json_serializer=lambda *a, **kw: orjson.dumps(*a, default=to_jsonable_python).decode(),  # type: ignore[misc]
-            reserved_attrs=set(jsonlogger.RESERVED_ATTRS) - {'message', 'name', 'levelname', 'created'} | {'taskName'}
+            reserved_attrs=set(jsonlogger.RESERVED_ATTRS) - {'message', 'name', 'levelname', 'created'} | {'taskName'},
         )
     else:
         formatter = logging.Formatter('%(levelname)-8s %(name)-20s %(message)s')
diff --git a/tests/test_demos.py b/tests/test_demos.py
index 78bccd46f..0bd7aa5bc 100644
--- a/tests/test_demos.py
+++ b/tests/test_demos.py
@@ -222,8 +222,9 @@ async def assert_run_dao() -> None:
     ('demo_evm_events.yml', 'demo_evm_events', 'init', None),
     ('demo_evm_transactions.yml', 'demo_evm_transactions', 'run', assert_run_evm_transactions),
     ('demo_evm_transactions.yml', 'demo_evm_transactions', 'init', None),
-    ('demo_tezos_etherlink.yml', 'demo_tezos_etherlink', 'run', None),
-    ('demo_tezos_etherlink.yml', 'demo_tezos_etherlink', 'init', None),
+    # FIXME: nairobinet is dead
+    # ('demo_tezos_etherlink.yml', 'demo_tezos_etherlink', 'run', None),
+    # ('demo_tezos_etherlink.yml', 'demo_tezos_etherlink', 'init', None),
     # NOTE: Indexes with `evm.node` as index datasource
     ('demo_evm_events_node.yml', 'demo_evm_events', 'run', assert_run_evm_events),
     ('demo_evm_transactions_node.yml', 'demo_evm_transactions', 'run', assert_run_evm_transactions),
diff --git a/tests/test_introspection.py b/tests/test_introspection.py
index f1eaa35f8..528b917a0 100644
--- a/tests/test_introspection.py
+++ b/tests/test_introspection.py
@@ -15,9 +15,9 @@
 
 
 def test_list_simple_args() -> None:
-    assert get_list_elt_type(list[str]) == str
-    assert get_list_elt_type(list[int]) == int
-    assert get_list_elt_type(list[bool]) == bool
+    assert get_list_elt_type(list[str]) == str  # noqa: E721
+    assert get_list_elt_type(list[int]) == int  # noqa: E721
+    assert get_list_elt_type(list[bool]) == bool  # noqa: E721
     assert get_list_elt_type(list[str | None]) == str | None
     assert get_list_elt_type(list[str | int]) == str | int
     assert get_list_elt_type(list[tuple[str]]) == tuple[str]
@@ -56,9 +56,9 @@ class OptionalList(BaseModel):
 
 
 def test_dict_simple_args() -> None:
-    assert get_dict_value_type(dict[str, str]) == str
-    assert get_dict_value_type(dict[str, int]) == int
-    assert get_dict_value_type(dict[str, bool]) == bool
+    assert get_dict_value_type(dict[str, str]) == str  # noqa: E721
+    assert get_dict_value_type(dict[str, int]) == int  # noqa: E721
+    assert get_dict_value_type(dict[str, bool]) == bool  # noqa: E721
     assert get_dict_value_type(dict[str, str | None]) == str | None
     assert get_dict_value_type(dict[str, str | int]) == str | int
     assert get_dict_value_type(dict[str, tuple[str]]) == tuple[str]
@@ -103,7 +103,7 @@ class Storage(BaseModel):
         optional_str: str | None
         union_arg: str | int
 
-    assert get_dict_value_type(Storage, 'plain_str') == str
+    assert get_dict_value_type(Storage, 'plain_str') == str  # noqa: E721
     assert get_dict_value_type(Storage, 'list_str') == list[str]
     assert get_dict_value_type(Storage, 'dict_of_lists') == dict[str, list[str]]
     assert get_dict_value_type(Storage, 'optional_str') == str | None