diff --git a/.run/Skeleton.run.xml b/.run/Skeleton (28).run.xml
similarity index 92%
rename from .run/Skeleton.run.xml
rename to .run/Skeleton (28).run.xml
index 68f9f0f1..1e50fb24 100644
--- a/.run/Skeleton.run.xml
+++ b/.run/Skeleton (28).run.xml	
@@ -1,15 +1,15 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Skeleton" type="PythonConfigurationType" factoryName="Python">
+  <configuration default="false" name="Skeleton (28)" type="PythonConfigurationType" factoryName="Python">
     <module name="nc_py_api" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="APP_ID" value="skeleton" />
       <env name="APP_PORT" value="9030" />
       <env name="APP_SECRET" value="12345" />
       <env name="APP_VERSION" value="1.0.0" />
       <env name="NEXTCLOUD_URL" value="http://nextcloud.local/index.php" />
-      <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
     <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
diff --git a/.run/TalkBot.run.xml b/.run/TalkBot (28).run.xml
similarity index 92%
rename from .run/TalkBot.run.xml
rename to .run/TalkBot (28).run.xml
index 28e9eba1..f0b53ac5 100644
--- a/.run/TalkBot.run.xml
+++ b/.run/TalkBot (28).run.xml	
@@ -1,15 +1,15 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TalkBot" type="PythonConfigurationType" factoryName="Python">
+  <configuration default="false" name="TalkBot (28)" type="PythonConfigurationType" factoryName="Python">
     <module name="nc_py_api" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="APP_ID" value="talk_bot" />
       <env name="APP_PORT" value="9032" />
       <env name="APP_SECRET" value="12345" />
       <env name="APP_VERSION" value="1.0.0" />
       <env name="NEXTCLOUD_URL" value="http://nextcloud.local/index.php" />
-      <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
     <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
diff --git a/.run/TalkBotMulti.run.xml b/.run/TalkBotMulti.run.xml
deleted file mode 100644
index d93f9c0e..00000000
--- a/.run/TalkBotMulti.run.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TalkBotMulti" type="PythonConfigurationType" factoryName="Python">
-    <module name="nc_py_api" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="APP_ID" value="talk_bot_multi" />
-      <env name="APP_PORT" value="9033" />
-      <env name="APP_SECRET" value="12345" />
-      <env name="APP_VERSION" value="1.0.0" />
-      <env name="NEXTCLOUD_URL" value="http://nextcloud.local" />
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/examples/as_app/talk_bot_multi/src/main.py" />
-    <option name="PARAMETERS" value="" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="false" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ec800f5..8e03a815 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.4.1 - 2023-10-17]
+## [0.5.0 - 2023-10-23]
 
 ### Added
 
-- Support for the new AppAPI endpoint `/init` and automatically downloading models from `huggingface`. #151
+- Support for the new `/init` AppAPI endpoint and the ability to automatically load models from `huggingface`. #151
 
 ### Changed
 
 - All examples were adjusted to changes in AppAPI.
+- The examples now use FastAPIs `lifespan` instead of the deprecated `on_event`.
 
 ## [0.4.0 - 2023-10-15]
 
diff --git a/README.md b/README.md
index 050b2bc3..1137ad82 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,38 @@ as long as it doesn't involve calls that require user password verification.
 
 **NextcloudApp** avalaible only from Nextcloud 27.1.2 and greater version with installed **AppAPI**.
 
+### Nextcloud skeleton app in Python
+
+```python3
+from contextlib import asynccontextmanager
+
+from fastapi import FastAPI
+
+from nc_py_api import NextcloudApp
+from nc_py_api.ex_app import LogLvl, run_app, set_handlers
+
+
+@asynccontextmanager
+async def lifespan(_app: FastAPI):
+    set_handlers(APP, enabled_handler)
+    yield
+
+
+APP = FastAPI(lifespan=lifespan)
+
+
+def enabled_handler(enabled: bool, nc: NextcloudApp) -> str:
+    if enabled:
+        nc.log(LogLvl.WARNING, "Hello from nc_py_api.")
+    else:
+        nc.log(LogLvl.WARNING, "Bye bye from nc_py_api.")
+    return ""
+
+
+if __name__ == "__main__":
+    run_app("main:APP", log_level="trace")
+```
+
 ### Support
 
 You can support us in several ways:
@@ -81,18 +113,3 @@ You can support us in several ways:
   - [Issues](https://github.com/cloud-py-api/nc_py_api/issues)
   - [Setting up dev environment](https://cloud-py-api.github.io/nc_py_api/DevSetup.html)
 - [Changelog](https://github.com/cloud-py-api/nc_py_api/blob/main/CHANGELOG.md)
-
-### Motivation
-
-_Python's language, elegant and clear,_<br>
-_Weaves logic's threads without fear,_<br>
-_And in the sky, where clouds take form,_<br>
-_Nextcloud emerges, a digital norm._<br>
-
-_Together they stand, a duo bright,_<br>
-_Python and Nextcloud, day and night,_<br>
-_In a digital dance, they guide and sail,_<br>
-_Shaping tomorrow, where new ideas prevail._<br>
-
-#### **Know that we are always here to support and assist you on your journey.**
-### P.S: **_Good luck, and we hope you have fun!_**
diff --git a/docs/NextcloudApp.rst b/docs/NextcloudApp.rst
index 7e6d13aa..984218a0 100644
--- a/docs/NextcloudApp.rst
+++ b/docs/NextcloudApp.rst
@@ -12,12 +12,12 @@ Skeleton
 
 What's going on in the skeleton?
 
-First, it's important to understand that an external application acts more like a microservice, with its endpoints being called by Nextcloud.
+In `FastAPI lifespan <https://fastapi.tiangolo.com/advanced/events/?h=lifespan#lifespan>`_ we call the ``set_handlers`` function to further process the application installation logic.
 
-Therefore, when the application receives a request at the endpoint ``/enable``,
-it should register all its functionalities in the cloud and wait for requests from Nextcloud.
+Since this is a simple skeleton application, we only define the ``/enable`` endpoint.
 
-.. note:: This doesn't apply to system applications, which will be covered in the next chapter.
+When the application receives a request at the endpoint ``/enable``,
+it should register all its functionalities in the cloud and wait for requests from Nextcloud.
 
 So, calling:
 
@@ -54,7 +54,7 @@ Here they are:
 
 * APP_ID - ID of the application.
 * APP_PORT - Port on which application listen for the requests from the Nextcloud.
-* APP_SECRET - Secret for ``hmac`` signature generation.
+* APP_SECRET - Shared secret between Nextcloud and Application.
 * APP_VERSION - Version of the application.
 * AA_VERSION - Version of the AppAPI.
 * NEXTCLOUD_URL - URL at which the application can access the Nextcloud API.
@@ -67,7 +67,7 @@ After launching your application, execute the following command in the Nextcloud
 
     php occ app_api:app:register YOUR_APP_ID manual_install --json-info \
         "{\"appid\":\"YOUR_APP_ID\",\"name\":\"YOUR_APP_DISPLAY_NAME\",\"daemon_config_name\":\"manual_install\",\"version\":\"YOU_APP_VERSION\",\"secret\":\"YOUR_APP_SECRET\",\"host\":\"host.docker.internal\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"port\":SELECTED_PORT,\"protocol\":\"http\",\"system_app\":0}" \
-        -e --force-scopes
+        --force-scopes
 
 You can see how **nc_py_api** registers in ``scripts/dev_register.sh``.
 
@@ -79,8 +79,7 @@ Examples for such Makefiles can be found in this repository:
 `ToGif <https://github.com/cloud-py-api/nc_py_api/blob/main/examples/as_app/to_gif/Makefile>`_ ,
 `nc_py_api <https://github.com/cloud-py-api/nc_py_api/blob/main/scripts/dev_register.sh>`_
 
-During the execution of `php occ app_api:app:register`, the **enabled_handler** will be called,
-as we pass the flag ``-e``, meaning ``enable after registration``.
+During the execution of `php occ app_api:app:register`, the **enabled_handler** will be called
 
 This is likely all you need to start debugging and developing an application for Nextcloud.
 
diff --git a/docs/NextcloudTalkBotTransformers.rst b/docs/NextcloudTalkBotTransformers.rst
index 2fde3031..c3bae7f8 100644
--- a/docs/NextcloudTalkBotTransformers.rst
+++ b/docs/NextcloudTalkBotTransformers.rst
@@ -37,7 +37,7 @@ Requirements
 We opt for the latest version of the Transformers library.
 Because the example was developed on a Mac, we ended up using Torchvision.
 
-`If you're working solely with Nvidia, you're free to use TensorFlow instead of PyTorch.`
+`You're free to use TensorFlow instead of PyTorch.`
 
 Next, we integrate the latest version of `nc_py_api` to minimize code redundancy and focus on the application's logic.
 
@@ -52,63 +52,20 @@ We specify the model name globally so that we can easily change the model name i
 
 **When Should We Download the Language Model?**
 
-Although the example uses the smallest model available, weighing in at 300 megabytes, it's common knowledge that larger language models can be substantially bigger.
-Downloading such models should not begin when a processing request is already received.
+To make process of initializing applications more robust, separate logic was introduced, with an ``/init`` endpoint.
 
-So we have two options:
-
-* Heartbeat
-* enabled_handler
-
-This can't be accomplished in the **app on/off handler** as Nextcloud expects an immediate response regarding the app's operability.
-
-Thus, we place the model downloading within the Heartbeat:
-
-.. code-block::
-
-    # Thread that performs model download.
-    def download_models():
-        pipeline("text2text-generation", model=MODEL_NAME)  # this will download model
-
-
-    def heartbeat_handler() -> str:
-        global MODEL_INIT_THREAD
-        print("heartbeat_handler: called")  # for debug
-        # if it is the first heartbeat, then start background thread to download a model
-        if MODEL_INIT_THREAD is None:
-            MODEL_INIT_THREAD = Thread(target=download_models)
-            MODEL_INIT_THREAD.start()
-            print("heartbeat_handler: started initialization thread")  # for debug
-        # if thread is finished then we will have "ok" in response, and AppAPI will consider that program is ready.
-        r = "init" if MODEL_INIT_THREAD.is_alive() else "ok"
-        print(f"heartbeat_handler: result={r}")  # for debug
-        return r
-
-
-    @APP.on_event("startup")
-    def initialization():
-        # Provide our custom **heartbeat_handler** to set_handlers
-        set_handlers(APP, enabled_handler, heartbeat_handler)
-
-
-.. note:: While this may not be the most ideal way to download models, it remains a viable method.
-    In the future, a more efficient wrapper for model downloading is planned to make the process even more convenient.
-
-Model Storage
-"""""""""""""
-
-By default, models will be downloaded to a directory that's removed when updating the app.
-To persistently store the models even after updates, add the following line to your code:
+This library also provides an additional functionality over this endpoint for easy downloading of models from the `huggingface <https://huggingface.co>`_.
 
 .. code-block::
 
-    from nc_py_api.ex_app import persist_transformers_cache  # noqa # isort:skip
+    @asynccontextmanager
+    async def lifespan(_app: FastAPI):
+        set_handlers(APP, enabled_handler, models_to_fetch=[MODEL_NAME])
+        yield
 
-This will set ``TRANSFORMERS_CACHE`` environment variable to point to the application persistent storage.
-Import of this **must be** on top before importing any code that perform the import of the ``transformers`` library.
+This will automatically download models specified in ``models_to_fetch`` parameter to the application persistent storage.
 
-And that is all, ``transformers`` will automatically download all
-models you use to the **Application Persistent Storage** and AppAPI will keep it between updates.
+If you want write your own logic, you can always pass your own defined ``init_handler`` callback to ``set_handlers``.
 
 Working with Language Models
 """"""""""""""""""""""""""""
@@ -122,13 +79,16 @@ Finally, we arrive at the core aspect of the application, where we interact with
         r = re.search(r"@ai\s(.*)", message.object_content["message"], re.IGNORECASE)
         if r is None:
             return
-        model = pipeline("text2text-generation", model=MODEL_NAME)
+        model = pipeline(
+            "text2text-generation",
+            model=snapshot_download(MODEL_NAME, local_files_only=True, cache_dir=persistent_storage()),
+        )
         # Pass all text after "@ai" we to the Language model.
         response_text = model(r.group(1), max_length=64, do_sample=True)[0]["generated_text"]
         AI_BOT.send_message(response_text, message)
 
 
-Simply put, the AI logic is just two lines of code when using Transformers, which is incredibly efficient and cool.
+Simply put, AI logic is a few lines of code when using Transformers, which is incredibly efficient and cool.
 
 Messages from the AI model are then sent back to Talk Chat as you would expect from a typical chatbot.
 
diff --git a/examples/as_app/skeleton/Makefile b/examples/as_app/skeleton/Makefile
index fe87572d..1520f448 100644
--- a/examples/as_app/skeleton/Makefile
+++ b/examples/as_app/skeleton/Makefile
@@ -24,11 +24,16 @@ build-push:
 	docker login ghcr.io
 	docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/skeleton:latest .
 
-.PHONY: deploy
-deploy:
+.PHONY: deploy28
+deploy28:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:deploy skeleton docker_dev \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
 
+.PHONY: deploy27
+deploy27:
+	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:deploy skeleton docker_dev \
+		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
+
 .PHONY: run28
 run28:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister skeleton --silent || true
@@ -41,9 +46,16 @@ run27:
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register skeleton docker_dev --force-scopes \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
 
-.PHONY: manual_register
-manual_register:
+.PHONY: register28
+register28:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister skeleton --silent || true
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register skeleton manual_install --json-info \
   "{\"appid\":\"skeleton\",\"name\":\"App Skeleton\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9030,\"scopes\":{\"required\":[],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
   --force-scopes
+
+.PHONY: register27
+register27:
+	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister skeleton --silent || true
+	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register skeleton manual_install --json-info \
+  "{\"appid\":\"skeleton\",\"name\":\"App Skeleton\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9030,\"scopes\":{\"required\":[],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  --force-scopes
diff --git a/examples/as_app/skeleton/requirements.txt b/examples/as_app/skeleton/requirements.txt
index 20e27d1b..e4455715 100644
--- a/examples/as_app/skeleton/requirements.txt
+++ b/examples/as_app/skeleton/requirements.txt
@@ -1 +1 @@
-nc_py_api[app]>=0.4.1
+nc_py_api[app]>=0.5.0
diff --git a/examples/as_app/skeleton/src/main.py b/examples/as_app/skeleton/src/main.py
index c95c9ee5..6c304126 100644
--- a/examples/as_app/skeleton/src/main.py
+++ b/examples/as_app/skeleton/src/main.py
@@ -1,13 +1,19 @@
-"""
-Simplest example.
-"""
+"""Simplest example."""
+from contextlib import asynccontextmanager
 
 from fastapi import FastAPI
 
 from nc_py_api import NextcloudApp
 from nc_py_api.ex_app import LogLvl, run_app, set_handlers
 
-APP = FastAPI()
+
+@asynccontextmanager
+async def lifespan(_app: FastAPI):
+    set_handlers(APP, enabled_handler)
+    yield
+
+
+APP = FastAPI(lifespan=lifespan)
 
 
 def enabled_handler(enabled: bool, nc: NextcloudApp) -> str:
@@ -22,13 +28,6 @@ def enabled_handler(enabled: bool, nc: NextcloudApp) -> str:
     return ""
 
 
-# Of course, you can use `FastAPI lifespan: <https://fastapi.tiangolo.com/advanced/events/#lifespan>` instead of this.
-# The only requirement for the application is to define `/enabled` and `/heartbeat` handlers.
-@APP.on_event("startup")
-def initialization():
-    set_handlers(APP, enabled_handler)
-
-
 if __name__ == "__main__":
     # Wrapper around `uvicorn.run`.
     # You are free to call it directly, with just using the `APP_HOST` and `APP_PORT` variables from the environment.
diff --git a/examples/as_app/talk_bot/HOW_TO_INSTALL.md b/examples/as_app/talk_bot/HOW_TO_INSTALL.md
index c796e15c..79789217 100644
--- a/examples/as_app/talk_bot/HOW_TO_INSTALL.md
+++ b/examples/as_app/talk_bot/HOW_TO_INSTALL.md
@@ -8,7 +8,7 @@ How To Install
 
     to deploy a docker image with Bot to docker.
 
-4. php occ app_api:app:register talk_bot "daemon_deploy_name" -e --force-scopes \
+4. php occ app_api:app:register talk_bot "daemon_deploy_name" --force-scopes \
 --info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot/appinfo/info.xml
 
     to call its **enable** handler and accept all required API scopes by default.
diff --git a/examples/as_app/talk_bot/Makefile b/examples/as_app/talk_bot/Makefile
index 31fbe694..403309f9 100644
--- a/examples/as_app/talk_bot/Makefile
+++ b/examples/as_app/talk_bot/Makefile
@@ -24,11 +24,16 @@ build-push:
 	docker login ghcr.io
 	docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/talk_bot:latest .
 
-.PHONY: deploy
-deploy:
+.PHONY: deploy28
+deploy28:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:deploy talk_bot docker_dev \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot/appinfo/info.xml
 
+.PHONY: deploy27
+deploy27:
+	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:deploy talk_bot docker_dev \
+		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot/appinfo/info.xml
+
 .PHONY: run28
 run28:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister talk_bot --silent || true
@@ -41,9 +46,16 @@ run27:
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register talk_bot docker_dev --force-scopes \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot/appinfo/info.xml
 
-.PHONY: manual_register
-manual_register:
+.PHONY: register28
+register28:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister talk_bot --silent || true
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register talk_bot manual_install --json-info \
   "{\"appid\":\"talk_bot\",\"name\":\"TalkBot\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9032,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
   --force-scopes
+
+.PHONY: register27
+register27:
+	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister talk_bot --silent || true
+	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register talk_bot manual_install --json-info \
+  "{\"appid\":\"talk_bot\",\"name\":\"TalkBot\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9032,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  --force-scopes
diff --git a/examples/as_app/talk_bot/requirements.txt b/examples/as_app/talk_bot/requirements.txt
index 20e27d1b..e4455715 100644
--- a/examples/as_app/talk_bot/requirements.txt
+++ b/examples/as_app/talk_bot/requirements.txt
@@ -1 +1 @@
-nc_py_api[app]>=0.4.1
+nc_py_api[app]>=0.5.0
diff --git a/examples/as_app/talk_bot/src/main.py b/examples/as_app/talk_bot/src/main.py
index a2cc7af8..7ae23596 100644
--- a/examples/as_app/talk_bot/src/main.py
+++ b/examples/as_app/talk_bot/src/main.py
@@ -1,6 +1,6 @@
 """Example of an application(currency convertor) that uses Talk Bot APIs."""
-
 import re
+from contextlib import asynccontextmanager
 from typing import Annotated
 
 import requests
@@ -9,7 +9,15 @@
 from nc_py_api import NextcloudApp, talk_bot
 from nc_py_api.ex_app import run_app, set_handlers, talk_bot_app
 
-APP = FastAPI()
+
+# The same stuff as for usual External Applications
+@asynccontextmanager
+async def lifespan(_app: FastAPI):
+    set_handlers(APP, enabled_handler)
+    yield
+
+
+APP = FastAPI(lifespan=lifespan)
 # We define bot globally, so if no `multiprocessing` module is used, it can be reused by calls.
 # All stuff in it works only with local variables, so in the case of multithreading, there should not be problems.
 CURRENCY_BOT = talk_bot.TalkBot("/currency_talk_bot", "Currency convertor", "Usage: `@currency convert 100 EUR to USD`")
@@ -76,11 +84,5 @@ def enabled_handler(enabled: bool, nc: NextcloudApp) -> str:
     return ""
 
 
-# The same stuff as for usual External Applications
-@APP.on_event("startup")
-def initialization():
-    set_handlers(APP, enabled_handler)
-
-
 if __name__ == "__main__":
     run_app("main:APP", log_level="trace")
diff --git a/examples/as_app/talk_bot_ai/HOW_TO_INSTALL.md b/examples/as_app/talk_bot_ai/HOW_TO_INSTALL.md
index 82b3c716..f341910a 100644
--- a/examples/as_app/talk_bot_ai/HOW_TO_INSTALL.md
+++ b/examples/as_app/talk_bot_ai/HOW_TO_INSTALL.md
@@ -8,7 +8,7 @@ How To Install
 
     to deploy a docker image with Bot to docker.
 
-4. php occ app_api:app:register talk_bot_ai "daemon_deploy_name" -e --force-scopes \
+4. php occ app_api:app:register talk_bot_ai "daemon_deploy_name" --force-scopes \
 --info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot_ai/appinfo/info.xml
 
     to call its **enable** handler and accept all required API scopes by default.
diff --git a/examples/as_app/talk_bot_ai/Makefile b/examples/as_app/talk_bot_ai/Makefile
index dca709bd..ddc108a4 100644
--- a/examples/as_app/talk_bot_ai/Makefile
+++ b/examples/as_app/talk_bot_ai/Makefile
@@ -25,32 +25,37 @@ build-push:
 	docker login ghcr.io
 	docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/talk_bot_ai:latest .
 
-.PHONY: deploy
-deploy:
+.PHONY: deploy28
+deploy28:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:deploy talk_bot_ai docker_dev \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot_ai/appinfo/info.xml
 
+.PHONY: deploy27
+deploy27:
+	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:deploy talk_bot_ai docker_dev \
+		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot_ai/appinfo/info.xml
+
 .PHONY: run28
 run28:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister talk_bot_ai --silent || true
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register talk_bot_ai docker_dev --force-scopes \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot_ai/appinfo/info.xml
 
-.PHONY: manual_register28
-manual_register28:
-	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister talk_bot_ai --silent || true
-	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register talk_bot_ai manual_install --json-info \
-  "{\"appid\":\"talk_bot_ai\",\"name\":\"TalkBotAI\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9034,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
-  --force-scopes
-
 .PHONY: run27
 run27:
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister talk_bot_ai --silent || true
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register talk_bot_ai docker_dev --force-scopes \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot_ai/appinfo/info.xml
 
-.PHONY: manual_register27
-manual_register27:
+.PHONY: register28
+register28:
+	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister talk_bot_ai --silent || true
+	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register talk_bot_ai manual_install --json-info \
+  "{\"appid\":\"talk_bot_ai\",\"name\":\"TalkBotAI\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9034,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  --force-scopes
+
+.PHONY: register27
+register27:
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister talk_bot_ai --silent || true
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register talk_bot_ai manual_install --json-info \
   "{\"appid\":\"talk_bot_ai\",\"name\":\"TalkBotAI\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9034,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
diff --git a/examples/as_app/talk_bot_ai/requirements.txt b/examples/as_app/talk_bot_ai/requirements.txt
index dfa5a75e..fd76fdda 100644
--- a/examples/as_app/talk_bot_ai/requirements.txt
+++ b/examples/as_app/talk_bot_ai/requirements.txt
@@ -1,4 +1,4 @@
-nc_py_api[app]>=0.4.1
+nc_py_api[app]>=0.5.0
 transformers>=4.33
 torch
 torchvision
diff --git a/examples/as_app/talk_bot_ai/src/main.py b/examples/as_app/talk_bot_ai/src/main.py
index 68f3e40d..e912753c 100644
--- a/examples/as_app/talk_bot_ai/src/main.py
+++ b/examples/as_app/talk_bot_ai/src/main.py
@@ -1,5 +1,6 @@
 """Example of an application that uses Python Transformers library with Talk Bot APIs."""
 import re
+from contextlib import asynccontextmanager
 from typing import Annotated
 
 import requests
@@ -8,9 +9,16 @@
 from transformers import pipeline
 
 from nc_py_api import NextcloudApp, talk_bot
-from nc_py_api.ex_app import run_app, set_handlers, talk_bot_app
+from nc_py_api.ex_app import persistent_storage, run_app, set_handlers, talk_bot_app
 
-APP = FastAPI()
+
+@asynccontextmanager
+async def lifespan(_app: FastAPI):
+    set_handlers(APP, enabled_handler, models_to_fetch=[MODEL_NAME])
+    yield
+
+
+APP = FastAPI(lifespan=lifespan)
 AI_BOT = talk_bot.TalkBot("/ai_talk_bot", "AI talk bot", "Usage: `@assistant What sounds do cats make?`")
 MODEL_NAME = "MBZUAI/LaMini-Flan-T5-783M"
 
@@ -19,7 +27,10 @@ def ai_talk_bot_process_request(message: talk_bot.TalkBotMessage):
     r = re.search(r"@assistant\s(.*)", message.object_content["message"], re.IGNORECASE)
     if r is None:
         return
-    model = pipeline("text2text-generation", model=snapshot_download(MODEL_NAME, local_files_only=True))
+    model = pipeline(
+        "text2text-generation",
+        model=snapshot_download(MODEL_NAME, local_files_only=True, cache_dir=persistent_storage()),
+    )
     response_text = model(r.group(1), max_length=64, do_sample=True)[0]["generated_text"]
     AI_BOT.send_message(response_text, message)
 
@@ -43,10 +54,5 @@ def enabled_handler(enabled: bool, nc: NextcloudApp) -> str:
     return ""
 
 
-@APP.on_event("startup")
-def initialization():
-    set_handlers(APP, enabled_handler, models_to_fetch=[MODEL_NAME])
-
-
 if __name__ == "__main__":
     run_app("main:APP", log_level="trace")
diff --git a/examples/as_app/talk_bot_multi/Dockerfile b/examples/as_app/talk_bot_multi/Dockerfile
deleted file mode 100644
index e400717e..00000000
--- a/examples/as_app/talk_bot_multi/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM python:3.11-alpine
-
-COPY requirements.txt /
-ADD /src/ /app/
-
-RUN \
-  python3 -m pip install -r requirements.txt && rm -rf ~/.cache && rm requirements.txt
-
-WORKDIR /app
-ENTRYPOINT ["python3", "main.py"]
diff --git a/examples/as_app/talk_bot_multi/HOW_TO_INSTALL.md b/examples/as_app/talk_bot_multi/HOW_TO_INSTALL.md
deleted file mode 100644
index ff911553..00000000
--- a/examples/as_app/talk_bot_multi/HOW_TO_INSTALL.md
+++ /dev/null
@@ -1,14 +0,0 @@
-How To Install
-==============
-
-1. [Install AppAPI](https://apps.nextcloud.com/apps/app_api)
-2. Create a deployment daemon according to the [instructions](https://cloud-py-api.github.io/app_api/CreationOfDeployDaemon.html#create-deploy-daemon) of the AppPI
-3. php occ app_api:app:deploy talk_bot_multi "daemon_deploy_name" \
---info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot_multi/appinfo/info.xml
-
-    to deploy a docker image with Bot to docker.
-
-4. php occ app_api:app:register talk_bot_multi "daemon_deploy_name" -e --force-scopes \
---info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot_multi/appinfo/info.xml
-
-    to call its **enable** handler and accept all required API scopes by default.
diff --git a/examples/as_app/talk_bot_multi/Makefile b/examples/as_app/talk_bot_multi/Makefile
deleted file mode 100644
index 13109a77..00000000
--- a/examples/as_app/talk_bot_multi/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-.DEFAULT_GOAL := help
-
-.PHONY: help
-help:
-	@echo "Welcome to TalkBotMulti example. Please use \`make <target>\` where <target> is one of"
-	@echo " "
-	@echo "  Next commands are only for dev environment with nextcloud-docker-dev!"
-	@echo "  They should run from the host you are developing on(with activated venv) and not in the container with Nextcloud!"
-	@echo "  "
-	@echo "  build-push        build image and upload to ghcr.io"
-	@echo "  "
-	@echo "  deploy            deploy example to registered 'docker_dev'"
-	@echo "  "
-	@echo "  run28             install TalkBotMulti for Nextcloud 28"
-	@echo "  run27             install TalkBotMulti for Nextcloud 27"
-	@echo "  "
-	@echo "  For development of this example use PyCharm run configurations. Development is always set for last Nextcloud."
-	@echo "  First run 'TalkBotMulti' and then 'make manual_register', after that you can use/debug/develop it and easy test."
-	@echo "  "
-	@echo "  manual_register   perform registration of running 'TalkBotMulti' into the 'manual_install' deploy daemon."
-
-.PHONY: build-push
-build-push:
-	docker login ghcr.io
-	docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/talk_bot_multi:latest .
-
-.PHONY: deploy
-deploy:
-	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:deploy talk_bot_multi docker_dev \
-		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot_multi/appinfo/info.xml
-
-.PHONY: run28
-run28:
-	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister talk_bot_multi --silent || true
-	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register talk_bot_multi docker_dev --force-scopes \
-		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot_multi/appinfo/info.xml
-
-.PHONY: run27
-run27:
-	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister talk_bot_multi --silent || true
-	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register talk_bot_multi docker_dev --force-scopes \
-		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/talk_bot_multi/appinfo/info.xml
-
-.PHONY: manual_register
-manual_register:
-	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister talk_bot_multi --silent || true
-	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register talk_bot_multi manual_install --json-info \
-  "{\"appid\":\"talk_bot_multi\",\"name\":\"TalkBotMulti\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9033,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
-  --force-scopes
diff --git a/examples/as_app/talk_bot_multi/appinfo/info.xml b/examples/as_app/talk_bot_multi/appinfo/info.xml
deleted file mode 100644
index 0ebad85f..00000000
--- a/examples/as_app/talk_bot_multi/appinfo/info.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>talk_bot_multi</id>
-	<name>TalkBotMulti</name>
-	<summary>Nextcloud TalkBotMulti Example</summary>
-	<description>
-	<![CDATA[Example of multiple Nextcloud Talk Bots in one app]]>
-	</description>
-	<version>1.0.0</version>
-	<licence>MIT</licence>
-	<author mail="andrey18106x@gmail.com" homepage="https://github.com/andrey18106">Andrey Borysenko</author>
-	<author mail="bigcat88@icloud.com" homepage="https://github.com/bigcat88">Alexander Piskun</author>
-	<namespace>TalkBotMultiExample</namespace>
-	<category>tools</category>
-	<website>https://github.com/cloud-py-api/nc_py_api</website>
-	<bugs>https://github.com/cloud-py-api/nc_py_api/issues</bugs>
-	<repository type="git">https://github.com/cloud-py-api/nc_py_api</repository>
-	<dependencies>
-		<nextcloud min-version="27" max-version="28"/>
-	</dependencies>
-	<external-app>
-		<docker-install>
-			<registry>ghcr.io</registry>
-			<image>cloud-py-api/talk_bot_multi</image>
-			<image-tag>latest</image-tag>
-		</docker-install>
-		<scopes>
-			<required>
-				<value>TALK</value>
-				<value>TALK_BOT</value>
-			</required>
-			<optional>
-			</optional>
-		</scopes>
-		<protocol>http</protocol>
-		<system>false</system>
-	</external-app>
-</info>
diff --git a/examples/as_app/talk_bot_multi/requirements.txt b/examples/as_app/talk_bot_multi/requirements.txt
deleted file mode 100644
index 20e27d1b..00000000
--- a/examples/as_app/talk_bot_multi/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-nc_py_api[app]>=0.4.1
diff --git a/examples/as_app/talk_bot_multi/screenshots/talk_bots.png b/examples/as_app/talk_bot_multi/screenshots/talk_bots.png
deleted file mode 100644
index a1971fe6..00000000
Binary files a/examples/as_app/talk_bot_multi/screenshots/talk_bots.png and /dev/null differ
diff --git a/examples/as_app/talk_bot_multi/src/main.py b/examples/as_app/talk_bot_multi/src/main.py
deleted file mode 100644
index c1f423e8..00000000
--- a/examples/as_app/talk_bot_multi/src/main.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""An example of two bots in one application.
-
-Of course, everything can be done with one bot, and in most cases, this is more correct,
-but this is just an example that the system is unlimited and an application can have more than one bot."""
-
-import re
-from typing import Annotated
-
-import requests
-from fastapi import Depends, FastAPI
-
-from nc_py_api import NextcloudApp, talk_bot
-from nc_py_api.ex_app import run_app, set_handlers, talk_bot_app
-
-APP = FastAPI()
-BOT1 = talk_bot.TalkBot("/bot1", "Test bot number One", "Usage: `@bot one | @bots`")
-BOT2 = talk_bot.TalkBot("/bot2", "Test bot number Two", "Usage: `@bot two | @bots`")
-
-
-@APP.post("/bot1")
-async def bot1(message: Annotated[talk_bot.TalkBotMessage, Depends(talk_bot_app)]):
-    if message.object_name != "message":
-        return None
-    r = re.search(r"@bot\sone.*", message.object_content["message"], re.IGNORECASE)
-    if r is None and re.search(r"@bots!", message.object_content["message"], re.IGNORECASE) is None:
-        return None
-    BOT1.send_message("I am here, my Lord!", message)
-    return requests.Response()
-
-
-@APP.post("/bot2")
-async def bot2(message: Annotated[talk_bot.TalkBotMessage, Depends(talk_bot_app)]):
-    if message.object_name != "message":
-        return None
-    r = re.search(r"@bot\stwo.*", message.object_content["message"], re.IGNORECASE)
-    if r is None and re.search(r"@bots!", message.object_content["message"], re.IGNORECASE) is None:
-        return None
-    BOT2.send_message("I am here, my Lord!", message)
-    return requests.Response()
-
-
-def enabled_handler(enabled: bool, nc: NextcloudApp) -> str:
-    print(f"enabled={enabled}")
-    try:
-        if enabled:
-            """This is necessary because this example is used in the `AppAPI` tests to check the correctness of
-            removing bots from the AppAPI database itself, if the bots are already turned off and cannot call
-            **unregister_talk_bot** themselves."""
-            BOT1.enabled_handler(enabled, nc)
-            BOT2.enabled_handler(enabled, nc)
-    except Exception as e:
-        return str(e)
-    return ""
-
-
-@APP.on_event("startup")
-def initialization():
-    set_handlers(APP, enabled_handler)
-
-
-if __name__ == "__main__":
-    run_app("main:APP", log_level="trace")
diff --git a/examples/as_app/to_gif/Makefile b/examples/as_app/to_gif/Makefile
index dd0b3de3..559a2a5c 100644
--- a/examples/as_app/to_gif/Makefile
+++ b/examples/as_app/to_gif/Makefile
@@ -25,8 +25,13 @@ build-push:
 	docker login ghcr.io
 	docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/to_gif:latest .
 
-.PHONY: deploy
-deploy:
+.PHONY: deploy28
+deploy28:
+	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:deploy to_gif docker_dev \
+		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/to_gif/appinfo/info.xml
+
+.PHONY: deploy27
+deploy27:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:deploy to_gif docker_dev \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/to_gif/appinfo/info.xml
 
@@ -36,21 +41,21 @@ run28:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register to_gif docker_dev --force-scopes \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/to_gif/appinfo/info.xml
 
-.PHONY: manual_register28
-manual_register28:
-	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister to_gif --silent || true
-	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register to_gif manual_install --json-info \
-  "{\"appid\":\"to_gif\",\"name\":\"to_gif\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9031,\"scopes\":{\"required\":[\"FILES\", \"NOTIFICATIONS\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
-  --force-scopes
-
 .PHONY: run27
 run27:
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister to_gif --silent || true
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register to_gif docker_dev --force-scopes \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/to_gif/appinfo/info.xml
 
-.PHONY: manual_register27
-manual_register27:
+.PHONY: register28
+register28:
+	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister to_gif --silent || true
+	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register to_gif manual_install --json-info \
+  "{\"appid\":\"to_gif\",\"name\":\"to_gif\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9031,\"scopes\":{\"required\":[\"FILES\", \"NOTIFICATIONS\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  --force-scopes
+
+.PHONY: register27
+register27:
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister to_gif --silent || true
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register to_gif manual_install --json-info \
   "{\"appid\":\"to_gif\",\"name\":\"to_gif\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9031,\"scopes\":{\"required\":[\"FILES\", \"NOTIFICATIONS\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
diff --git a/examples/as_app/to_gif/requirements.txt b/examples/as_app/to_gif/requirements.txt
index e7bab5ea..c695ed94 100644
--- a/examples/as_app/to_gif/requirements.txt
+++ b/examples/as_app/to_gif/requirements.txt
@@ -1,4 +1,4 @@
-nc_py_api[app]>=0.4.1
+nc_py_api[app]>=0.5.0
 pygifsicle
 imageio
 opencv-python
diff --git a/examples/as_app/to_gif/src/main.py b/examples/as_app/to_gif/src/main.py
index 6b959705..5ae14493 100644
--- a/examples/as_app/to_gif/src/main.py
+++ b/examples/as_app/to_gif/src/main.py
@@ -1,6 +1,6 @@
 """Simplest example of files_dropdown_menu + notification."""
-
 import tempfile
+from contextlib import asynccontextmanager
 from os import path
 from typing import Annotated
 
@@ -20,7 +20,14 @@
     set_handlers,
 )
 
-APP = FastAPI()
+
+@asynccontextmanager
+async def lifespan(_app: FastAPI):
+    set_handlers(APP, enabled_handler)
+    yield
+
+
+APP = FastAPI(lifespan=lifespan)
 
 
 def convert_video_to_gif(input_file: FsNode, nc: NextcloudApp):
@@ -87,11 +94,6 @@ def enabled_handler(enabled: bool, nc: NextcloudApp) -> str:
     return ""
 
 
-@APP.on_event("startup")
-def initialization():
-    set_handlers(APP, enabled_handler)
-
-
 if __name__ == "__main__":
     run_app(
         "main:APP",
diff --git a/nc_py_api/_version.py b/nc_py_api/_version.py
index f70a7d3b..79adc9c5 100644
--- a/nc_py_api/_version.py
+++ b/nc_py_api/_version.py
@@ -1,3 +1,3 @@
 """Version of nc_py_api."""
 
-__version__ = "0.4.1.dev0"
+__version__ = "0.5.0.dev0"
diff --git a/nc_py_api/ex_app/ui/files.py b/nc_py_api/ex_app/ui/files.py
index 4ccd3f76..1406dfb9 100644
--- a/nc_py_api/ex_app/ui/files.py
+++ b/nc_py_api/ex_app/ui/files.py
@@ -96,7 +96,7 @@ def register(self, name: str, display_name: str, callback_url: str, **kwargs) ->
                 "permissions": kwargs.get("permissions", 31),
                 "order": kwargs.get("order", 0),
                 "icon": kwargs.get("icon", ""),
-                "icon_class": kwargs.get("icon_class", "icon-app-ecosystem-v2"),
+                "icon_class": kwargs.get("icon_class", "icon-app-api"),
                 "action_handler": callback_url,
             },
         }
diff --git a/pyproject.toml b/pyproject.toml
index 0860b894..0326eeff 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,6 +12,7 @@ keywords = [
   "api",
   "client",
   "framework",
+  "library",
   "nextcloud",
 ]
 license = "BSD-3-Clause"
diff --git a/tests/_install.py b/tests/_install.py
index 746ca5b9..d5e1186f 100644
--- a/tests/_install.py
+++ b/tests/_install.py
@@ -1,3 +1,4 @@
+from contextlib import asynccontextmanager
 from typing import Annotated
 
 from fastapi import Depends, FastAPI
@@ -5,7 +6,14 @@
 
 from nc_py_api import NextcloudApp, ex_app
 
-APP = FastAPI()
+
+@asynccontextmanager
+async def lifespan(_app: FastAPI):
+    ex_app.set_handlers(APP, enabled_handler, heartbeat_callback, init_handler=init_handler)
+    yield
+
+
+APP = FastAPI(lifespan=lifespan)
 
 
 @APP.put("/sec_check")
@@ -35,10 +43,5 @@ def heartbeat_callback():
     return "ok"
 
 
-@APP.on_event("startup")
-def initialization():
-    ex_app.set_handlers(APP, enabled_handler, heartbeat_callback, init_handler=init_handler)
-
-
 if __name__ == "__main__":
     ex_app.run_app("_install:APP", log_level="trace")
diff --git a/tests/_install_init_handler_models.py b/tests/_install_init_handler_models.py
index c2f2f66f..4f866e8c 100644
--- a/tests/_install_init_handler_models.py
+++ b/tests/_install_init_handler_models.py
@@ -1,12 +1,22 @@
+from contextlib import asynccontextmanager
+
 from fastapi import FastAPI
 from huggingface_hub import snapshot_download
 
 from nc_py_api import NextcloudApp, ex_app
 
-APP = FastAPI()
 MODEL_NAME = "MBZUAI/LaMini-T5-61M"
 
 
+@asynccontextmanager
+async def lifespan(_app: FastAPI):
+    ex_app.set_handlers(APP, enabled_handler, models_to_fetch=[MODEL_NAME])
+    yield
+
+
+APP = FastAPI(lifespan=lifespan)
+
+
 def enabled_handler(enabled: bool, _nc: NextcloudApp) -> str:
     if enabled:
         try:
@@ -16,10 +26,5 @@ def enabled_handler(enabled: bool, _nc: NextcloudApp) -> str:
     return ""
 
 
-@APP.on_event("startup")
-def initialization():
-    ex_app.set_handlers(APP, enabled_handler, models_to_fetch=[MODEL_NAME])
-
-
 if __name__ == "__main__":
     ex_app.run_app("_install_init_handler_models:APP", log_level="warning")
diff --git a/tests/_install_only_enabled_handler.py b/tests/_install_only_enabled_handler.py
index 07968c43..447b5842 100644
--- a/tests/_install_only_enabled_handler.py
+++ b/tests/_install_only_enabled_handler.py
@@ -1,17 +1,21 @@
+from contextlib import asynccontextmanager
+
 from fastapi import FastAPI
 
 from nc_py_api import NextcloudApp, ex_app
 
-APP = FastAPI()
 
+@asynccontextmanager
+async def lifespan(_app: FastAPI):
+    ex_app.set_handlers(APP, enabled_handler)
+    yield
 
-def enabled_handler(_enabled: bool, _nc: NextcloudApp) -> str:
-    return ""
 
+APP = FastAPI(lifespan=lifespan)
 
-@APP.on_event("startup")
-def initialization():
-    ex_app.set_handlers(APP, enabled_handler)
+
+def enabled_handler(_enabled: bool, _nc: NextcloudApp) -> str:
+    return ""
 
 
 if __name__ == "__main__":