From 8aff8f2fb541c4a416570b41a599a8ffdf2c9cfc Mon Sep 17 00:00:00 2001
From: Ultradesu <ultradesu@hexor.cy>
Date: Thu, 18 Sep 2025 02:56:59 +0300
Subject: [PATCH] init rust. WIP: tls for inbounds

---
 .env.example                                  |   31 +
 .github/workflows/main.yml                    |   51 -
 .gitignore                                    |   17 +-
 .vscode/launch.json                           |   64 -
 API.md                                        |   73 +
 Cargo.lock                                    | 4252 +++++++++++++++++
 Cargo.toml                                    |   59 +
 Dockerfile                                    |   40 -
 LICENSE                                       |   13 -
 LLM_PROJECT_CONTEXT.md                        |  132 +
 README.md                                     |   58 -
 SECURITY.md                                   |   21 -
 buildx.yaml                                   |    5 -
 cleanup_analysis.sql                          |   15 -
 cleanup_options.sql                           |   35 -
 docker-compose.yaml                           |  102 -
 manage.py                                     |   22 -
 mysite/__init__.py                            |    3 -
 mysite/asgi.py                                |   16 -
 mysite/celery.py                              |   40 -
 mysite/context_processors.py                  |   42 -
 mysite/middleware.py                          |   22 -
 mysite/settings.py                            |  233 -
 mysite/urls.py                                |   30 -
 mysite/wsgi.py                                |   16 -
 requirements.txt                              |   22 -
 src/config/args.rs                            |   60 +
 src/config/env.rs                             |  104 +
 src/config/file.rs                            |  165 +
 src/config/mod.rs                             |  244 +
 src/database/entities/certificate.rs          |  243 +
 src/database/entities/inbound_template.rs     |  278 ++
 src/database/entities/inbound_users.rs        |  168 +
 src/database/entities/mod.rs                  |   16 +
 src/database/entities/server.rs               |  212 +
 src/database/entities/server_inbound.rs       |  204 +
 src/database/entities/user.rs                 |  185 +
 src/database/entities/user_access.rs          |  188 +
 .../m20241201_000001_create_users_table.rs    |  135 +
 ...241201_000002_create_certificates_table.rs |  120 +
 ...1_000003_create_inbound_templates_table.rs |  155 +
 .../m20241201_000004_create_servers_table.rs  |  136 +
 ...201_000005_create_server_inbounds_table.rs |  195 +
 ...0241201_000006_create_user_access_table.rs |  196 +
 ...41201_000007_create_inbound_users_table.rs |  125 +
 src/database/migrations/mod.rs                |   26 +
 src/database/mod.rs                           |  161 +
 src/database/repository/certificate.rs        |   75 +
 src/database/repository/inbound_template.rs   |   65 +
 src/database/repository/inbound_users.rs      |  132 +
 src/database/repository/mod.rs                |   15 +
 src/database/repository/server.rs             |   79 +
 src/database/repository/server_inbound.rs     |  159 +
 src/database/repository/user.rs               |  157 +
 src/database/repository/user_access.rs        |  118 +
 src/main.rs                                   |  186 +
 src/services/certificates.rs                  |   41 +
 src/services/events.rs                        |   30 +
 src/services/mod.rs                           |    7 +
 src/services/tasks.rs                         |  484 ++
 src/services/xray/client.rs                   |   91 +
 src/services/xray/config.rs                   |  285 ++
 src/services/xray/inbounds.rs                 |  325 ++
 src/services/xray/mod.rs                      |  213 +
 src/services/xray/stats.rs                    |   70 +
 src/services/xray/users.rs                    |  150 +
 src/web/handlers/certificates.rs              |  137 +
 src/web/handlers/mod.rs                       |    9 +
 src/web/handlers/servers.rs                   |  575 +++
 src/web/handlers/templates.rs                 |   88 +
 src/web/handlers/users.rs                     |  206 +
 src/web/mod.rs                                |   70 +
 src/web/routes/mod.rs                         |   27 +
 src/web/routes/servers.rs                     |   38 +
 static/admin.html                             | 1314 +++++
 static/admin/css/main.css                     |  239 -
 static/admin/css/vpn_admin.css                |  342 --
 static/admin/js/generate_link.js              |  203 -
 static/admin/js/server_status_check.js        |   94 -
 static/admin/js/xray_inbound_defaults.js      |  289 --
 static/index.html                             | 1289 +++++
 telegram_bot/__init__.py                      |    0
 telegram_bot/admin.py                         |  854 ----
 telegram_bot/apps.py                          |   75 -
 telegram_bot/bot.py                           | 1897 --------
 telegram_bot/localization.py                  |  267 --
 telegram_bot/management/__init__.py           |    0
 telegram_bot/management/commands/__init__.py  |    0
 .../management/commands/run_telegram_bot.py   |   99 -
 .../commands/telegram_bot_status.py           |  112 -
 telegram_bot/migrations/0001_initial.py       |   70 -
 .../0002_add_connection_settings.py           |   33 -
 telegram_bot/migrations/0003_accessrequest.py |   42 -
 ..._telegram_bo_status_cf9310_idx_and_more.py |   37 -
 ...ve_botsettings_welcome_message_and_more.py |   25 -
 .../0006_accessrequest_desired_username.py    |   18 -
 ...emove_botsettings_help_message_and_more.py |   27 -
 ...08_accessrequest_selected_existing_user.py |   28 -
 ...ccessrequest_selected_inbounds_and_more.py |   24 -
 .../0010_botsettings_telegram_admins.py       |   20 -
 telegram_bot/migrations/__init__.py           |    0
 telegram_bot/models.py                        |  318 --
 telegram_bot/tests.py                         |    3 -
 telegram_bot/views.py                         |    3 -
 telegram_bot_locks/telegram_bot.lock          |    0
 templates/admin/create_xray_inbound.html      |  202 -
 vpn/__init__.py                               |    0
 vpn/admin.py                                  |  169 -
 vpn/admin/__init__.py                         |   45 -
 vpn/admin/access.py                           |  485 --
 vpn/admin/base.py                             |   57 -
 vpn/admin/logs.py                             |  179 -
 vpn/admin/server.py                           |  864 ----
 vpn/admin/user.py                             |  702 ---
 vpn/admin_minimal.py                          |   73 -
 vpn/admin_test.py                             |   16 -
 vpn/admin_xray.py                             | 1056 ----
 vpn/apps.py                                   |  109 -
 vpn/forms.py                                  |    7 -
 vpn/letsencrypt/__init__.py                   |   13 -
 vpn/letsencrypt/letsencrypt_dns.py            |  403 --
 vpn/management/__init__.py                    |    1 -
 .../commands/cleanup_access_logs.py           |  158 -
 vpn/management/commands/cleanup_logs.py       |  208 -
 vpn/management/commands/create_admin.py       |   17 -
 vpn/management/commands/init_statistics.py    |    1 -
 .../commands/simple_cleanup_logs.py           |   51 -
 vpn/migrations/0001_initial.py                |  139 -
 vpn/migrations/0002_taskexecutionlog.py       |   51 -
 .../0003_acllink_last_access_time.py          |   18 -
 ...r_options_alter_server_options_and_more.py |   53 -
 vpn/migrations/0004_merge_20250721_1223.py    |   14 -
 vpn/migrations/0005_userstatistics.py         |   45 -
 vpn/migrations/0006_accesslog_acl_link_id.py  |   22 -
 ...vpn_usersta_user_id_512036_idx_and_more.py |   23 -
 vpn/migrations/0007_merge_20250721_1345.py    |   14 -
 ...3c6e_idx_vpn_accessl_acl_lin_9f3bc5_idx.py |   18 -
 ...xraycoreserver_alter_server_server_type.py |   42 -
 ...ove_xraycoreserver_api_address_and_more.py |  137 -
 .../0011_xrayinboundproxy_and_more.py         |   34 -
 ...ayinboundserver_delete_xrayinboundproxy.py |   29 -
 vpn/migrations/0013_add_client_hostname.py    |   18 -
 ...xraycoreserver_client_hostname_and_more.py |   23 -
 vpn/migrations/0015_remove_old_xray_models.py |   32 -
 vpn/migrations/0016_add_new_xray_models.py    |  127 -
 ..._alter_server_server_type_serverinbound.py |   52 -
 ...er_certificate_certificate_pem_and_more.py |   28 -
 vpn/migrations/0019_certificate_acme_email.py |   18 -
 .../0020_alter_inbound_full_config.py         |   18 -
 .../0021_remove_xray_configuration.py         |   16 -
 .../0022_remove_inbound_domain_field.py       |   21 -
 .../0023_alter_subscriptiongroup_options.py   |   17 -
 .../0024_add_certificate_to_serverinbound.py  |   23 -
 ...t_name_user_telegram_last_name_and_more.py |   38 -
 .../0026_alter_subscriptiongroup_options.py   |   17 -
 vpn/migrations/__init__.py                    |    1 -
 vpn/models.py                                 |  208 -
 vpn/models_xray.py                            |  464 --
 vpn/server_plugins/__init__.py                |    5 -
 vpn/server_plugins/generic.py                 |   62 -
 vpn/server_plugins/outline.py                 |  823 ----
 vpn/server_plugins/urls.py                    |    7 -
 vpn/server_plugins/wireguard.py               |   83 -
 vpn/server_plugins/xray_v2.py                 |  966 ----
 vpn/signals.py                                |  357 --
 vpn/tasks.py                                  | 1192 -----
 vpn/templates/admin/base_site.html            |   37 -
 vpn/templates/admin/move_clients.html         |  499 --
 .../admin/polls/user/change_form.html         |   10 -
 vpn/templates/admin/purge_users.html          |  304 --
 vpn/templates/admin/simple_move_clients.html  |   93 -
 .../admin/vpn/acllink/change_list.html        |   47 -
 .../admin/vpn/certificate/change_form.html    |   18 -
 .../admin/vpn/certificate/change_list.html    |   18 -
 .../admin/vpn/inbound/change_form.html        |   18 -
 .../admin/vpn/inbound/change_list.html        |   18 -
 .../vpn/outlineserver/add_form.html.backup    |  176 -
 .../admin/vpn/outlineserver/change_form.html  |   23 -
 .../admin/vpn/server/change_form.html         |   39 -
 .../admin/vpn/server/change_list.html         |  166 -
 .../admin/vpn/server/change_list.html.backup  |   11 -
 .../vpn/subscriptiongroup/change_form.html    |   18 -
 .../vpn/subscriptiongroup/change_list.html    |   18 -
 .../vpn/taskexecutionlog/change_list.html     |    5 -
 vpn/templates/admin/vpn/user/change_form.html |  219 -
 .../vpn/usersubscription/change_form.html     |   18 -
 .../vpn/usersubscription/change_list.html     |   18 -
 vpn/templates/vpn/user_portal.html            |  765 ---
 vpn/templates/vpn/user_portal_error.html      |  148 -
 vpn/tests.py                                  |    3 -
 vpn/utils.py                                  |   21 -
 vpn/views.py                                  |  635 ---
 vpn/xray_api_v2/__init__.py                   |   62 -
 vpn/xray_api_v2/client.py                     |  235 -
 vpn/xray_api_v2/commands/__init__.py          |    0
 vpn/xray_api_v2/commands/user.py              |   33 -
 vpn/xray_api_v2/exceptions.py                 |   31 -
 vpn/xray_api_v2/models/__init__.py            |   55 -
 vpn/xray_api_v2/models/base.py                |   97 -
 vpn/xray_api_v2/models/inbound.py             |  176 -
 vpn/xray_api_v2/models/protocols.py           |  266 --
 vpn/xray_api_v2/models/security.py            |  389 --
 vpn/xray_api_v2/models/transports.py          |  241 -
 vpn/xray_api_v2/serializers/__init__.py       |    0
 vpn/xray_api_v2/stats.py                      |  184 -
 vpn/xray_api_v2/subscription.py               |  392 --
 206 files changed, 14301 insertions(+), 21560 deletions(-)
 create mode 100644 .env.example
 delete mode 100755 .github/workflows/main.yml
 delete mode 100644 .vscode/launch.json
 create mode 100644 API.md
 create mode 100644 Cargo.lock
 create mode 100644 Cargo.toml
 delete mode 100644 Dockerfile
 delete mode 100755 LICENSE
 create mode 100644 LLM_PROJECT_CONTEXT.md
 delete mode 100755 README.md
 delete mode 100644 SECURITY.md
 delete mode 100755 buildx.yaml
 delete mode 100644 cleanup_analysis.sql
 delete mode 100644 cleanup_options.sql
 delete mode 100644 docker-compose.yaml
 delete mode 100755 manage.py
 delete mode 100644 mysite/__init__.py
 delete mode 100644 mysite/asgi.py
 delete mode 100644 mysite/celery.py
 delete mode 100644 mysite/context_processors.py
 delete mode 100644 mysite/middleware.py
 delete mode 100644 mysite/settings.py
 delete mode 100644 mysite/urls.py
 delete mode 100644 mysite/wsgi.py
 delete mode 100644 requirements.txt
 create mode 100644 src/config/args.rs
 create mode 100644 src/config/env.rs
 create mode 100644 src/config/file.rs
 create mode 100644 src/config/mod.rs
 create mode 100644 src/database/entities/certificate.rs
 create mode 100644 src/database/entities/inbound_template.rs
 create mode 100644 src/database/entities/inbound_users.rs
 create mode 100644 src/database/entities/mod.rs
 create mode 100644 src/database/entities/server.rs
 create mode 100644 src/database/entities/server_inbound.rs
 create mode 100644 src/database/entities/user.rs
 create mode 100644 src/database/entities/user_access.rs
 create mode 100644 src/database/migrations/m20241201_000001_create_users_table.rs
 create mode 100644 src/database/migrations/m20241201_000002_create_certificates_table.rs
 create mode 100644 src/database/migrations/m20241201_000003_create_inbound_templates_table.rs
 create mode 100644 src/database/migrations/m20241201_000004_create_servers_table.rs
 create mode 100644 src/database/migrations/m20241201_000005_create_server_inbounds_table.rs
 create mode 100644 src/database/migrations/m20241201_000006_create_user_access_table.rs
 create mode 100644 src/database/migrations/m20241201_000007_create_inbound_users_table.rs
 create mode 100644 src/database/migrations/mod.rs
 create mode 100644 src/database/mod.rs
 create mode 100644 src/database/repository/certificate.rs
 create mode 100644 src/database/repository/inbound_template.rs
 create mode 100644 src/database/repository/inbound_users.rs
 create mode 100644 src/database/repository/mod.rs
 create mode 100644 src/database/repository/server.rs
 create mode 100644 src/database/repository/server_inbound.rs
 create mode 100644 src/database/repository/user.rs
 create mode 100644 src/database/repository/user_access.rs
 create mode 100644 src/main.rs
 create mode 100644 src/services/certificates.rs
 create mode 100644 src/services/events.rs
 create mode 100644 src/services/mod.rs
 create mode 100644 src/services/tasks.rs
 create mode 100644 src/services/xray/client.rs
 create mode 100644 src/services/xray/config.rs
 create mode 100644 src/services/xray/inbounds.rs
 create mode 100644 src/services/xray/mod.rs
 create mode 100644 src/services/xray/stats.rs
 create mode 100644 src/services/xray/users.rs
 create mode 100644 src/web/handlers/certificates.rs
 create mode 100644 src/web/handlers/mod.rs
 create mode 100644 src/web/handlers/servers.rs
 create mode 100644 src/web/handlers/templates.rs
 create mode 100644 src/web/handlers/users.rs
 create mode 100644 src/web/mod.rs
 create mode 100644 src/web/routes/mod.rs
 create mode 100644 src/web/routes/servers.rs
 create mode 100644 static/admin.html
 delete mode 100644 static/admin/css/main.css
 delete mode 100644 static/admin/css/vpn_admin.css
 delete mode 100644 static/admin/js/generate_link.js
 delete mode 100644 static/admin/js/server_status_check.js
 delete mode 100644 static/admin/js/xray_inbound_defaults.js
 create mode 100644 static/index.html
 delete mode 100644 telegram_bot/__init__.py
 delete mode 100644 telegram_bot/admin.py
 delete mode 100644 telegram_bot/apps.py
 delete mode 100644 telegram_bot/bot.py
 delete mode 100644 telegram_bot/localization.py
 delete mode 100644 telegram_bot/management/__init__.py
 delete mode 100644 telegram_bot/management/commands/__init__.py
 delete mode 100644 telegram_bot/management/commands/run_telegram_bot.py
 delete mode 100644 telegram_bot/management/commands/telegram_bot_status.py
 delete mode 100644 telegram_bot/migrations/0001_initial.py
 delete mode 100644 telegram_bot/migrations/0002_add_connection_settings.py
 delete mode 100644 telegram_bot/migrations/0003_accessrequest.py
 delete mode 100644 telegram_bot/migrations/0004_remove_accessrequest_telegram_bo_status_cf9310_idx_and_more.py
 delete mode 100644 telegram_bot/migrations/0005_delete_botstatus_remove_botsettings_welcome_message_and_more.py
 delete mode 100644 telegram_bot/migrations/0006_accessrequest_desired_username.py
 delete mode 100644 telegram_bot/migrations/0007_remove_botsettings_help_message_and_more.py
 delete mode 100644 telegram_bot/migrations/0008_accessrequest_selected_existing_user.py
 delete mode 100644 telegram_bot/migrations/0009_accessrequest_selected_inbounds_and_more.py
 delete mode 100644 telegram_bot/migrations/0010_botsettings_telegram_admins.py
 delete mode 100644 telegram_bot/migrations/__init__.py
 delete mode 100644 telegram_bot/models.py
 delete mode 100644 telegram_bot/tests.py
 delete mode 100644 telegram_bot/views.py
 delete mode 100644 telegram_bot_locks/telegram_bot.lock
 delete mode 100644 templates/admin/create_xray_inbound.html
 delete mode 100644 vpn/__init__.py
 delete mode 100644 vpn/admin.py
 delete mode 100644 vpn/admin/__init__.py
 delete mode 100644 vpn/admin/access.py
 delete mode 100644 vpn/admin/base.py
 delete mode 100644 vpn/admin/logs.py
 delete mode 100644 vpn/admin/server.py
 delete mode 100644 vpn/admin/user.py
 delete mode 100644 vpn/admin_minimal.py
 delete mode 100644 vpn/admin_test.py
 delete mode 100644 vpn/admin_xray.py
 delete mode 100644 vpn/apps.py
 delete mode 100644 vpn/forms.py
 delete mode 100644 vpn/letsencrypt/__init__.py
 delete mode 100644 vpn/letsencrypt/letsencrypt_dns.py
 delete mode 100644 vpn/management/__init__.py
 delete mode 100644 vpn/management/commands/cleanup_access_logs.py
 delete mode 100644 vpn/management/commands/cleanup_logs.py
 delete mode 100644 vpn/management/commands/create_admin.py
 delete mode 100644 vpn/management/commands/init_statistics.py
 delete mode 100644 vpn/management/commands/simple_cleanup_logs.py
 delete mode 100644 vpn/migrations/0001_initial.py
 delete mode 100644 vpn/migrations/0002_taskexecutionlog.py
 delete mode 100644 vpn/migrations/0003_acllink_last_access_time.py
 delete mode 100644 vpn/migrations/0003_alter_outlineserver_options_alter_server_options_and_more.py
 delete mode 100644 vpn/migrations/0004_merge_20250721_1223.py
 delete mode 100644 vpn/migrations/0005_userstatistics.py
 delete mode 100644 vpn/migrations/0006_accesslog_acl_link_id.py
 delete mode 100644 vpn/migrations/0006_rename_vpn_usersta_user_id_1c7cd0_idx_vpn_usersta_user_id_512036_idx_and_more.py
 delete mode 100644 vpn/migrations/0007_merge_20250721_1345.py
 delete mode 100644 vpn/migrations/0008_rename_vpn_accessl_acl_lin_b23c6e_idx_vpn_accessl_acl_lin_9f3bc5_idx.py
 delete mode 100644 vpn/migrations/0009_xraycoreserver_alter_server_server_type.py
 delete mode 100644 vpn/migrations/0010_remove_xraycoreserver_api_address_and_more.py
 delete mode 100644 vpn/migrations/0011_xrayinboundproxy_and_more.py
 delete mode 100644 vpn/migrations/0012_xrayinboundserver_delete_xrayinboundproxy.py
 delete mode 100644 vpn/migrations/0013_add_client_hostname.py
 delete mode 100644 vpn/migrations/0014_alter_xraycoreserver_client_hostname_and_more.py
 delete mode 100644 vpn/migrations/0015_remove_old_xray_models.py
 delete mode 100644 vpn/migrations/0016_add_new_xray_models.py
 delete mode 100644 vpn/migrations/0017_xrayserverv2_alter_server_server_type_serverinbound.py
 delete mode 100644 vpn/migrations/0018_alter_certificate_certificate_pem_and_more.py
 delete mode 100644 vpn/migrations/0019_certificate_acme_email.py
 delete mode 100644 vpn/migrations/0020_alter_inbound_full_config.py
 delete mode 100644 vpn/migrations/0021_remove_xray_configuration.py
 delete mode 100644 vpn/migrations/0022_remove_inbound_domain_field.py
 delete mode 100644 vpn/migrations/0023_alter_subscriptiongroup_options.py
 delete mode 100644 vpn/migrations/0024_add_certificate_to_serverinbound.py
 delete mode 100644 vpn/migrations/0025_user_telegram_first_name_user_telegram_last_name_and_more.py
 delete mode 100644 vpn/migrations/0026_alter_subscriptiongroup_options.py
 delete mode 100644 vpn/migrations/__init__.py
 delete mode 100644 vpn/models.py
 delete mode 100644 vpn/models_xray.py
 delete mode 100644 vpn/server_plugins/__init__.py
 delete mode 100644 vpn/server_plugins/generic.py
 delete mode 100644 vpn/server_plugins/outline.py
 delete mode 100644 vpn/server_plugins/urls.py
 delete mode 100644 vpn/server_plugins/wireguard.py
 delete mode 100644 vpn/server_plugins/xray_v2.py
 delete mode 100644 vpn/signals.py
 delete mode 100644 vpn/tasks.py
 delete mode 100644 vpn/templates/admin/base_site.html
 delete mode 100644 vpn/templates/admin/move_clients.html
 delete mode 100644 vpn/templates/admin/polls/user/change_form.html
 delete mode 100644 vpn/templates/admin/purge_users.html
 delete mode 100644 vpn/templates/admin/simple_move_clients.html
 delete mode 100644 vpn/templates/admin/vpn/acllink/change_list.html
 delete mode 100644 vpn/templates/admin/vpn/certificate/change_form.html
 delete mode 100644 vpn/templates/admin/vpn/certificate/change_list.html
 delete mode 100644 vpn/templates/admin/vpn/inbound/change_form.html
 delete mode 100644 vpn/templates/admin/vpn/inbound/change_list.html
 delete mode 100644 vpn/templates/admin/vpn/outlineserver/add_form.html.backup
 delete mode 100644 vpn/templates/admin/vpn/outlineserver/change_form.html
 delete mode 100644 vpn/templates/admin/vpn/server/change_form.html
 delete mode 100644 vpn/templates/admin/vpn/server/change_list.html
 delete mode 100644 vpn/templates/admin/vpn/server/change_list.html.backup
 delete mode 100644 vpn/templates/admin/vpn/subscriptiongroup/change_form.html
 delete mode 100644 vpn/templates/admin/vpn/subscriptiongroup/change_list.html
 delete mode 100644 vpn/templates/admin/vpn/taskexecutionlog/change_list.html
 delete mode 100644 vpn/templates/admin/vpn/user/change_form.html
 delete mode 100644 vpn/templates/admin/vpn/usersubscription/change_form.html
 delete mode 100644 vpn/templates/admin/vpn/usersubscription/change_list.html
 delete mode 100644 vpn/templates/vpn/user_portal.html
 delete mode 100644 vpn/templates/vpn/user_portal_error.html
 delete mode 100644 vpn/tests.py
 delete mode 100644 vpn/utils.py
 delete mode 100644 vpn/views.py
 delete mode 100644 vpn/xray_api_v2/__init__.py
 delete mode 100644 vpn/xray_api_v2/client.py
 delete mode 100644 vpn/xray_api_v2/commands/__init__.py
 delete mode 100644 vpn/xray_api_v2/commands/user.py
 delete mode 100644 vpn/xray_api_v2/exceptions.py
 delete mode 100644 vpn/xray_api_v2/models/__init__.py
 delete mode 100644 vpn/xray_api_v2/models/base.py
 delete mode 100644 vpn/xray_api_v2/models/inbound.py
 delete mode 100644 vpn/xray_api_v2/models/protocols.py
 delete mode 100644 vpn/xray_api_v2/models/security.py
 delete mode 100644 vpn/xray_api_v2/models/transports.py
 delete mode 100644 vpn/xray_api_v2/serializers/__init__.py
 delete mode 100644 vpn/xray_api_v2/stats.py
 delete mode 100644 vpn/xray_api_v2/subscription.py

diff --git a/.env.example b/.env.example
new file mode 100644
index 0000000..e07d009
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,31 @@
+# Environment Variables Example for Xray Admin Panel
+# Copy this file to .env and modify the values as needed
+
+# Database Configuration
+DATABASE_URL=postgresql://xray_admin:password@localhost:5432/xray_admin
+XRAY_ADMIN__DATABASE__MAX_CONNECTIONS=20
+XRAY_ADMIN__DATABASE__CONNECTION_TIMEOUT=30
+XRAY_ADMIN__DATABASE__AUTO_MIGRATE=true
+
+# Web Server Configuration
+XRAY_ADMIN__WEB__HOST=0.0.0.0
+XRAY_ADMIN__WEB__PORT=8080
+XRAY_ADMIN__WEB__JWT_SECRET=your-super-secret-jwt-key-change-this
+XRAY_ADMIN__WEB__JWT_EXPIRY=86400
+
+# Telegram Bot Configuration
+TELEGRAM_BOT_TOKEN=1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi
+XRAY_ADMIN__TELEGRAM__WEBHOOK_URL=https://your-domain.com/telegram/webhook
+
+# Xray Configuration
+XRAY_ADMIN__XRAY__DEFAULT_API_PORT=62789
+XRAY_ADMIN__XRAY__HEALTH_CHECK_INTERVAL=30
+
+# Logging Configuration
+XRAY_ADMIN__LOGGING__LEVEL=info
+XRAY_ADMIN__LOGGING__FILE_PATH=./logs/xray-admin.log
+XRAY_ADMIN__LOGGING__JSON_FORMAT=false
+
+# Runtime Environment
+RUST_ENV=development
+ENVIRONMENT=development
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100755
index 7f11649..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Docker hub build
-
-on:
-  push:
-    branches:
-      - 'django'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Set outputs
-        id: vars
-        run: |
-          echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-          echo "sha_full=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-          echo "build_date=$(date -u +'%Y-%m-%d %H:%M:%S UTC')" >> $GITHUB_OUTPUT
-          echo "branch_name=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
-      - name: Check outputs
-        run: |
-          echo "Short SHA: ${{ steps.vars.outputs.sha_short }}"
-          echo "Full SHA: ${{ steps.vars.outputs.sha_full }}"
-          echo "Build Date: ${{ steps.vars.outputs.build_date }}"
-          echo "Branch: ${{ steps.vars.outputs.branch_name }}"
-      -
-        name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          platforms: linux/amd64,linux/arm64
-          push: true
-          cache-from: type=registry,ref=ultradesu/outfleet:buildcache
-          cache-to: type=registry,ref=ultradesu/outfleet:buildcache,mode=max
-          build-args: |
-            GIT_COMMIT=${{ steps.vars.outputs.sha_full }}
-            GIT_COMMIT_SHORT=${{ steps.vars.outputs.sha_short }}
-            BUILD_DATE=${{ steps.vars.outputs.build_date }}
-            BRANCH_NAME=${{ steps.vars.outputs.branch_name }}
-          tags: ultradesu/outfleet:v2,ultradesu/outfleet:${{ steps.vars.outputs.sha_short }}
diff --git a/.gitignore b/.gitignore
index b07e67a..fc7923b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,10 @@
-db.sqlite3
-debug.log
 *.swp
 *.swo
-*.pyc
-staticfiles/
-*.__pycache__.*
-celerybeat-schedule*
+
+/target/
+config.toml
 
 # macOS system files
 ._*
 .DS_Store
 
-# Virtual environments
-venv/
-.venv/
-env/
-
-# Temporary files
-/tmp/
-*.tmp
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index bf46a1d..0000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Django VPN app",
-            "type": "debugpy",
-            "request": "launch",
-            "env": {
-                "POSTGRES_PORT": "5433",
-                "DJANGO_SETTINGS_MODULE": "mysite.settings",
-                "EXTERNAL_ADDRESS": "http://localhost:8000"
-            },
-            "args": [
-                "runserver",
-                "0.0.0.0:8000"
-            ],
-            "django": true,
-            "autoStartBrowser": false,
-            "program": "${workspaceFolder}/manage.py"
-        },
-        {
-            "name": "Celery Worker",
-            "type": "debugpy",
-            "request": "launch",
-            "module": "celery",
-            "args": [
-                "-A", "mysite",
-                "worker",
-                "--loglevel=info"
-            ],
-            "env": {
-                "POSTGRES_PORT": "5433",
-                "DJANGO_SETTINGS_MODULE": "mysite.settings"
-            },
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "Celery Beat",
-            "type": "debugpy",
-            "request": "launch",
-            "module": "celery",
-            "args": [
-                "-A", "mysite",
-                "beat",
-                "--loglevel=info"
-            ],
-            "env": {
-                "POSTGRES_PORT": "5433",
-                "DJANGO_SETTINGS_MODULE": "mysite.settings"
-            },
-            "console": "integratedTerminal"
-        }
-    ],
-    "compounds": [
-        {
-            "name": "Run Django, Celery Worker, and Celery Beat",
-            "configurations": [
-                "Django VPN app",
-                "Celery Worker",
-                "Celery Beat"
-            ]
-        }
-    ]
-}
diff --git a/API.md b/API.md
new file mode 100644
index 0000000..c5be905
--- /dev/null
+++ b/API.md
@@ -0,0 +1,73 @@
+# User Management API
+
+Base URL: `http://localhost:8080/api`
+
+## Endpoints
+
+### Health Check
+- `GET /` - Service health check
+
+### Users
+
+#### List Users
+- `GET /users?page=1&per_page=20` - Get paginated list of users
+
+#### Search Users
+- `GET /users/search?q=john&page=1&per_page=20` - Search users by name
+
+#### Get User
+- `GET /users/{id}` - Get user by ID
+
+#### Create User
+- `POST /users` - Create new user
+```json
+{
+  "name": "John Doe",
+  "comment": "Admin user",
+  "telegram_id": 123456789
+}
+```
+
+#### Update User  
+- `PUT /users/{id}` - Update user by ID
+```json
+{
+  "name": "Jane Doe",
+  "comment": null,
+  "telegram_id": 987654321
+}
+```
+
+#### Delete User
+- `DELETE /users/{id}` - Delete user by ID
+
+## Response Format
+
+### User Object
+```json
+{
+  "id": "uuid",
+  "name": "string",
+  "comment": "string|null", 
+  "telegram_id": "number|null",
+  "created_at": "timestamp",
+  "updated_at": "timestamp"
+}
+```
+
+### Users List Response
+```json
+{
+  "users": [UserObject],
+  "total": 100,
+  "page": 1,
+  "per_page": 20
+}
+```
+
+## Status Codes
+- `200` - Success
+- `201` - Created
+- `404` - Not Found
+- `409` - Conflict (duplicate telegram_id)
+- `500` - Internal Server Error
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..16f72c0
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,4252 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom 0.2.16",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+dependencies = [
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+
+[[package]]
+name = "arraydeque"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "atoi"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "axum"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "axum-macros",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tower 0.5.2",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "rustversion",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-macros"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "base64ct"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
+
+[[package]]
+name = "bigdecimal"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a22f228ab7a1b23027ccc6c350b72868017af7ea8356fbdf19f8d991c690013"
+dependencies = [
+ "autocfg",
+ "libm",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "serde",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "borsh"
+version = "1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
+dependencies = [
+ "borsh-derive",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "bytecheck"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
+dependencies = [
+ "bytecheck_derive",
+ "ptr_meta",
+ "simdutf8",
+]
+
+[[package]]
+name = "bytecheck_derive"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cc"
+version = "1.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65193589c6404eb80b450d618eaf9a2cafaaafd57ecce47370519ef674a7bd44"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "chrono"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "wasm-bindgen",
+ "windows-link 0.2.0",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "config"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68578f196d2a33ff61b27fae256c3164f65e36382648e30666dde05b8cc9dfdf"
+dependencies = [
+ "async-trait",
+ "convert_case",
+ "json5",
+ "nom",
+ "pathdiff",
+ "ron",
+ "rust-ini",
+ "serde",
+ "serde_json",
+ "toml",
+ "yaml-rust2",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+dependencies = [
+ "const-random-macro",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom 0.2.16",
+ "once_cell",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
+[[package]]
+name = "cron"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07"
+dependencies = [
+ "chrono",
+ "nom",
+ "once_cell",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "der"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "deranged"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "dlv-list"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
+dependencies = [
+ "const-random",
+]
+
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "etcetera"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
+dependencies = [
+ "cfg-if",
+ "home",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d"
+
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
+[[package]]
+name = "flume"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "spin",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-intrusive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
+dependencies = [
+ "futures-core",
+ "lock_api",
+ "parking_lot",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.7+wasi-0.2.4",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "glob"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+
+[[package]]
+name = "h2"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap 2.11.3",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash 0.7.8",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash 0.8.12",
+ "allocator-api2",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
+[[package]]
+name = "hashlink"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+dependencies = [
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "hashlink"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+dependencies = [
+ "hashbrown 0.15.5",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "home"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-range-header"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c"
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "pin-utils",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-timeout"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
+dependencies = [
+ "hyper",
+ "hyper-util",
+ "pin-project-lite",
+ "tokio",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "libc",
+ "pin-project-lite",
+ "socket2 0.6.0",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+
+[[package]]
+name = "icu_properties"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+
+[[package]]
+name = "icu_provider"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92119844f513ffa41556430369ab02c295a3578af21cf945caa3e9e0c2481ac3"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.5",
+]
+
+[[package]]
+name = "inherent"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c727f80bfa4a6c6e2508d2f05b6f4bfce242030bd88ed15ae5331c5b5d30fba7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "io-uring"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "js-sys"
+version = "0.3.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852f13bec5eba4ba9afbeb93fd7c13fe56147f055939ae21c43a29a0ecb2702e"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "json5"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1"
+dependencies = [
+ "pest",
+ "pest_derive",
+ "serde",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+dependencies = [
+ "spin",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.175"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+
+[[package]]
+name = "libm"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
+[[package]]
+name = "libredox"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+dependencies = [
+ "bitflags",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "libsqlite3-sys"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
+dependencies = [
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+
+[[package]]
+name = "lock_api"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+
+[[package]]
+name = "matchers"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+dependencies = [
+ "regex-automata",
+]
+
+[[package]]
+name = "matchit"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "mime_guess"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+dependencies = [
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "multimap"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.50.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+dependencies = [
+ "byteorder",
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand",
+ "smallvec",
+ "zeroize",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-derive"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "object"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
+[[package]]
+name = "ordered-float"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "ordered-multimap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
+dependencies = [
+ "dlv-list",
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "ouroboros"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0f050db9c44b97a94723127e6be766ac5c340c48f2c4bb3ffa11713744be59"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c7028bdd3d43083f6d8d4d5187680d0d3560d54df4cc9d752005268b41e64d0"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "proc-macro2-diagnostics",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "pathdiff"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
+
+[[package]]
+name = "pem"
+version = "3.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
+dependencies = [
+ "base64 0.22.1",
+ "serde",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "pest"
+version = "2.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21e0a3a33733faeaf8651dfee72dd0f388f0c8e5ad496a3478fa5a922f49cfa8"
+dependencies = [
+ "memchr",
+ "thiserror 2.0.16",
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc58706f770acb1dbd0973e6530a3cff4746fb721207feb3a8a6064cd0b6c663"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d4f36811dfe07f7b8573462465d5cb8965fffc2e71ae377a33aecf14c2c9a2f"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42919b05089acbd0a5dcd5405fb304d17d1053847b81163d09c4ad18ce8e8420"
+dependencies = [
+ "pest",
+ "sha2",
+]
+
+[[package]]
+name = "petgraph"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.11.3",
+]
+
+[[package]]
+name = "pgvector"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc58e2d255979a31caa7cabfa7aac654af0354220719ab7a68520ae7a91e8c0b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der",
+ "pkcs8",
+ "spki",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "potential_utf"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+dependencies = [
+ "toml_edit 0.23.5",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+ "version_check",
+ "yansi",
+]
+
+[[package]]
+name = "prost"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
+dependencies = [
+ "heck 0.5.0",
+ "itertools",
+ "log",
+ "multimap",
+ "once_cell",
+ "petgraph",
+ "prettyplease",
+ "prost",
+ "prost-types",
+ "regex",
+ "syn 2.0.106",
+ "tempfile",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
+dependencies = [
+ "prost",
+]
+
+[[package]]
+name = "ptr_meta"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
+dependencies = [
+ "ptr_meta_derive",
+]
+
+[[package]]
+name = "ptr_meta_derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "rcgen"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1"
+dependencies = [
+ "pem",
+ "ring",
+ "time",
+ "yasna",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+
+[[package]]
+name = "rend"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
+dependencies = [
+ "bytecheck",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rkyv"
+version = "0.7.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
+dependencies = [
+ "bitvec",
+ "bytecheck",
+ "bytes",
+ "hashbrown 0.12.3",
+ "ptr_meta",
+ "rend",
+ "rkyv_derive",
+ "seahash",
+ "tinyvec",
+ "uuid",
+]
+
+[[package]]
+name = "rkyv_derive"
+version = "0.7.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ron"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
+dependencies = [
+ "base64 0.21.7",
+ "bitflags",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "rsa"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
+dependencies = [
+ "const-oid",
+ "digest",
+ "num-bigint-dig",
+ "num-integer",
+ "num-traits",
+ "pkcs1",
+ "pkcs8",
+ "rand_core",
+ "signature",
+ "spki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap",
+]
+
+[[package]]
+name = "rust_decimal"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8975fc98059f365204d635119cf9c5a60ae67b841ed49b5422a9a7e56cdfac0"
+dependencies = [
+ "arrayvec",
+ "borsh",
+ "bytes",
+ "num-traits",
+ "rand",
+ "rkyv",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
+
+[[package]]
+name = "rustix"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
+dependencies = [
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8572f3c2cb9934231157b45499fc41e1f58c589fdfb81a844ba873265e80f8eb"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "sea-bae"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f694a6ab48f14bc063cfadff30ab551d3c7e46d8f81836c51989d548f44a2a25"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "sea-orm"
+version = "1.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335d87ec8e5c6eb4b2afb866dc53ed57a5cba314af63ce288db83047aa0fed4d"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "bigdecimal",
+ "chrono",
+ "futures-util",
+ "log",
+ "ouroboros",
+ "pgvector",
+ "rust_decimal",
+ "sea-orm-macros",
+ "sea-query",
+ "sea-query-binder",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "strum",
+ "thiserror 2.0.16",
+ "time",
+ "tracing",
+ "url",
+ "uuid",
+]
+
+[[package]]
+name = "sea-orm-cli"
+version = "1.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6d4ff77d7c27f64942273513e7c103a1594c88deba33dfb2f490b362ea220b4"
+dependencies = [
+ "chrono",
+ "clap",
+ "dotenvy",
+ "glob",
+ "regex",
+ "tracing",
+ "tracing-subscriber",
+ "url",
+]
+
+[[package]]
+name = "sea-orm-macros"
+version = "1.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68de7a2258410fd5e6ba319a4fe6c4af7811507fc714bbd76534ae6caa60f95f"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "sea-bae",
+ "syn 2.0.106",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sea-orm-migration"
+version = "1.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4649155dbfd88f92e2aa9f5defe0b020e43d7c4d52a2189658d8813e26b61bd"
+dependencies = [
+ "async-trait",
+ "clap",
+ "dotenvy",
+ "sea-orm",
+ "sea-orm-cli",
+ "sea-schema",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "sea-query"
+version = "0.32.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a5d1c518eaf5eda38e5773f902b26ab6d5e9e9e2bb2349ca6c64cf96f80448c"
+dependencies = [
+ "bigdecimal",
+ "chrono",
+ "inherent",
+ "ordered-float",
+ "rust_decimal",
+ "sea-query-derive",
+ "serde_json",
+ "time",
+ "uuid",
+]
+
+[[package]]
+name = "sea-query-binder"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0019f47430f7995af63deda77e238c17323359af241233ec768aba1faea7608"
+dependencies = [
+ "bigdecimal",
+ "chrono",
+ "rust_decimal",
+ "sea-query",
+ "serde_json",
+ "sqlx",
+ "time",
+ "uuid",
+]
+
+[[package]]
+name = "sea-query-derive"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bae0cbad6ab996955664982739354128c58d16e126114fe88c2a493642502aab"
+dependencies = [
+ "darling",
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+ "thiserror 2.0.16",
+]
+
+[[package]]
+name = "sea-schema"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2239ff574c04858ca77485f112afea1a15e53135d3097d0c86509cef1def1338"
+dependencies = [
+ "futures",
+ "sea-query",
+ "sea-schema-derive",
+]
+
+[[package]]
+name = "sea-schema-derive"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "debdc8729c37fdbf88472f97fd470393089f997a909e535ff67c544d18cfccf0"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "seahash"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+
+[[package]]
+name = "serde"
+version = "1.0.225"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd6c24dee235d0da097043389623fb913daddf92c76e9f5a1db88607a0bcbd1d"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.225"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "659356f9a0cb1e529b24c01e43ad2bdf520ec4ceaf83047b83ddcc2251f96383"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.225"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea936adf78b1f766949a4977b91d2f5595825bd6ec079aa9543ad2685fc4516"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.145"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
+dependencies = [
+ "itoa",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.9.34+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+dependencies = [
+ "indexmap 2.11.3",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest",
+ "rand_core",
+]
+
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "socket2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "sqlx"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc"
+dependencies = [
+ "sqlx-core",
+ "sqlx-macros",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+]
+
+[[package]]
+name = "sqlx-core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6"
+dependencies = [
+ "base64 0.22.1",
+ "bigdecimal",
+ "bytes",
+ "chrono",
+ "crc",
+ "crossbeam-queue",
+ "either",
+ "event-listener",
+ "futures-core",
+ "futures-intrusive",
+ "futures-io",
+ "futures-util",
+ "hashbrown 0.15.5",
+ "hashlink 0.10.0",
+ "indexmap 2.11.3",
+ "log",
+ "memchr",
+ "once_cell",
+ "percent-encoding",
+ "rust_decimal",
+ "rustls",
+ "serde",
+ "serde_json",
+ "sha2",
+ "smallvec",
+ "thiserror 2.0.16",
+ "time",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "url",
+ "uuid",
+ "webpki-roots 0.26.11",
+]
+
+[[package]]
+name = "sqlx-macros"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sqlx-core",
+ "sqlx-macros-core",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "sqlx-macros-core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
+dependencies = [
+ "dotenvy",
+ "either",
+ "heck 0.5.0",
+ "hex",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "sha2",
+ "sqlx-core",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+ "syn 2.0.106",
+ "tokio",
+ "url",
+]
+
+[[package]]
+name = "sqlx-mysql"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
+dependencies = [
+ "atoi",
+ "base64 0.22.1",
+ "bigdecimal",
+ "bitflags",
+ "byteorder",
+ "bytes",
+ "chrono",
+ "crc",
+ "digest",
+ "dotenvy",
+ "either",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "generic-array",
+ "hex",
+ "hkdf",
+ "hmac",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "once_cell",
+ "percent-encoding",
+ "rand",
+ "rsa",
+ "rust_decimal",
+ "serde",
+ "sha1",
+ "sha2",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror 2.0.16",
+ "time",
+ "tracing",
+ "uuid",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-postgres"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
+dependencies = [
+ "atoi",
+ "base64 0.22.1",
+ "bigdecimal",
+ "bitflags",
+ "byteorder",
+ "chrono",
+ "crc",
+ "dotenvy",
+ "etcetera",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "hex",
+ "hkdf",
+ "hmac",
+ "home",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "num-bigint",
+ "once_cell",
+ "rand",
+ "rust_decimal",
+ "serde",
+ "serde_json",
+ "sha2",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror 2.0.16",
+ "time",
+ "tracing",
+ "uuid",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-sqlite"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
+dependencies = [
+ "atoi",
+ "chrono",
+ "flume",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-intrusive",
+ "futures-util",
+ "libsqlite3-sys",
+ "log",
+ "percent-encoding",
+ "serde",
+ "serde_urlencoded",
+ "sqlx-core",
+ "thiserror 2.0.16",
+ "time",
+ "tracing",
+ "url",
+ "uuid",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "stringprep"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+ "unicode-properties",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "strum"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tempfile"
+version = "3.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53"
+dependencies = [
+ "fastrand",
+ "getrandom 0.3.3",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
+dependencies = [
+ "thiserror-impl 2.0.16",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "time"
+version = "0.3.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+
+[[package]]
+name = "time-macros"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.47.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "io-uring",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "slab",
+ "socket2 0.6.0",
+ "tokio-macros",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "tokio-cron-scheduler"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4c2e3a88f827f597799cf70a6f673074e62f3fc5ba5993b2873345c618a29af"
+dependencies = [
+ "chrono",
+ "cron",
+ "num-derive",
+ "num-traits",
+ "tokio",
+ "tracing",
+ "uuid",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime 0.6.11",
+ "toml_edit 0.22.27",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a197c0ec7d131bfc6f7e82c8442ba1595aeab35da7adbf05b6b73cd06a16b6be"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+dependencies = [
+ "indexmap 2.11.3",
+ "serde",
+ "serde_spanned",
+ "toml_datetime 0.6.11",
+ "toml_write",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.23.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2ad0b7ae9cfeef5605163839cb9221f453399f15cfb5c10be9885fcf56611f9"
+dependencies = [
+ "indexmap 2.11.3",
+ "toml_datetime 0.7.1",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+dependencies = [
+ "winnow",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
+[[package]]
+name = "tonic"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum",
+ "base64 0.22.1",
+ "bytes",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-timeout",
+ "hyper-util",
+ "percent-encoding",
+ "pin-project",
+ "prost",
+ "socket2 0.5.10",
+ "tokio",
+ "tokio-stream",
+ "tower 0.4.13",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tonic-build"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11"
+dependencies = [
+ "prettyplease",
+ "proc-macro2",
+ "prost-build",
+ "prost-types",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "indexmap 1.9.3",
+ "pin-project",
+ "pin-project-lite",
+ "rand",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "http-range-header",
+ "httpdate",
+ "mime",
+ "mime_guess",
+ "percent-encoding",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex-automata",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "typenum"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+
+[[package]]
+name = "ucd-trie"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+
+[[package]]
+name = "unicase"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-properties"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+dependencies = [
+ "form_urlencoded",
+ "idna 1.1.0",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "uuid"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+dependencies = [
+ "getrandom 0.3.3",
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "validator"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e"
+dependencies = [
+ "idna 0.5.0",
+ "once_cell",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "url",
+ "validator_derive",
+]
+
+[[package]]
+name = "validator_derive"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0bcf92720c40105ac4b2dda2a4ea3aa717d4d6a862cc217da653a4bd5c6b10"
+dependencies = [
+ "darling",
+ "once_cell",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "valuable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasi"
+version = "0.14.7+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
+dependencies = [
+ "wasip2",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab10a69fbd0a177f5f649ad4d8d3305499c42bab9aef2f7ff592d0ec8f833819"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb702423545a6007bbc368fde243ba47ca275e549c8a28617f56f6ba53b1d1c"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc65f4f411d91494355917b605e1480033152658d71f722a90647f56a70c88a0"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffc003a991398a8ee604a401e194b6b3a39677b3173d6e74495eb51b82e99a32"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "293c37f4efa430ca14db3721dfbe48d8c33308096bd44d80ebaa775ab71ba1cf"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.26.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+dependencies = [
+ "webpki-roots 1.0.2",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "whoami"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d"
+dependencies = [
+ "libredox",
+ "wasite",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57fe7168f7de578d2d8a05b07fd61870d2e73b4020e9f49aa00da8471723497c"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link 0.2.0",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-link"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+
+[[package]]
+name = "windows-result"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f"
+dependencies = [
+ "windows-link 0.2.0",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda"
+dependencies = [
+ "windows-link 0.2.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.3",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+dependencies = [
+ "windows-link 0.1.3",
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "writeable"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "xray-admin"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "axum",
+ "chrono",
+ "clap",
+ "config",
+ "hyper",
+ "log",
+ "prost",
+ "rcgen",
+ "sea-orm",
+ "sea-orm-migration",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "tempfile",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-cron-scheduler",
+ "toml",
+ "tonic",
+ "tower 0.4.13",
+ "tower-http",
+ "tracing",
+ "tracing-subscriber",
+ "url",
+ "urlencoding",
+ "uuid",
+ "validator",
+ "xray-core",
+]
+
+[[package]]
+name = "xray-core"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa3d06322be1f519b4ac6a12f5cb5fcebcd9b3ea1122c31bb26b2aaa2a829a1"
+dependencies = [
+ "hyper-util",
+ "prost",
+ "prost-build",
+ "prost-types",
+ "tokio",
+ "tonic",
+ "tonic-build",
+ "tower 0.5.2",
+]
+
+[[package]]
+name = "yaml-rust2"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8"
+dependencies = [
+ "arraydeque",
+ "encoding_rs",
+ "hashlink 0.8.4",
+]
+
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
+[[package]]
+name = "yasna"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
+dependencies = [
+ "time",
+]
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..e048dd8
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,59 @@
+[package]
+name = "xray-admin"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+# Async runtime
+tokio = { version = "1.0", features = ["full"] }
+tokio-cron-scheduler = "0.10"
+
+# Serialization/deserialization
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+serde_yaml = "0.9"
+toml = "0.8"
+
+# Configuration
+config = "0.14"
+clap = { version = "4.0", features = ["derive", "env"] }
+
+# Logging
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+
+# Utilities
+anyhow = "1.0"
+thiserror = "1.0"
+
+# Validation
+validator = { version = "0.18", features = ["derive"] }
+
+# URL parsing
+url = "2.5"
+
+# Database and ORM
+sea-orm = { version = "1.0", features = ["sqlx-postgres", "runtime-tokio-rustls", "macros", "with-chrono", "with-uuid"] }
+sea-orm-migration = "1.0"
+
+# Additional utilities
+uuid = { version = "1.0", features = ["v4", "serde"] }
+chrono = { version = "0.4", features = ["serde"] }
+async-trait = "0.1"
+log = "0.4"
+urlencoding = "2.1"
+
+# Web server
+axum = { version = "0.7", features = ["macros", "json"] }
+tower = "0.4"
+tower-http = { version = "0.5", features = ["cors", "fs"] }
+hyper = { version = "1.0", features = ["full"] }
+
+# Xray integration
+xray-core = "0.2.1"  # gRPC client for Xray
+tonic = "0.12"       # gRPC client/server framework
+prost = "0.13"       # Protocol Buffers implementation
+rcgen = "0.12"       # For self-signed certificates
+
+[dev-dependencies]
+tempfile = "3.0"
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index b645813..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-FROM python:3-alpine
-
-# Build arguments
-ARG GIT_COMMIT="development"
-ARG GIT_COMMIT_SHORT="dev"
-ARG BUILD_DATE="unknown"
-ARG BRANCH_NAME="unknown"
-
-# Environment variables from build args
-ENV GIT_COMMIT=${GIT_COMMIT}
-ENV GIT_COMMIT_SHORT=${GIT_COMMIT_SHORT}
-ENV BUILD_DATE=${BUILD_DATE}
-ENV BRANCH_NAME=${BRANCH_NAME}
-
-WORKDIR /app
-
-# Install system dependencies first (this layer will be cached)
-RUN apk update && apk add git curl unzip
-
-# Copy and install Python dependencies (this layer will be cached when requirements.txt doesn't change)
-COPY ./requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-# Install Xray-core
-RUN XRAY_VERSION=$(curl -s https://api.github.com/repos/XTLS/Xray-core/releases/latest | sed -n 's/.*"tag_name": "\([^"]*\)".*/\1/p') && \
-    curl -L -o /tmp/xray.zip "https://github.com/XTLS/Xray-core/releases/download/${XRAY_VERSION}/Xray-linux-64.zip" && \
-    cd /tmp && unzip xray.zip && \
-    ls -la /tmp/ && \
-    find /tmp -name "xray" -type f && \
-    cp xray /usr/local/bin/xray && \
-    chmod +x /usr/local/bin/xray && \
-    rm -rf /tmp/xray.zip /tmp/xray
-
-# Copy the rest of the application code (this layer will change frequently)
-COPY . .
-
-# Run collectstatic
-RUN python manage.py collectstatic --noinput
-
-CMD [ "python", "./manage.py", "runserver", "0.0.0.0:8000" ]
diff --git a/LICENSE b/LICENSE
deleted file mode 100755
index ff9e935..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                   Version 2, December 2004
- 
-Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
-Everyone is permitted to copy and distribute verbatim or modified
-copies of this license document, and changing it is allowed as long
-as the name is changed.
- 
-           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/LLM_PROJECT_CONTEXT.md b/LLM_PROJECT_CONTEXT.md
new file mode 100644
index 0000000..097d1e2
--- /dev/null
+++ b/LLM_PROJECT_CONTEXT.md
@@ -0,0 +1,132 @@
+# LLM Project Context - Xray Admin Panel
+
+## Project Overview
+Rust-based administration panel for managing xray-core VPN proxy servers. Uses real gRPC integration with xray-core library for server communication.
+
+## Current Architecture
+
+### Core Technologies
+- **Language**: Rust (edition 2021)
+- **Web Framework**: Axum with tower-http
+- **Database**: PostgreSQL with Sea-ORM
+- **Xray Integration**: xray-core 0.2.1 library with real gRPC communication
+- **Frontend**: Vanilla HTML/CSS/JS with toast notifications
+
+### Module Structure
+```
+src/
+├── config/          # Configuration management (args, env, file)
+├── database/        # Sea-ORM entities, repositories, migrations
+├── services/        # Business logic (xray gRPC client, certificates)
+├── web/             # Axum handlers and routes
+└── main.rs          # Application entry point
+```
+
+## Key Features Implemented
+
+### 1. Database Entities
+- **Users**: Basic user management
+- **Servers**: Xray server definitions with gRPC endpoints
+- **Certificates**: TLS certificates with PEM storage (binary format)
+- **InboundTemplates**: Reusable inbound configurations
+- **ServerInbounds**: Template bindings to servers with ports/certificates
+
+### 2. Xray gRPC Integration
+**Location**: `src/services/xray/client.rs`
+- Real xray-core library integration (NOT mock/CLI)
+- Methods: `add_inbound_with_certificate()`, `remove_inbound()`, `get_stats()`
+- **CRITICAL**: TLS certificate configuration via streamSettings with proper protobuf messages
+- Supports VLESS, VMess, Trojan, Shadowsocks protocols
+
+### 3. Certificate Management
+**Location**: `src/database/entities/certificate.rs`
+- Self-signed certificate generation using rcgen
+- Binary storage (cert_data, key_data as Vec<u8>)
+- PEM conversion methods: `certificate_pem()`, `private_key_pem()`
+- Separate endpoints: `/certificates/{id}` (basic) and `/certificates/{id}/details` (with PEM)
+
+### 4. Template-Based Architecture
+Templates define reusable inbound configurations that can be bound to servers with:
+- Port overrides
+- Certificate assignments
+- Active/inactive states
+
+## Current Status & Issues
+
+### ✅ Working Features
+- Complete CRUD for all entities
+- Real xray gRPC communication with TLS certificate support
+- Toast notification system (absolute positioning)
+- Modal-based editing interface
+- Password masking in database URL logging
+- Certificate details display with PEM content
+
+### 🔧 Recent Fixes
+- **StreamConfig Integration**: Fixed TLS certificate configuration in xray gRPC calls
+- **Certificate Display**: Added `/certificates/{id}/details` endpoint for PEM viewing
+- **Active/Inactive Management**: Inbounds automatically added/removed from xray when toggled
+
+### ⚠️ Current Issue
+User reported certificate details still showing "Not available" - this was just fixed with the new `/certificates/{id}/details` endpoint.
+
+## API Structure
+
+### Endpoints
+```
+/api/users/*           # User management
+/api/servers/*         # Server management
+/api/servers/{id}/inbounds/*  # Server inbound management
+/api/certificates/*    # Certificate management (basic)
+/api/certificates/{id}/details  # Certificate details with PEM
+/api/templates/*       # Template management
+```
+
+## Configuration
+- **Default port**: 8080 (user tested on 8082)
+- **Database**: PostgreSQL with auto-migration
+- **Environment variables**: XRAY_ADMIN__* prefix
+- **Config file**: config.toml support
+
+## Testing Commands
+```bash
+# Run application
+cargo run -- --host 0.0.0.0 --port 8082
+
+# Test xray integration
+xray api lsi --server 100.91.97.36:10085
+
+# Check compilation
+cargo check
+```
+
+## Key Implementation Details
+
+### Xray TLS Configuration
+**Location**: `src/services/xray/client.rs:185-194`
+```rust
+let stream_config = StreamConfig {
+    protocol_name: "tcp".to_string(),
+    security_type: "tls".to_string(),
+    security_settings: vec![tls_message],
+    // ... other fields
+};
+```
+
+### Certificate Data Flow
+1. User creates certificate via web interface
+2. PEM data stored as binary in database (cert_data, key_data)
+3. When creating inbound, certificate fetched and converted back to PEM
+4. PEM passed to xray gRPC client for TLS configuration
+
+### Database Migrations
+Auto-migration enabled by default. All entities use UUID primary keys with timestamps.
+
+## Development Notes
+- **User prefers English in code/comments**
+- **No emoji usage unless explicitly requested**
+- **Prefer editing existing files over creating new ones**
+- **Real xray-core integration required** (user specifically asked not to abandon it)
+- **Application tested with actual xray server at 100.91.97.36:10085**
+
+## Last Working State
+All features implemented and compiling. StreamConfig properly configured for TLS certificate transmission to xray servers. Certificate viewing endpoint fixed for PEM display.
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100755
index fc225a3..0000000
--- a/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-<p align="center">
-  <h1 align="center">OutFleet: Master Your OutLine VPN</h1>
-
-  <p align="center">
-    Streamline OutLine VPN experience. OutFleet offers centralized key control for many servers, users and always-updated Dynamic Access Keys instead of ss:// links
-    <br/>
-    <br/>
-    <a href="https://github.com/house-of-vanity/outfleet/issues">Request Feature</a>
-  </p>
-</p>
-
-![Forks](https://img.shields.io/github/forks/house-of-vanity/outfleet?style=social) ![Stargazers](https://img.shields.io/github/stars/house-of-vanity/outfleet?style=social) ![License](https://img.shields.io/github/license/house-of-vanity/outfleet) 
-
-<img width="1282" height="840" alt="image" src="https://github.com/user-attachments/assets/3b66f928-853b-4af0-8968-1eacb2c16a1c" />
-
-## About The Project
-
-### Key Features
-
-* Centralized Key Management
-Administer user keys from one unified dashboard. Add, delete, and allocate users to specific servers effortlessly.
-
-* ![Dynamic Access Keys](https://www.reddit.com/r/outlinevpn/wiki/index/dynamic_access_keys/)
-Distribute ssconf:// links that are always up-to-date with your current server configurations. Eliminate the need for manual link updates.
-
-### Why OutFleet?
-Tired of juggling multiple home servers and the headache of individually managing users on each? OutFleet was born out of the frustration of not finding a suitable tool for efficiently managing a bunch of home servers. 
-
-## Built With
-
-Django, Postgres SQL and hassle-free deployment using Kubernetes or docker-compose
-
-### Installation
-
-#### Docker compose
-Docker deploy is easy:
-```
-docker-compose up -d
-```
-#### Kubernetes
-I use ArgoCD for deployment. [Take a look](https://gt.hexor.cy/ab/homelab/src/branch/main/k8s/apps/vpn) to `outfleet.yaml` file for manifests.
-
-
-#### Setup sslocal service on Windows
-Shadowsocks servers can be used directly with **sslocal**. For automatic and regular password updates, you can create a Task Scheduler job to rotate the passwords when they change, as OutFleet manages the passwords automatically.
-You may run script in Admin PowerShell to create Task for autorun **sslocal** and update connection details automatically using Outfleet API
-```PowerShell
-Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass -Force; Invoke-Expression (Invoke-WebRequest -Uri "https://raw.githubusercontent.com/house-of-vanity/OutFleet/refs/heads/master/tools/windows-helper.ps1" -UseBasicParsing).Content
-```
-[Firefox PluginProxy Switcher and Manager](https://addons.mozilla.org/en-US/firefox/addon/proxy-switcher-and-manager/) && [Chrome plugin Proxy Switcher and Manager](https://chromewebstore.google.com/detail/proxy-switcher-and-manage/onnfghpihccifgojkpnnncpagjcdbjod)
-
-Keep in mind that all user keys are stored in a single **config.yaml** file. If this file is lost, user keys will remain on the servers, but OutFleet will lose the ability to manage them. Handle with extreme caution and use backups.
-
-## Authors
-
-* **UltraDesu** - *Humble amateur developer* - [UltraDesu](https://github.com/house-of-vanity) - *Author*
-* **Contributors**
-* * @Sanapach
diff --git a/SECURITY.md b/SECURITY.md
deleted file mode 100644
index 034e848..0000000
--- a/SECURITY.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 5.1.x   | :white_check_mark: |
-| 5.0.x   | :x:                |
-| 4.0.x   | :white_check_mark: |
-| < 4.0   | :x:                |
-
-## Reporting a Vulnerability
-
-Use this section to tell people how to report a vulnerability.
-
-Tell them where to go, how often they can expect to get an update on a
-reported vulnerability, what to expect if the vulnerability is accepted or
-declined, etc.
diff --git a/buildx.yaml b/buildx.yaml
deleted file mode 100755
index 7e576e6..0000000
--- a/buildx.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-platforms:
-  - name: amd64
-    architecture: amd64
-  - name: arm64
-    architecture: arm64
diff --git a/cleanup_analysis.sql b/cleanup_analysis.sql
deleted file mode 100644
index b4f444a..0000000
--- a/cleanup_analysis.sql
+++ /dev/null
@@ -1,15 +0,0 @@
--- Проверить количество записей без acl_link_id
-SELECT COUNT(*) as total_without_link 
-FROM vpn_accesslog 
-WHERE acl_link_id IS NULL OR acl_link_id = '';
-
--- Проверить общее количество записей
-SELECT COUNT(*) as total_records FROM vpn_accesslog;
-
--- Показать распределение по датам (последние записи без ссылок)
-SELECT DATE(timestamp) as date, COUNT(*) as count 
-FROM vpn_accesslog 
-WHERE acl_link_id IS NULL OR acl_link_id = ''
-GROUP BY DATE(timestamp) 
-ORDER BY date DESC 
-LIMIT 10;
diff --git a/cleanup_options.sql b/cleanup_options.sql
deleted file mode 100644
index adae61a..0000000
--- a/cleanup_options.sql
+++ /dev/null
@@ -1,35 +0,0 @@
--- ВАРИАНТ 1: Удалить ВСЕ записи без acl_link_id
--- ОСТОРОЖНО! Это удалит все старые логи
-DELETE FROM vpn_accesslog 
-WHERE acl_link_id IS NULL OR acl_link_id = '';
-
--- ВАРИАНТ 2: Удалить записи без acl_link_id старше 30 дней
--- Более безопасный вариант
-DELETE FROM vpn_accesslog 
-WHERE (acl_link_id IS NULL OR acl_link_id = '') 
-  AND timestamp < NOW() - INTERVAL 30 DAY;
-
--- ВАРИАНТ 3: Удалить записи без acl_link_id старше 7 дней
--- Еще более консервативный подход
-DELETE FROM vpn_accesslog 
-WHERE (acl_link_id IS NULL OR acl_link_id = '') 
-  AND timestamp < NOW() - INTERVAL 7 DAY;
-
--- ВАРИАНТ 4: Оставить только последние 1000 записей без ссылок (для истории)
-DELETE FROM vpn_accesslog 
-WHERE (acl_link_id IS NULL OR acl_link_id = '') 
-  AND id NOT IN (
-    SELECT id FROM (
-      SELECT id FROM vpn_accesslog 
-      WHERE acl_link_id IS NULL OR acl_link_id = ''
-      ORDER BY timestamp DESC 
-      LIMIT 1000
-    ) AS recent_logs
-  );
-
--- ВАРИАНТ 5: Поэтапное удаление (для больших БД)
--- Удаляем по 10000 записей за раз
-DELETE FROM vpn_accesslog 
-WHERE (acl_link_id IS NULL OR acl_link_id = '') 
-  AND timestamp < NOW() - INTERVAL 30 DAY
-LIMIT 10000;
diff --git a/docker-compose.yaml b/docker-compose.yaml
deleted file mode 100644
index 30f4d3d..0000000
--- a/docker-compose.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-services:
-  web_ui:
-    image: outfleet:local
-    container_name: outfleet-web
-    build:
-      context: .
-    ports:
-      - "8000:8000"
-    environment:
-      - POSTGRES_HOST=postgres
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-      - EXTERNAL_ADDRESS=http://127.0.0.1:8000
-      - CELERY_BROKER_URL=redis://redis:6379/0
-    depends_on:
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-    volumes:
-      - .:/app
-    working_dir: /app
-    command: >
-      sh -c "sleep 1 &&
-             python manage.py makemigrations &&
-             python manage.py migrate &&
-             python manage.py create_admin &&
-             python manage.py runserver 0.0.0.0:8000"
-
-  worker:
-    image: outfleet:local
-    container_name: outfleet-worker
-    build:
-      context: .
-    environment:
-      - POSTGRES_HOST=postgres
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-      - CELERY_BROKER_URL=redis://redis:6379/0
-    depends_on:
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-    volumes:
-      - .:/app
-    working_dir: /app
-    command: >
-      sh -c "sleep 3 && celery -A mysite worker"
-
-  beat:
-    image: outfleet:local
-    container_name: outfleet-beat
-    build:
-      context: .
-    environment:
-      - POSTGRES_HOST=postgres
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-      - CELERY_BROKER_URL=redis://redis:6379/0
-    depends_on:
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-    volumes:
-      - .:/app
-    working_dir: /app
-    command: >
-      sh -c "sleep 3 && celery -A mysite beat"
-
-  postgres:
-    image: postgres:15
-    container_name: postgres
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: outfleet
-    ports:
-      - "5432:5432"
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-
-  redis:
-    image: redis:7
-    container_name: redis
-    ports:
-      - "6379:6379"
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-
-volumes:
-  postgres_data:
-
diff --git a/manage.py b/manage.py
deleted file mode 100755
index a7da667..0000000
--- a/manage.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-"""Django's command-line utility for administrative tasks."""
-import os
-import sys
-
-
-def main():
-    """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite.settings')
-    try:
-        from django.core.management import execute_from_command_line
-    except ImportError as exc:
-        raise ImportError(
-            "Couldn't import Django. Are you sure it's installed and "
-            "available on your PYTHONPATH environment variable? Did you "
-            "forget to activate a virtual environment?"
-        ) from exc
-    execute_from_command_line(sys.argv)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/mysite/__init__.py b/mysite/__init__.py
deleted file mode 100644
index 9e0d95f..0000000
--- a/mysite/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from .celery import app as celery_app
-
-__all__ = ('celery_app',)
\ No newline at end of file
diff --git a/mysite/asgi.py b/mysite/asgi.py
deleted file mode 100644
index 44c7dff..0000000
--- a/mysite/asgi.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-ASGI config for mysite project.
-
-It exposes the ASGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/5.1/howto/deployment/asgi/
-"""
-
-import os
-
-from django.core.asgi import get_asgi_application
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite.settings')
-
-application = get_asgi_application()
diff --git a/mysite/celery.py b/mysite/celery.py
deleted file mode 100644
index 0c7530d..0000000
--- a/mysite/celery.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import logging
-import os
-
-from celery import Celery
-from celery import shared_task
-from celery.schedules import crontab
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite.settings')
-logger = logging.getLogger(__name__)
-app = Celery('mysite')
-
-app.conf.beat_schedule = {
-    'periodical_servers_sync': {
-        'task': 'sync_all_servers',
-        'schedule': crontab(minute=0, hour='*/3'),  # Every 3 hours
-    },
-    'cleanup_old_task_logs': {
-        'task': 'cleanup_task_logs',
-        'schedule': crontab(hour=2, minute=0),  # Daily at 2 AM
-    },
-}
-
-
-app.config_from_object('django.conf:settings', namespace='CELERY')
-
-# Additional celery settings for better logging and performance
-app.conf.update(
-    # Keep detailed results for debugging
-    result_expires=3600,  # 1 hour
-    task_always_eager=False,
-    task_eager_propagates=True,
-    # Improve task tracking
-    task_track_started=True,
-    task_send_sent_event=True,
-    # Clean up settings
-    result_backend_cleanup_interval=300,  # Clean up every 5 minutes
-)
-
-app.autodiscover_tasks()
-
diff --git a/mysite/context_processors.py b/mysite/context_processors.py
deleted file mode 100644
index e570b0e..0000000
--- a/mysite/context_processors.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from django.conf import settings
-import subprocess
-from pathlib import Path
-
-def version_info(request):
-    """Add version information to template context"""
-    
-    git_commit = getattr(settings, 'GIT_COMMIT', None)
-    git_commit_short = getattr(settings, 'GIT_COMMIT_SHORT', None)
-    build_date = getattr(settings, 'BUILD_DATE', None)
-    
-    if not git_commit or git_commit == 'development':
-        try:
-            base_dir = getattr(settings, 'BASE_DIR', Path(__file__).resolve().parent.parent)
-            result = subprocess.run(['git', 'rev-parse', 'HEAD'], 
-                                  capture_output=True, text=True, cwd=base_dir, timeout=5)
-            if result.returncode == 0:
-                git_commit = result.stdout.strip()
-                git_commit_short = git_commit[:7]
-                
-                date_result = subprocess.run(['git', 'log', '-1', '--format=%ci'], 
-                                           capture_output=True, text=True, cwd=base_dir, timeout=5)
-                if date_result.returncode == 0:
-                    build_date = date_result.stdout.strip()
-        except (subprocess.TimeoutExpired, subprocess.SubprocessError, FileNotFoundError):
-            pass
-    
-    if not git_commit:
-        git_commit = 'development'
-    if not git_commit_short:
-        git_commit_short = 'dev'
-    if not build_date:
-        build_date = 'unknown'
-    
-    return {
-        'VERSION_INFO': {
-            'git_commit': git_commit,
-            'git_commit_short': git_commit_short,
-            'build_date': build_date,
-            'is_development': git_commit_short == 'dev'
-        }
-    }
diff --git a/mysite/middleware.py b/mysite/middleware.py
deleted file mode 100644
index eb765a5..0000000
--- a/mysite/middleware.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from django.contrib.auth import authenticate, login
-from django.utils.deprecation import MiddlewareMixin
-
-class RequestLogger:
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, request):
-        print(f"Original: {request.build_absolute_uri()}")
-        print(f"Path : {request.path}")
-        
-        response = self.get_response(request)
-
-        return response
-
-
-class AutoLoginMiddleware(MiddlewareMixin):
-    def process_request(self, request):
-        if not request.user.is_authenticated:
-            user = authenticate(username='admin', password='admin')
-            if user:
-                login(request, user)
diff --git a/mysite/settings.py b/mysite/settings.py
deleted file mode 100644
index 4d6211e..0000000
--- a/mysite/settings.py
+++ /dev/null
@@ -1,233 +0,0 @@
-from pathlib import Path
-import os
-import environ
-from django.core.management.utils import get_random_secret_key
-
-
-ENV = environ.Env(
-    DEBUG=(bool, False)
-)
-
-environ.Env.read_env()
-
-BASE_DIR = Path(__file__).resolve().parent.parent
-SECRET_KEY=ENV('SECRET_KEY', default='django-insecure-change-me-in-production')
-TIME_ZONE = ENV('TIMEZONE', default='Asia/Nicosia')
-EXTERNAL_ADDRESS = ENV('EXTERNAL_ADDRESS', default='https://example.org')
-
-CELERY_BROKER_URL = ENV('CELERY_BROKER_URL', default='redis://localhost:6379/0')
-CELERY_RESULT_BACKEND = 'django-db'
-CELERY_TIMEZONE = ENV('TIMEZONE', default='Asia/Nicosia')
-CELERY_ACCEPT_CONTENT = ['json']
-CELERY_TASK_SERIALIZER = 'json'
-CELERY_RESULT_SERIALIZER = 'json'
-CELERY_RESULT_EXTENDED = True
-
-# Celery Beat Schedule
-from celery.schedules import crontab
-CELERY_BEAT_SCHEDULE = {
-    'update-user-statistics': {
-        'task': 'update_user_statistics',
-        'schedule': crontab(minute='*/5'),  # Every 5 minutes
-    },
-    'cleanup-task-logs': {
-        'task': 'cleanup_task_logs',
-        'schedule': crontab(hour=2, minute=0),  # Daily at 2 AM
-    },
-}
-
-AUTH_USER_MODEL = "vpn.User"
-
-DEBUG = ENV('DEBUG')
-
-ALLOWED_HOSTS = ENV.list('ALLOWED_HOSTS', default=["*"])
-
-CORS_ALLOW_ALL_ORIGINS = True
-CORS_ALLOW_CREDENTIALS = True
-CSRF_TRUSTED_ORIGINS = ENV.list('CSRF_TRUSTED_ORIGINS', default=[])
-
-STATIC_ROOT = BASE_DIR / "staticfiles"
-
-LOGIN_REDIRECT_URL = '/'
-
-EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'formatters': {
-        'verbose': {
-            'format': '[{asctime}] {levelname} {name} {message}',
-            'style': '{',
-        },
-        'simple': {
-            'format': '{levelname} {message}',
-            'style': '{',
-        },
-    },
-    'handlers': {
-        'console': {
-            'level': 'DEBUG',
-            'class': 'logging.StreamHandler',
-            'formatter': 'verbose',
-        },
-        'file': {
-            'level': 'DEBUG',
-            'class': 'logging.FileHandler',
-            'filename': os.path.join(BASE_DIR, 'debug.log'),
-            'formatter': 'verbose',
-        },
-    },
-    'loggers': {
-        'django': {
-            'handlers': ['console'],
-            'level': 'INFO',
-            'propagate': True,
-        },
-        'vpn': {
-            'handlers': ['console'],
-            'level': 'DEBUG',
-            'propagate': False,
-        },
-        'telegram_bot': {
-            'handlers': ['console'],
-            'level': 'DEBUG',
-            'propagate': False,
-        },
-        'requests': {
-            'handlers': ['console'],
-            'level': 'INFO',
-            'propagate': False,
-        },
-        'urllib3': {
-            'handlers': ['console'],
-            'level': 'INFO',
-            'propagate': False,
-        },
-    },
-}
-
-INSTALLED_APPS = [
-    'jazzmin',
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'polymorphic',
-    'corsheaders',
-    'django_celery_results',
-    'django_celery_beat',
-    'vpn',
-    'telegram_bot',
-]
-
-MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'whitenoise.middleware.WhiteNoiseMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'mysite.middleware.AutoLoginMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'corsheaders.middleware.CorsMiddleware',
-
-]
-
-ROOT_URLCONF = 'mysite.urls'
-
-GIT_COMMIT = ENV('GIT_COMMIT', default='development')
-GIT_COMMIT_SHORT = ENV('GIT_COMMIT_SHORT', default='dev')
-BUILD_DATE = ENV('BUILD_DATE', default='unknown')
-
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [
-            os.path.join(BASE_DIR, 'templates'),
-            os.path.join(BASE_DIR, 'vpn', 'templates')
-        ],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-                'mysite.context_processors.version_info',
-            ],
-        },
-    },
-]
-
-
-WSGI_APPLICATION = 'mysite.wsgi.application'
-
-
-# Database
-# https://docs.djangoproject.com/en/5.1/ref/settings/#databases
-
-# CREATE USER outfleet WITH PASSWORD 'password';
-# GRANT ALL PRIVILEGES ON DATABASE outfleet TO outfleet;
-# ALTER DATABASE outfleet OWNER TO outfleet;
-
-DATABASES = {
-    'sqlite': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
-    },
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': ENV('POSTGRES_DB', default="outfleet"),
-        'USER': ENV('POSTGRES_USER', default="outfleet"),
-        'PASSWORD': ENV('POSTGRES_PASSWORD', default="outfleet"),
-        'HOST': ENV('POSTGRES_HOST', default='localhost'),
-        'PORT': ENV('POSTGRES_PORT', default='5432'),
-    }
-}
-
-# Password validation
-# https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
-]
-
-
-# Internationalization
-# https://docs.djangoproject.com/en/5.1/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-
-
-
-USE_I18N = True
-
-USE_TZ = True
-
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/5.1/howto/static-files/
-
-STATIC_URL = '/static/'
-STATICFILES_DIRS = [
-    BASE_DIR / 'static',
-]
-# Default primary key field type
-# https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field
-
-DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
diff --git a/mysite/urls.py b/mysite/urls.py
deleted file mode 100644
index b6f6c0a..0000000
--- a/mysite/urls.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-URL configuration for mysite project.
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/5.1/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  path('', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
-Including another URLconf
-    1. Import the include() function: from django.urls import include, path
-    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
-"""
-from django.contrib import admin
-from django.urls import path, include
-from django.views.generic import RedirectView
-from vpn.views import shadowsocks, userFrontend, userPortal, xray_subscription
-
-urlpatterns = [
-    path('admin/', admin.site.urls),
-    path('ss/<path:link>', shadowsocks, name='shadowsocks'),
-    path('dynamic/<path:link>', shadowsocks, name='shadowsocks'),
-    path('xray/<str:user_hash>', xray_subscription, name='xray_subscription'),
-    path('stat/<path:user_hash>', userFrontend, name='userFrontend'),
-    path('u/<path:user_hash>', userPortal, name='userPortal'),
-    path('', RedirectView.as_view(url='/admin/', permanent=False)),
-]
diff --git a/mysite/wsgi.py b/mysite/wsgi.py
deleted file mode 100644
index 61b0d9d..0000000
--- a/mysite/wsgi.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-WSGI config for mysite project.
-
-It exposes the WSGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/5.1/howto/deployment/wsgi/
-"""
-
-import os
-
-from django.core.wsgi import get_wsgi_application
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite.settings')
-
-application = get_wsgi_application()
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 5d87110..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-django-environ==0.12.0
-Django==5.1.7
-celery==5.4.0
-django-jazzmin==3.0.1
-django-polymorphic==3.1.0
-django-cors-headers==4.5.0
-django-celery-results==2.5.1
-git+https://github.com/celery/django-celery-beat#egg=django-celery-beat
-requests==2.32.3
-PyYaml==6.0.2
-Markdown==3.7
-outline-vpn-api==6.3.0
-Redis==5.2.1
-whitenoise==6.9.0
-psycopg2-binary==2.9.10
-setuptools==75.2.0
-shortuuid==1.0.13
-cryptography==45.0.5
-acme>=2.0.0
-cloudflare>=4.3.1
-josepy>=2.0.0
-python-telegram-bot==21.10
diff --git a/src/config/args.rs b/src/config/args.rs
new file mode 100644
index 0000000..9f8e31b
--- /dev/null
+++ b/src/config/args.rs
@@ -0,0 +1,60 @@
+use clap::Parser;
+use std::path::PathBuf;
+
+#[derive(Parser, Debug)]
+#[command(name = "xray-admin")]
+#[command(about = "A web admin panel for managing xray-core VPN proxy servers")]
+#[command(version)]
+pub struct Args {
+    /// Configuration file path
+    #[arg(short, long, value_name = "FILE")]
+    pub config: Option<PathBuf>,
+
+    /// Database connection URL
+    #[arg(long, env = "DATABASE_URL")]
+    pub database_url: Option<String>,
+
+    /// Web server host address
+    #[arg(long, default_value = "127.0.0.1")]
+    pub host: Option<String>,
+
+    /// Web server port
+    #[arg(short, long)]
+    pub port: Option<u16>,
+
+    /// Log level (trace, debug, info, warn, error)
+    #[arg(long, default_value = "info")]
+    pub log_level: Option<String>,
+
+
+    /// Validate configuration and exit
+    #[arg(long)]
+    pub validate_config: bool,
+
+    /// Print default configuration and exit
+    #[arg(long)]
+    pub print_default_config: bool,
+}
+
+pub fn parse_args() -> Args {
+    Args::parse()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_args_parsing() {
+        let args = Args::try_parse_from(&[
+            "xray-admin",
+            "--config", "test.toml",
+            "--port", "9090",
+            "--log-level", "debug"
+        ]).unwrap();
+
+        assert_eq!(args.config, Some(PathBuf::from("test.toml")));
+        assert_eq!(args.port, Some(9090));
+        assert_eq!(args.log_level, Some("debug".to_string()));
+    }
+}
\ No newline at end of file
diff --git a/src/config/env.rs b/src/config/env.rs
new file mode 100644
index 0000000..058d2df
--- /dev/null
+++ b/src/config/env.rs
@@ -0,0 +1,104 @@
+use std::env;
+
+/// Environment variable utilities
+pub struct EnvVars;
+
+impl EnvVars {
+    /// Get environment variable with fallback
+    #[allow(dead_code)]
+    pub fn get_or_default(key: &str, default: &str) -> String {
+        env::var(key).unwrap_or_else(|_| default.to_string())
+    }
+
+    /// Get required environment variable
+    #[allow(dead_code)]
+    pub fn get_required(key: &str) -> Result<String, env::VarError> {
+        env::var(key)
+    }
+
+    /// Check if running in development mode
+    #[allow(dead_code)]
+    pub fn is_development() -> bool {
+        matches!(
+            env::var("RUST_ENV").as_deref(),
+            Ok("development") | Ok("dev")
+        ) || matches!(
+            env::var("ENVIRONMENT").as_deref(),
+            Ok("development") | Ok("dev")
+        )
+    }
+
+    /// Check if running in production mode
+    #[allow(dead_code)]
+    pub fn is_production() -> bool {
+        matches!(
+            env::var("RUST_ENV").as_deref(),
+            Ok("production") | Ok("prod")
+        ) || matches!(
+            env::var("ENVIRONMENT").as_deref(),
+            Ok("production") | Ok("prod")
+        )
+    }
+
+    /// Get database URL from environment
+    #[allow(dead_code)]
+    pub fn database_url() -> Option<String> {
+        env::var("DATABASE_URL").ok()
+            .or_else(|| env::var("XRAY_ADMIN__DATABASE__URL").ok())
+    }
+
+    /// Get telegram bot token from environment
+    #[allow(dead_code)]
+    pub fn telegram_token() -> Option<String> {
+        env::var("TELEGRAM_BOT_TOKEN").ok()
+            .or_else(|| env::var("XRAY_ADMIN__TELEGRAM__BOT_TOKEN").ok())
+    }
+
+    /// Get JWT secret from environment
+    #[allow(dead_code)]
+    pub fn jwt_secret() -> Option<String> {
+        env::var("JWT_SECRET").ok()
+            .or_else(|| env::var("XRAY_ADMIN__WEB__JWT_SECRET").ok())
+    }
+
+    /// Print environment info for debugging
+    pub fn print_env_info() {
+        tracing::debug!("Environment information:");
+        tracing::debug!("  RUST_ENV: {:?}", env::var("RUST_ENV"));
+        tracing::debug!("  ENVIRONMENT: {:?}", env::var("ENVIRONMENT"));
+        tracing::debug!("  DATABASE_URL: {}", 
+            if env::var("DATABASE_URL").is_ok() { "set" } else { "not set" }
+        );
+        tracing::debug!("  TELEGRAM_BOT_TOKEN: {}", 
+            if env::var("TELEGRAM_BOT_TOKEN").is_ok() { "set" } else { "not set" }
+        );
+        tracing::debug!("  JWT_SECRET: {}", 
+            if env::var("JWT_SECRET").is_ok() { "set" } else { "not set" }
+        );
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::env;
+
+    #[test]
+    fn test_get_or_default() {
+        let result = EnvVars::get_or_default("NON_EXISTENT_VAR", "default_value");
+        assert_eq!(result, "default_value");
+    }
+
+    #[test]
+    fn test_environment_detection() {
+        env::set_var("RUST_ENV", "development");
+        assert!(EnvVars::is_development());
+        assert!(!EnvVars::is_production());
+
+        env::set_var("RUST_ENV", "production");
+        assert!(!EnvVars::is_development());
+        assert!(EnvVars::is_production());
+
+        env::remove_var("RUST_ENV");
+    }
+}
\ No newline at end of file
diff --git a/src/config/file.rs b/src/config/file.rs
new file mode 100644
index 0000000..3192e79
--- /dev/null
+++ b/src/config/file.rs
@@ -0,0 +1,165 @@
+use anyhow::{Context, Result};
+use std::fs;
+use std::path::Path;
+
+use super::AppConfig;
+
+/// Configuration file utilities
+#[allow(dead_code)]
+pub struct ConfigFile;
+
+#[allow(dead_code)]
+impl ConfigFile {
+    /// Load configuration from TOML file
+    pub fn load_toml<P: AsRef<Path>>(path: P) -> Result<AppConfig> {
+        let content = fs::read_to_string(&path)
+            .with_context(|| format!("Failed to read config file: {}", path.as_ref().display()))?;
+        
+        let config: AppConfig = toml::from_str(&content)
+            .with_context(|| format!("Failed to parse TOML config file: {}", path.as_ref().display()))?;
+        
+        Ok(config)
+    }
+
+    /// Load configuration from YAML file
+    pub fn load_yaml<P: AsRef<Path>>(path: P) -> Result<AppConfig> {
+        let content = fs::read_to_string(&path)
+            .with_context(|| format!("Failed to read config file: {}", path.as_ref().display()))?;
+        
+        let config: AppConfig = serde_yaml::from_str(&content)
+            .with_context(|| format!("Failed to parse YAML config file: {}", path.as_ref().display()))?;
+        
+        Ok(config)
+    }
+
+    /// Load configuration from JSON file
+    pub fn load_json<P: AsRef<Path>>(path: P) -> Result<AppConfig> {
+        let content = fs::read_to_string(&path)
+            .with_context(|| format!("Failed to read config file: {}", path.as_ref().display()))?;
+        
+        let config: AppConfig = serde_json::from_str(&content)
+            .with_context(|| format!("Failed to parse JSON config file: {}", path.as_ref().display()))?;
+        
+        Ok(config)
+    }
+
+    /// Auto-detect format and load configuration file
+    pub fn load_auto<P: AsRef<Path>>(path: P) -> Result<AppConfig> {
+        let path = path.as_ref();
+        
+        match path.extension().and_then(|ext| ext.to_str()) {
+            Some("toml") => Self::load_toml(path),
+            Some("yaml") | Some("yml") => Self::load_yaml(path),
+            Some("json") => Self::load_json(path),
+            _ => {
+                // Try TOML first, then YAML, then JSON
+                Self::load_toml(path)
+                    .or_else(|_| Self::load_yaml(path))
+                    .or_else(|_| Self::load_json(path))
+                    .with_context(|| {
+                        format!(
+                            "Failed to load config file '{}' - tried TOML, YAML, and JSON formats",
+                            path.display()
+                        )
+                    })
+            }
+        }
+    }
+
+    /// Save configuration to TOML file
+    pub fn save_toml<P: AsRef<Path>>(config: &AppConfig, path: P) -> Result<()> {
+        let content = toml::to_string_pretty(config)
+            .context("Failed to serialize config to TOML")?;
+        
+        fs::write(&path, content)
+            .with_context(|| format!("Failed to write config file: {}", path.as_ref().display()))?;
+        
+        Ok(())
+    }
+
+    /// Save configuration to YAML file
+    pub fn save_yaml<P: AsRef<Path>>(config: &AppConfig, path: P) -> Result<()> {
+        let content = serde_yaml::to_string(config)
+            .context("Failed to serialize config to YAML")?;
+        
+        fs::write(&path, content)
+            .with_context(|| format!("Failed to write config file: {}", path.as_ref().display()))?;
+        
+        Ok(())
+    }
+
+    /// Save configuration to JSON file
+    pub fn save_json<P: AsRef<Path>>(config: &AppConfig, path: P) -> Result<()> {
+        let content = serde_json::to_string_pretty(config)
+            .context("Failed to serialize config to JSON")?;
+        
+        fs::write(&path, content)
+            .with_context(|| format!("Failed to write config file: {}", path.as_ref().display()))?;
+        
+        Ok(())
+    }
+
+    /// Check if config file exists and is readable
+    pub fn exists_and_readable<P: AsRef<Path>>(path: P) -> bool {
+        let path = path.as_ref();
+        path.exists() && path.is_file() && fs::metadata(path).map(|m| !m.permissions().readonly()).unwrap_or(false)
+    }
+
+    /// Find default config file in common locations
+    pub fn find_default() -> Option<std::path::PathBuf> {
+        let candidates = [
+            "config.toml",
+            "config.yaml",
+            "config.yml",
+            "config.json",
+            "xray-admin.toml",
+            "xray-admin.yaml",
+            "xray-admin.yml",
+            "/etc/xray-admin/config.toml",
+            "/etc/xray-admin/config.yaml",
+            "~/.config/xray-admin/config.toml",
+        ];
+
+        for candidate in &candidates {
+            let path = std::path::Path::new(candidate);
+            if Self::exists_and_readable(path) {
+                return Some(path.to_path_buf());
+            }
+        }
+
+        None
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tempfile::NamedTempFile;
+
+    #[test]
+    fn test_save_and_load_toml() -> Result<()> {
+        let config = AppConfig::default();
+        let temp_file = NamedTempFile::new()?;
+        
+        ConfigFile::save_toml(&config, temp_file.path())?;
+        let loaded_config = ConfigFile::load_toml(temp_file.path())?;
+        
+        assert_eq!(config.web.port, loaded_config.web.port);
+        assert_eq!(config.database.max_connections, loaded_config.database.max_connections);
+        
+        Ok(())
+    }
+
+    #[test]
+    fn test_auto_detect_format() -> Result<()> {
+        let config = AppConfig::default();
+        
+        // Test with .toml extension
+        let temp_file = NamedTempFile::with_suffix(".toml")?;
+        ConfigFile::save_toml(&config, temp_file.path())?;
+        let loaded_config = ConfigFile::load_auto(temp_file.path())?;
+        assert_eq!(config.web.port, loaded_config.web.port);
+        
+        Ok(())
+    }
+}
\ No newline at end of file
diff --git a/src/config/mod.rs b/src/config/mod.rs
new file mode 100644
index 0000000..7e3d8a0
--- /dev/null
+++ b/src/config/mod.rs
@@ -0,0 +1,244 @@
+use anyhow::Result;
+use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
+use validator::Validate;
+
+pub mod args;
+pub mod env;
+pub mod file;
+
+#[derive(Debug, Clone, Serialize, Deserialize, Validate)]
+pub struct AppConfig {
+    pub database: DatabaseConfig,
+    pub web: WebConfig,
+    pub telegram: TelegramConfig,
+    pub xray: XrayConfig,
+    pub logging: LoggingConfig,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Validate)]
+pub struct DatabaseConfig {
+    #[validate(url)]
+    pub url: String,
+    #[validate(range(min = 1, max = 100))]
+    pub max_connections: u32,
+    #[validate(range(min = 1))]
+    pub connection_timeout: u64,
+    pub auto_migrate: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Validate)]
+pub struct WebConfig {
+    #[validate(ip)]
+    pub host: String,
+    #[validate(range(min = 1024, max = 65535))]
+    pub port: u16,
+    pub cors_origins: Vec<String>,
+    pub jwt_secret: String,
+    #[validate(range(min = 3600))]
+    pub jwt_expiry: u64,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Validate)]
+pub struct TelegramConfig {
+    pub bot_token: String,
+    pub webhook_url: Option<String>,
+    pub admin_chat_ids: Vec<i64>,
+    pub allowed_users: Vec<i64>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Validate)]
+pub struct XrayConfig {
+    pub default_api_port: u16,
+    pub config_template_path: PathBuf,
+    pub certificates_path: PathBuf,
+    #[validate(range(min = 1))]
+    pub health_check_interval: u64,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct LoggingConfig {
+    pub level: String,
+    pub file_path: Option<PathBuf>,
+    pub json_format: bool,
+    pub max_file_size: Option<u64>,
+    pub max_files: Option<u32>,
+}
+
+impl Default for DatabaseConfig {
+    fn default() -> Self {
+        Self {
+            url: "postgresql://xray:password@localhost/xray_admin".to_string(),
+            max_connections: 10,
+            connection_timeout: 30,
+            auto_migrate: true,
+        }
+    }
+}
+
+impl Default for WebConfig {
+    fn default() -> Self {
+        Self {
+            host: "127.0.0.1".to_string(),
+            port: 8080,
+            cors_origins: vec!["http://localhost:3000".to_string()],
+            jwt_secret: "your-secret-key-change-in-production".to_string(),
+            jwt_expiry: 86400, // 24 hours
+        }
+    }
+}
+
+impl Default for TelegramConfig {
+    fn default() -> Self {
+        Self {
+            bot_token: "".to_string(),
+            webhook_url: None,
+            admin_chat_ids: vec![],
+            allowed_users: vec![],
+        }
+    }
+}
+
+impl Default for XrayConfig {
+    fn default() -> Self {
+        Self {
+            default_api_port: 62789,
+            config_template_path: PathBuf::from("./templates"),
+            certificates_path: PathBuf::from("./certs"),
+            health_check_interval: 30,
+        }
+    }
+}
+
+impl Default for LoggingConfig {
+    fn default() -> Self {
+        Self {
+            level: "info".to_string(),
+            file_path: None,
+            json_format: false,
+            max_file_size: Some(10 * 1024 * 1024), // 10MB
+            max_files: Some(5),
+        }
+    }
+}
+
+impl Default for AppConfig {
+    fn default() -> Self {
+        Self {
+            database: DatabaseConfig::default(),
+            web: WebConfig::default(),
+            telegram: TelegramConfig::default(),
+            xray: XrayConfig::default(),
+            logging: LoggingConfig::default(),
+        }
+    }
+}
+
+impl AppConfig {
+    /// Load configuration from multiple sources with priority:
+    /// 1. Command line arguments (highest)
+    /// 2. Environment variables
+    /// 3. Configuration file
+    /// 4. Default values (lowest)
+    pub fn load() -> Result<Self> {
+        let args = args::parse_args();
+        
+        let mut builder = config::Config::builder()
+            // Start with defaults
+            .add_source(config::Config::try_from(&AppConfig::default())?);
+
+        // Add configuration file if specified or exists
+        if let Some(config_file) = &args.config {
+            builder = builder.add_source(config::File::from(config_file.as_path()));
+        } else if std::path::Path::new("config.toml").exists() {
+            builder = builder.add_source(config::File::with_name("config"));
+        }
+
+        // Add environment variables with prefix
+        builder = builder.add_source(
+            config::Environment::with_prefix("XRAY_ADMIN")
+                .separator("__")
+                .try_parsing(true)
+        );
+
+        // Override with command line arguments
+        if let Some(host) = &args.host {
+            builder = builder.set_override("web.host", host.as_str())?;
+        }
+        if let Some(port) = args.port {
+            builder = builder.set_override("web.port", port)?;
+        }
+        if let Some(db_url) = &args.database_url {
+            builder = builder.set_override("database.url", db_url.as_str())?;
+        }
+        if let Some(log_level) = &args.log_level {
+            builder = builder.set_override("logging.level", log_level.as_str())?;
+        }
+
+        let config: AppConfig = builder.build()?.try_deserialize()?;
+        
+        // Validate configuration
+        config.validate()?;
+        
+        Ok(config)
+    }
+
+    pub fn display_summary(&self) {
+        tracing::info!("Configuration loaded:");
+        tracing::info!("  Database URL: {}", mask_sensitive(&self.database.url));
+        tracing::info!("  Web server: {}:{}", self.web.host, self.web.port);
+        tracing::info!("  Log level: {}", self.logging.level);
+        tracing::info!("  Telegram bot: {}", if self.telegram.bot_token.is_empty() { "disabled" } else { "enabled" });
+        tracing::info!("  Xray config path: {}", self.xray.config_template_path.display());
+    }
+}
+
+/// Mask sensitive information in URLs for logging
+fn mask_sensitive(url: &str) -> String {
+    // Simple string-based approach to mask passwords
+    if let Some(scheme_end) = url.find("://") {
+        let after_scheme = &url[scheme_end + 3..];
+        if let Some(at_pos) = after_scheme.find('@') {
+            let auth_part = &after_scheme[..at_pos];
+            if let Some(colon_pos) = auth_part.find(':') {
+                // Found user:password@host pattern
+                let user = &auth_part[..colon_pos];
+                let host_part = &after_scheme[at_pos..];
+                return format!("{}://{}:***{}", &url[..scheme_end], user, host_part);
+            }
+        }
+    }
+    
+    // Fallback to URL parsing if simple approach fails
+    if let Ok(parsed) = url::Url::parse(url) {
+        if parsed.password().is_some() {
+            let mut masked = parsed.clone();
+            masked.set_password(Some("***")).unwrap();
+            masked.to_string()
+        } else {
+            url.to_string()
+        }
+    } else {
+        url.to_string()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_default_config_validation() {
+        let config = AppConfig::default();
+        // Default configuration should be valid
+        assert!(config.validate().is_ok());
+    }
+
+    #[test]
+    fn test_mask_sensitive() {
+        let url = "postgresql://user:password@localhost/db";
+        let masked = mask_sensitive(url);
+        assert!(masked.contains("***"));
+        assert!(!masked.contains("password"));
+    }
+}
\ No newline at end of file
diff --git a/src/database/entities/certificate.rs b/src/database/entities/certificate.rs
new file mode 100644
index 0000000..f42aa98
--- /dev/null
+++ b/src/database/entities/certificate.rs
@@ -0,0 +1,243 @@
+use sea_orm::entity::prelude::*;
+use sea_orm::{Set, ActiveModelTrait};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "certificates")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: Uuid,
+    
+    pub name: String,
+    
+    #[sea_orm(column_name = "cert_type")]
+    pub cert_type: String,
+    
+    pub domain: String,
+    
+    #[serde(skip_serializing)]
+    pub cert_data: Vec<u8>,
+    
+    #[serde(skip_serializing)]
+    pub key_data: Vec<u8>,
+    
+    #[serde(skip_serializing)]
+    pub chain_data: Option<Vec<u8>>,
+    
+    pub expires_at: DateTimeUtc,
+    
+    pub auto_renew: bool,
+    
+    pub created_at: DateTimeUtc,
+    
+    pub updated_at: DateTimeUtc,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::server::Entity")]
+    Servers,
+    #[sea_orm(has_many = "super::server_inbound::Entity")]
+    ServerInbounds,
+}
+
+impl Related<super::server::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Servers.def()
+    }
+}
+
+impl Related<super::server_inbound::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ServerInbounds.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {
+    fn new() -> Self {
+        Self {
+            id: Set(Uuid::new_v4()),
+            created_at: Set(chrono::Utc::now()),
+            updated_at: Set(chrono::Utc::now()),
+            ..ActiveModelTrait::default()
+        }
+    }
+
+    fn before_save<'life0, 'async_trait, C>(
+        mut self,
+        _db: &'life0 C,
+        insert: bool,
+    ) -> core::pin::Pin<Box<dyn core::future::Future<Output = Result<Self, DbErr>> + Send + 'async_trait>>
+    where
+        'life0: 'async_trait,
+        C: 'async_trait + ConnectionTrait,
+        Self: 'async_trait,
+    {
+        Box::pin(async move {
+            if !insert {
+                self.updated_at = Set(chrono::Utc::now());
+            }
+            Ok(self)
+        })
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum CertificateType {
+    SelfSigned,
+    Imported,
+}
+
+impl From<CertificateType> for String {
+    fn from(cert_type: CertificateType) -> Self {
+        match cert_type {
+            CertificateType::SelfSigned => "self_signed".to_string(),
+            CertificateType::Imported => "imported".to_string(),
+        }
+    }
+}
+
+impl From<String> for CertificateType {
+    fn from(s: String) -> Self {
+        match s.as_str() {
+            "self_signed" => CertificateType::SelfSigned,
+            "imported" => CertificateType::Imported,
+            _ => CertificateType::SelfSigned,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CreateCertificateDto {
+    pub name: String,
+    pub cert_type: String,
+    pub domain: String,
+    pub auto_renew: bool,
+    #[serde(default)]
+    pub certificate_pem: String,
+    #[serde(default)]
+    pub private_key: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct UpdateCertificateDto {
+    pub name: Option<String>,
+    pub auto_renew: Option<bool>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CertificateResponse {
+    pub id: Uuid,
+    pub name: String,
+    pub cert_type: String,
+    pub domain: String,
+    pub expires_at: DateTimeUtc,
+    pub auto_renew: bool,
+    pub created_at: DateTimeUtc,
+    pub updated_at: DateTimeUtc,
+    pub has_cert_data: bool,
+    pub has_key_data: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CertificateDetailsResponse {
+    pub id: Uuid,
+    pub name: String,
+    pub cert_type: String,
+    pub domain: String,
+    pub expires_at: DateTimeUtc,
+    pub auto_renew: bool,
+    pub created_at: DateTimeUtc,
+    pub updated_at: DateTimeUtc,
+    pub certificate_pem: String,
+    pub has_private_key: bool,
+}
+
+impl From<Model> for CertificateResponse {
+    fn from(cert: Model) -> Self {
+        Self {
+            id: cert.id,
+            name: cert.name,
+            cert_type: cert.cert_type,
+            domain: cert.domain,
+            expires_at: cert.expires_at,
+            auto_renew: cert.auto_renew,
+            created_at: cert.created_at,
+            updated_at: cert.updated_at,
+            has_cert_data: !cert.cert_data.is_empty(),
+            has_key_data: !cert.key_data.is_empty(),
+        }
+    }
+}
+
+impl From<Model> for CertificateDetailsResponse {
+    fn from(cert: Model) -> Self {
+        let certificate_pem = cert.certificate_pem();
+        let has_private_key = !cert.key_data.is_empty();
+        
+        Self {
+            id: cert.id,
+            name: cert.name,
+            cert_type: cert.cert_type,
+            domain: cert.domain,
+            expires_at: cert.expires_at,
+            auto_renew: cert.auto_renew,
+            created_at: cert.created_at,
+            updated_at: cert.updated_at,
+            certificate_pem,
+            has_private_key,
+        }
+    }
+}
+
+impl Model {
+    #[allow(dead_code)]
+    pub fn is_expired(&self) -> bool {
+        self.expires_at < chrono::Utc::now()
+    }
+
+    #[allow(dead_code)]
+    pub fn expires_soon(&self, days: i64) -> bool {
+        let threshold = chrono::Utc::now() + chrono::Duration::days(days);
+        self.expires_at < threshold
+    }
+
+    /// Get certificate data as PEM string
+    pub fn certificate_pem(&self) -> String {
+        String::from_utf8_lossy(&self.cert_data).to_string()
+    }
+
+    /// Get private key data as PEM string
+    pub fn private_key_pem(&self) -> String {
+        String::from_utf8_lossy(&self.key_data).to_string()
+    }
+
+    pub fn apply_update(self, dto: UpdateCertificateDto) -> ActiveModel {
+        let mut active_model: ActiveModel = self.into();
+        
+        if let Some(name) = dto.name {
+            active_model.name = Set(name);
+        }
+        if let Some(auto_renew) = dto.auto_renew {
+            active_model.auto_renew = Set(auto_renew);
+        }
+        
+        active_model
+    }
+}
+
+impl From<CreateCertificateDto> for ActiveModel {
+    fn from(dto: CreateCertificateDto) -> Self {
+        Self {
+            name: Set(dto.name),
+            cert_type: Set(dto.cert_type),
+            domain: Set(dto.domain),
+            cert_data: Set(dto.certificate_pem.into_bytes()),
+            key_data: Set(dto.private_key.into_bytes()),
+            chain_data: Set(None),
+            expires_at: Set(chrono::Utc::now() + chrono::Duration::days(90)), // Default 90 days
+            auto_renew: Set(dto.auto_renew),
+            ..Self::new()
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/database/entities/inbound_template.rs b/src/database/entities/inbound_template.rs
new file mode 100644
index 0000000..df2aff1
--- /dev/null
+++ b/src/database/entities/inbound_template.rs
@@ -0,0 +1,278 @@
+use sea_orm::entity::prelude::*;
+use sea_orm::{Set, ActiveModelTrait};
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "inbound_templates")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: Uuid,
+    
+    pub name: String,
+    
+    pub description: Option<String>,
+    
+    pub protocol: String,
+    
+    pub default_port: i32,
+    
+    pub base_settings: Value,
+    
+    pub stream_settings: Value,
+    
+    pub requires_tls: bool,
+    
+    pub requires_domain: bool,
+    
+    pub variables: Value,
+    
+    pub is_active: bool,
+    
+    pub created_at: DateTimeUtc,
+    
+    pub updated_at: DateTimeUtc,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::server_inbound::Entity")]
+    ServerInbounds,
+}
+
+impl Related<super::server_inbound::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ServerInbounds.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {
+    fn new() -> Self {
+        Self {
+            id: Set(Uuid::new_v4()),
+            created_at: Set(chrono::Utc::now()),
+            updated_at: Set(chrono::Utc::now()),
+            ..ActiveModelTrait::default()
+        }
+    }
+
+    fn before_save<'life0, 'async_trait, C>(
+        mut self,
+        _db: &'life0 C,
+        insert: bool,
+    ) -> core::pin::Pin<Box<dyn core::future::Future<Output = Result<Self, DbErr>> + Send + 'async_trait>>
+    where
+        'life0: 'async_trait,
+        C: 'async_trait + ConnectionTrait,
+        Self: 'async_trait,
+    {
+        Box::pin(async move {
+            if !insert {
+                self.updated_at = Set(chrono::Utc::now());
+            }
+            Ok(self)
+        })
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum Protocol {
+    Vless,
+    Vmess,
+    Trojan,
+    Shadowsocks,
+}
+
+impl From<Protocol> for String {
+    fn from(protocol: Protocol) -> Self {
+        match protocol {
+            Protocol::Vless => "vless".to_string(),
+            Protocol::Vmess => "vmess".to_string(),
+            Protocol::Trojan => "trojan".to_string(),
+            Protocol::Shadowsocks => "shadowsocks".to_string(),
+        }
+    }
+}
+
+impl From<String> for Protocol {
+    fn from(s: String) -> Self {
+        match s.as_str() {
+            "vless" => Protocol::Vless,
+            "vmess" => Protocol::Vmess,
+            "trojan" => Protocol::Trojan,
+            "shadowsocks" => Protocol::Shadowsocks,
+            _ => Protocol::Vless,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TemplateVariable {
+    pub key: String,
+    pub var_type: VariableType,
+    pub required: bool,
+    pub default_value: Option<String>,
+    pub description: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum VariableType {
+    String,
+    Number,
+    Path,
+    Domain,
+    Port,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CreateInboundTemplateDto {
+    pub name: String,
+    pub protocol: String,
+    pub default_port: i32,
+    pub requires_tls: bool,
+    pub config_template: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct UpdateInboundTemplateDto {
+    pub name: Option<String>,
+    pub description: Option<String>,
+    pub default_port: Option<i32>,
+    pub base_settings: Option<Value>,
+    pub stream_settings: Option<Value>,
+    pub requires_tls: Option<bool>,
+    pub requires_domain: Option<bool>,
+    pub variables: Option<Vec<TemplateVariable>>,
+    pub is_active: Option<bool>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct InboundTemplateResponse {
+    pub id: Uuid,
+    pub name: String,
+    pub description: Option<String>,
+    pub protocol: String,
+    pub default_port: i32,
+    pub base_settings: Value,
+    pub stream_settings: Value,
+    pub requires_tls: bool,
+    pub requires_domain: bool,
+    pub variables: Vec<TemplateVariable>,
+    pub is_active: bool,
+    pub created_at: DateTimeUtc,
+    pub updated_at: DateTimeUtc,
+}
+
+impl From<Model> for InboundTemplateResponse {
+    fn from(template: Model) -> Self {
+        let variables = template.get_variables();
+        Self {
+            id: template.id,
+            name: template.name,
+            description: template.description,
+            protocol: template.protocol,
+            default_port: template.default_port,
+            base_settings: template.base_settings,
+            stream_settings: template.stream_settings,
+            requires_tls: template.requires_tls,
+            requires_domain: template.requires_domain,
+            variables,
+            is_active: template.is_active,
+            created_at: template.created_at,
+            updated_at: template.updated_at,
+        }
+    }
+}
+
+impl From<CreateInboundTemplateDto> for ActiveModel {
+    fn from(dto: CreateInboundTemplateDto) -> Self {
+        // Parse config_template as JSON or use default
+        let config_json: Value = serde_json::from_str(&dto.config_template)
+            .unwrap_or_else(|_| serde_json::json!({}));
+        
+        Self {
+            name: Set(dto.name),
+            description: Set(None),
+            protocol: Set(dto.protocol),
+            default_port: Set(dto.default_port),
+            base_settings: Set(config_json.clone()),
+            stream_settings: Set(serde_json::json!({})),
+            requires_tls: Set(dto.requires_tls),
+            requires_domain: Set(false),
+            variables: Set(Value::Array(vec![])),
+            is_active: Set(true),
+            ..Self::new()
+        }
+    }
+}
+
+impl Model {
+    pub fn get_variables(&self) -> Vec<TemplateVariable> {
+        serde_json::from_value(self.variables.clone()).unwrap_or_default()
+    }
+
+    #[allow(dead_code)]
+    pub fn apply_variables(&self, values: &serde_json::Map<String, Value>) -> Result<(Value, Value), String> {
+        let base_settings = self.base_settings.clone();
+        let stream_settings = self.stream_settings.clone();
+        
+        // Replace variables in JSON using simple string replacement
+        let base_str = base_settings.to_string();
+        let stream_str = stream_settings.to_string();
+        
+        let mut result_base = base_str;
+        let mut result_stream = stream_str;
+        
+        for (key, value) in values {
+            let placeholder = format!("${{{}}}", key);
+            let replacement = match value {
+                Value::String(s) => s.clone(),
+                Value::Number(n) => n.to_string(),
+                _ => value.to_string(),
+            };
+            result_base = result_base.replace(&placeholder, &replacement);
+            result_stream = result_stream.replace(&placeholder, &replacement);
+        }
+        
+        let final_base: Value = serde_json::from_str(&result_base)
+            .map_err(|e| format!("Invalid base settings after variable substitution: {}", e))?;
+        let final_stream: Value = serde_json::from_str(&result_stream)
+            .map_err(|e| format!("Invalid stream settings after variable substitution: {}", e))?;
+        
+        Ok((final_base, final_stream))
+    }
+
+    pub fn apply_update(self, dto: UpdateInboundTemplateDto) -> ActiveModel {
+        let mut active_model: ActiveModel = self.into();
+        
+        if let Some(name) = dto.name {
+            active_model.name = Set(name);
+        }
+        if let Some(description) = dto.description {
+            active_model.description = Set(Some(description));
+        }
+        if let Some(default_port) = dto.default_port {
+            active_model.default_port = Set(default_port);
+        }
+        if let Some(base_settings) = dto.base_settings {
+            active_model.base_settings = Set(base_settings);
+        }
+        if let Some(stream_settings) = dto.stream_settings {
+            active_model.stream_settings = Set(stream_settings);
+        }
+        if let Some(requires_tls) = dto.requires_tls {
+            active_model.requires_tls = Set(requires_tls);
+        }
+        if let Some(requires_domain) = dto.requires_domain {
+            active_model.requires_domain = Set(requires_domain);
+        }
+        if let Some(variables) = dto.variables {
+            active_model.variables = Set(serde_json::to_value(variables).unwrap_or(Value::Array(vec![])));
+        }
+        if let Some(is_active) = dto.is_active {
+            active_model.is_active = Set(is_active);
+        }
+        
+        active_model
+    }
+}
\ No newline at end of file
diff --git a/src/database/entities/inbound_users.rs b/src/database/entities/inbound_users.rs
new file mode 100644
index 0000000..9d288f0
--- /dev/null
+++ b/src/database/entities/inbound_users.rs
@@ -0,0 +1,168 @@
+use sea_orm::entity::prelude::*;
+use sea_orm::{Set, ActiveModelTrait};
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "inbound_users")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: Uuid,
+    
+    pub server_inbound_id: Uuid,
+    
+    pub username: String,
+    
+    pub email: String,
+    
+    pub xray_user_id: String,
+    
+    pub level: i32,
+    
+    pub is_active: bool,
+    
+    pub created_at: DateTimeUtc,
+    
+    pub updated_at: DateTimeUtc,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::server_inbound::Entity",
+        from = "Column::ServerInboundId",
+        to = "super::server_inbound::Column::Id"
+    )]
+    ServerInbound,
+}
+
+impl Related<super::server_inbound::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ServerInbound.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {
+    fn new() -> Self {
+        Self {
+            id: Set(Uuid::new_v4()),
+            created_at: Set(chrono::Utc::now()),
+            updated_at: Set(chrono::Utc::now()),
+            ..ActiveModelTrait::default()
+        }
+    }
+
+    fn before_save<'life0, 'async_trait, C>(
+        mut self,
+        _db: &'life0 C,
+        insert: bool,
+    ) -> core::pin::Pin<Box<dyn core::future::Future<Output = Result<Self, DbErr>> + Send + 'async_trait>>
+    where
+        'life0: 'async_trait,
+        C: 'async_trait + ConnectionTrait,
+        Self: 'async_trait,
+    {
+        Box::pin(async move {
+            if !insert {
+                self.updated_at = Set(chrono::Utc::now());
+            }
+            Ok(self)
+        })
+    }
+}
+
+/// Inbound user creation data transfer object
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CreateInboundUserDto {
+    pub server_inbound_id: Uuid,
+    pub username: String,
+    pub level: Option<i32>,
+}
+
+impl CreateInboundUserDto {
+    /// Generate email in format: username@OutFleet
+    pub fn generate_email(&self) -> String {
+        format!("{}@OutFleet", self.username)
+    }
+    
+    /// Generate UUID for xray user
+    pub fn generate_xray_user_id(&self) -> String {
+        Uuid::new_v4().to_string()
+    }
+}
+
+/// Inbound user update data transfer object
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct UpdateInboundUserDto {
+    pub username: Option<String>,
+    pub level: Option<i32>,
+    pub is_active: Option<bool>,
+}
+
+impl From<CreateInboundUserDto> for ActiveModel {
+    fn from(dto: CreateInboundUserDto) -> Self {
+        let email = dto.generate_email();
+        let xray_user_id = dto.generate_xray_user_id();
+        
+        Self {
+            server_inbound_id: Set(dto.server_inbound_id),
+            username: Set(dto.username),
+            email: Set(email),
+            xray_user_id: Set(xray_user_id),
+            level: Set(dto.level.unwrap_or(0)),
+            is_active: Set(true),
+            ..Self::new()
+        }
+    }
+}
+
+impl Model {
+    /// Update this model with data from UpdateInboundUserDto
+    pub fn apply_update(self, dto: UpdateInboundUserDto) -> ActiveModel {
+        let mut active_model: ActiveModel = self.into();
+        
+        if let Some(username) = dto.username {
+            let new_email = format!("{}@OutFleet", username);
+            active_model.username = Set(username);
+            active_model.email = Set(new_email);
+        }
+        if let Some(level) = dto.level {
+            active_model.level = Set(level);
+        }
+        if let Some(is_active) = dto.is_active {
+            active_model.is_active = Set(is_active);
+        }
+        
+        active_model
+    }
+}
+
+/// Response model for inbound user
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct InboundUserResponse {
+    pub id: Uuid,
+    pub server_inbound_id: Uuid,
+    pub username: String,
+    pub email: String,
+    pub xray_user_id: String,
+    pub level: i32,
+    pub is_active: bool,
+    pub created_at: String,
+    pub updated_at: String,
+}
+
+impl From<Model> for InboundUserResponse {
+    fn from(model: Model) -> Self {
+        Self {
+            id: model.id,
+            server_inbound_id: model.server_inbound_id,
+            username: model.username,
+            email: model.email,
+            xray_user_id: model.xray_user_id,
+            level: model.level,
+            is_active: model.is_active,
+            created_at: model.created_at.to_rfc3339(),
+            updated_at: model.updated_at.to_rfc3339(),
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/database/entities/mod.rs b/src/database/entities/mod.rs
new file mode 100644
index 0000000..9b62d50
--- /dev/null
+++ b/src/database/entities/mod.rs
@@ -0,0 +1,16 @@
+pub mod user;
+pub mod certificate;
+pub mod inbound_template;
+pub mod server;
+pub mod server_inbound;
+pub mod user_access;
+pub mod inbound_users;
+
+pub mod prelude {
+    pub use super::certificate::Entity as Certificate;
+    pub use super::inbound_template::Entity as InboundTemplate;
+    pub use super::server::Entity as Server;
+    pub use super::server_inbound::Entity as ServerInbound;
+    pub use super::user_access::Entity as UserAccess;
+    pub use super::inbound_users::Entity as InboundUsers;
+}
\ No newline at end of file
diff --git a/src/database/entities/server.rs b/src/database/entities/server.rs
new file mode 100644
index 0000000..b38861a
--- /dev/null
+++ b/src/database/entities/server.rs
@@ -0,0 +1,212 @@
+use sea_orm::entity::prelude::*;
+use sea_orm::{Set, ActiveModelTrait};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "servers")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: Uuid,
+    
+    pub name: String,
+    
+    pub hostname: String,
+    
+    pub grpc_port: i32,
+    
+    #[serde(skip_serializing)]
+    pub api_credentials: Option<String>,
+    
+    pub status: String,
+    
+    pub default_certificate_id: Option<Uuid>,
+    
+    pub created_at: DateTimeUtc,
+    
+    pub updated_at: DateTimeUtc,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::certificate::Entity",
+        from = "Column::DefaultCertificateId",
+        to = "super::certificate::Column::Id"
+    )]
+    DefaultCertificate,
+    #[sea_orm(has_many = "super::server_inbound::Entity")]
+    ServerInbounds,
+}
+
+impl Related<super::certificate::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::DefaultCertificate.def()
+    }
+}
+
+impl Related<super::server_inbound::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ServerInbounds.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {
+    fn new() -> Self {
+        Self {
+            id: Set(Uuid::new_v4()),
+            status: Set(ServerStatus::Unknown.into()),
+            created_at: Set(chrono::Utc::now()),
+            updated_at: Set(chrono::Utc::now()),
+            ..ActiveModelTrait::default()
+        }
+    }
+
+    fn before_save<'life0, 'async_trait, C>(
+        mut self,
+        _db: &'life0 C,
+        insert: bool,
+    ) -> core::pin::Pin<Box<dyn core::future::Future<Output = Result<Self, DbErr>> + Send + 'async_trait>>
+    where
+        'life0: 'async_trait,
+        C: 'async_trait + ConnectionTrait,
+        Self: 'async_trait,
+    {
+        Box::pin(async move {
+            if !insert {
+                self.updated_at = Set(chrono::Utc::now());
+            }
+            Ok(self)
+        })
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum ServerStatus {
+    Unknown,
+    Online,
+    Offline,
+    Error,
+    Connecting,
+}
+
+impl From<ServerStatus> for String {
+    fn from(status: ServerStatus) -> Self {
+        match status {
+            ServerStatus::Unknown => "unknown".to_string(),
+            ServerStatus::Online => "online".to_string(),
+            ServerStatus::Offline => "offline".to_string(),
+            ServerStatus::Error => "error".to_string(),
+            ServerStatus::Connecting => "connecting".to_string(),
+        }
+    }
+}
+
+impl From<String> for ServerStatus {
+    fn from(s: String) -> Self {
+        match s.as_str() {
+            "online" => ServerStatus::Online,
+            "offline" => ServerStatus::Offline,
+            "error" => ServerStatus::Error,
+            "connecting" => ServerStatus::Connecting,
+            _ => ServerStatus::Unknown,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CreateServerDto {
+    pub name: String,
+    pub hostname: String,
+    pub grpc_port: Option<i32>,
+    pub api_credentials: Option<String>,
+    pub default_certificate_id: Option<Uuid>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct UpdateServerDto {
+    pub name: Option<String>,
+    pub hostname: Option<String>,
+    pub grpc_port: Option<i32>,
+    pub api_credentials: Option<String>,
+    pub status: Option<String>,
+    pub default_certificate_id: Option<Uuid>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ServerResponse {
+    pub id: Uuid,
+    pub name: String,
+    pub hostname: String,
+    pub grpc_port: i32,
+    pub status: String,
+    pub default_certificate_id: Option<Uuid>,
+    pub created_at: DateTimeUtc,
+    pub updated_at: DateTimeUtc,
+    pub has_credentials: bool,
+}
+
+impl From<CreateServerDto> for ActiveModel {
+    fn from(dto: CreateServerDto) -> Self {
+        Self {
+            name: Set(dto.name),
+            hostname: Set(dto.hostname),
+            grpc_port: Set(dto.grpc_port.unwrap_or(2053)),
+            api_credentials: Set(dto.api_credentials),
+            status: Set("unknown".to_string()),
+            default_certificate_id: Set(dto.default_certificate_id),
+            ..Self::new()
+        }
+    }
+}
+
+impl From<Model> for ServerResponse {
+    fn from(server: Model) -> Self {
+        Self {
+            id: server.id,
+            name: server.name,
+            hostname: server.hostname,
+            grpc_port: server.grpc_port,
+            status: server.status,
+            default_certificate_id: server.default_certificate_id,
+            created_at: server.created_at,
+            updated_at: server.updated_at,
+            has_credentials: server.api_credentials.is_some(),
+        }
+    }
+}
+
+impl Model {
+    pub fn apply_update(self, dto: UpdateServerDto) -> ActiveModel {
+        let mut active_model: ActiveModel = self.into();
+        
+        if let Some(name) = dto.name {
+            active_model.name = Set(name);
+        }
+        if let Some(hostname) = dto.hostname {
+            active_model.hostname = Set(hostname);
+        }
+        if let Some(grpc_port) = dto.grpc_port {
+            active_model.grpc_port = Set(grpc_port);
+        }
+        if let Some(api_credentials) = dto.api_credentials {
+            active_model.api_credentials = Set(Some(api_credentials));
+        }
+        if let Some(status) = dto.status {
+            active_model.status = Set(status);
+        }
+        if let Some(default_certificate_id) = dto.default_certificate_id {
+            active_model.default_certificate_id = Set(Some(default_certificate_id));
+        }
+        
+        active_model
+    }
+
+    pub fn get_grpc_endpoint(&self) -> String {
+        format!("{}:{}", self.hostname, self.grpc_port)
+    }
+
+    #[allow(dead_code)]
+    pub fn get_status(&self) -> ServerStatus {
+        self.status.clone().into()
+    }
+}
\ No newline at end of file
diff --git a/src/database/entities/server_inbound.rs b/src/database/entities/server_inbound.rs
new file mode 100644
index 0000000..32a71d8
--- /dev/null
+++ b/src/database/entities/server_inbound.rs
@@ -0,0 +1,204 @@
+use sea_orm::entity::prelude::*;
+use sea_orm::{Set, ActiveModelTrait};
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "server_inbounds")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: Uuid,
+    
+    pub server_id: Uuid,
+    
+    pub template_id: Uuid,
+    
+    pub tag: String,
+    
+    pub port_override: Option<i32>,
+    
+    pub certificate_id: Option<Uuid>,
+    
+    pub variable_values: Value,
+    
+    pub is_active: bool,
+    
+    pub created_at: DateTimeUtc,
+    
+    pub updated_at: DateTimeUtc,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::server::Entity",
+        from = "Column::ServerId",
+        to = "super::server::Column::Id"
+    )]
+    Server,
+    #[sea_orm(
+        belongs_to = "super::inbound_template::Entity",
+        from = "Column::TemplateId",
+        to = "super::inbound_template::Column::Id"
+    )]
+    Template,
+    #[sea_orm(
+        belongs_to = "super::certificate::Entity",
+        from = "Column::CertificateId",
+        to = "super::certificate::Column::Id"
+    )]
+    Certificate,
+}
+
+impl Related<super::server::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Server.def()
+    }
+}
+
+impl Related<super::inbound_template::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Template.def()
+    }
+}
+
+impl Related<super::certificate::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Certificate.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {
+    fn new() -> Self {
+        Self {
+            id: Set(Uuid::new_v4()),
+            created_at: Set(chrono::Utc::now()),
+            updated_at: Set(chrono::Utc::now()),
+            ..ActiveModelTrait::default()
+        }
+    }
+
+    fn before_save<'life0, 'async_trait, C>(
+        mut self,
+        _db: &'life0 C,
+        insert: bool,
+    ) -> core::pin::Pin<Box<dyn core::future::Future<Output = Result<Self, DbErr>> + Send + 'async_trait>>
+    where
+        'life0: 'async_trait,
+        C: 'async_trait + ConnectionTrait,
+        Self: 'async_trait,
+    {
+        Box::pin(async move {
+            if !insert {
+                self.updated_at = Set(chrono::Utc::now());
+            }
+            Ok(self)
+        })
+    }
+
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CreateServerInboundDto {
+    pub template_id: Uuid,
+    pub port: i32,
+    pub certificate_id: Option<Uuid>,
+    pub is_active: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct UpdateServerInboundDto {
+    pub tag: Option<String>,
+    pub port_override: Option<i32>,
+    pub certificate_id: Option<Uuid>,
+    pub variable_values: Option<serde_json::Map<String, Value>>,
+    pub is_active: Option<bool>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ServerInboundResponse {
+    pub id: Uuid,
+    pub server_id: Uuid,
+    pub template_id: Uuid,
+    pub tag: String,
+    pub port: i32,
+    pub certificate_id: Option<Uuid>,
+    pub variable_values: Value,
+    pub is_active: bool,
+    pub created_at: DateTimeUtc,
+    pub updated_at: DateTimeUtc,
+    // Populated by joins (simplified for now)
+    pub template_name: Option<String>,
+    pub certificate_name: Option<String>,
+}
+
+impl From<Model> for ServerInboundResponse {
+    fn from(inbound: Model) -> Self {
+        Self {
+            id: inbound.id,
+            server_id: inbound.server_id,
+            template_id: inbound.template_id,
+            tag: inbound.tag,
+            port: inbound.port_override.unwrap_or(443), // Default port if not set
+            certificate_id: inbound.certificate_id,
+            variable_values: inbound.variable_values,
+            is_active: inbound.is_active,
+            created_at: inbound.created_at,
+            updated_at: inbound.updated_at,
+            template_name: None, // Will be filled by repository if needed
+            certificate_name: None, // Will be filled by repository if needed
+        }
+    }
+}
+
+impl Model {
+    pub fn apply_update(self, dto: UpdateServerInboundDto) -> ActiveModel {
+        let mut active_model: ActiveModel = self.into();
+        
+        if let Some(tag) = dto.tag {
+            active_model.tag = Set(tag);
+        }
+        if let Some(port_override) = dto.port_override {
+            active_model.port_override = Set(Some(port_override));
+        }
+        if let Some(certificate_id) = dto.certificate_id {
+            active_model.certificate_id = Set(Some(certificate_id));
+        }
+        if let Some(variable_values) = dto.variable_values {
+            active_model.variable_values = Set(Value::Object(variable_values));
+        }
+        if let Some(is_active) = dto.is_active {
+            active_model.is_active = Set(is_active);
+        }
+        
+        active_model
+    }
+
+    #[allow(dead_code)]
+    pub fn get_variable_values(&self) -> serde_json::Map<String, Value> {
+        if let Value::Object(map) = &self.variable_values {
+            map.clone()
+        } else {
+            serde_json::Map::new()
+        }
+    }
+
+    #[allow(dead_code)]
+    pub fn get_effective_port(&self, template_default_port: i32) -> i32 {
+        self.port_override.unwrap_or(template_default_port)
+    }
+}
+
+impl From<CreateServerInboundDto> for ActiveModel {
+    fn from(dto: CreateServerInboundDto) -> Self {
+        Self {
+            template_id: Set(dto.template_id),
+            tag: Set(format!("inbound-{}", Uuid::new_v4())), // Generate unique tag
+            port_override: Set(Some(dto.port)),
+            certificate_id: Set(dto.certificate_id),
+            variable_values: Set(Value::Object(serde_json::Map::new())),
+            is_active: Set(dto.is_active),
+            ..Self::new()
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/database/entities/user.rs b/src/database/entities/user.rs
new file mode 100644
index 0000000..25ee8b3
--- /dev/null
+++ b/src/database/entities/user.rs
@@ -0,0 +1,185 @@
+use sea_orm::entity::prelude::*;
+use sea_orm::{Set, ActiveModelTrait};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "users")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: Uuid,
+    
+    /// User display name
+    pub name: String,
+    
+    /// Optional comment/description about the user
+    #[sea_orm(column_type = "Text")]
+    pub comment: Option<String>,
+    
+    /// Optional Telegram user ID for bot integration
+    pub telegram_id: Option<i64>,
+    
+    /// When the user was registered/created
+    pub created_at: DateTimeUtc,
+    
+    /// Last time user record was updated
+    pub updated_at: DateTimeUtc,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {
+    /// Called before insert and update
+    fn new() -> Self {
+        Self {
+            id: Set(Uuid::new_v4()),
+            created_at: Set(chrono::Utc::now()),
+            updated_at: Set(chrono::Utc::now()),
+            ..ActiveModelTrait::default()
+        }
+    }
+
+    /// Called before update
+    fn before_save<'life0, 'async_trait, C>(
+        mut self,
+        _db: &'life0 C,
+        insert: bool,
+    ) -> core::pin::Pin<Box<dyn core::future::Future<Output = Result<Self, DbErr>> + Send + 'async_trait>>
+    where
+        'life0: 'async_trait,
+        C: 'async_trait + ConnectionTrait,
+        Self: 'async_trait,
+    {
+        Box::pin(async move {
+            if !insert {
+                self.updated_at = Set(chrono::Utc::now());
+            }
+            Ok(self)
+        })
+    }
+}
+
+/// User creation data transfer object
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CreateUserDto {
+    pub name: String,
+    pub comment: Option<String>,
+    pub telegram_id: Option<i64>,
+}
+
+/// User update data transfer object
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct UpdateUserDto {
+    pub name: Option<String>,
+    pub comment: Option<String>,
+    pub telegram_id: Option<i64>,
+}
+
+impl From<CreateUserDto> for ActiveModel {
+    fn from(dto: CreateUserDto) -> Self {
+        Self {
+            name: Set(dto.name),
+            comment: Set(dto.comment),
+            telegram_id: Set(dto.telegram_id),
+            ..Self::new()
+        }
+    }
+}
+
+impl Model {
+    /// Update this model with data from UpdateUserDto
+    pub fn apply_update(self, dto: UpdateUserDto) -> ActiveModel {
+        let mut active_model: ActiveModel = self.into();
+        
+        if let Some(name) = dto.name {
+            active_model.name = Set(name);
+        }
+        if let Some(comment) = dto.comment {
+            active_model.comment = Set(Some(comment));
+        } else if dto.comment.is_some() {
+            // Explicitly set to None if Some(None) was passed
+            active_model.comment = Set(None);
+        }
+        if dto.telegram_id.is_some() {
+            active_model.telegram_id = Set(dto.telegram_id);
+        }
+        
+        active_model
+    }
+
+    /// Check if user has Telegram integration
+    #[allow(dead_code)]
+    pub fn has_telegram(&self) -> bool {
+        self.telegram_id.is_some()
+    }
+
+    /// Get display name with optional comment
+    #[allow(dead_code)]
+    pub fn display_name(&self) -> String {
+        match &self.comment {
+            Some(comment) if !comment.is_empty() => format!("{} ({})", self.name, comment),
+            _ => self.name.clone(),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_create_user_dto_conversion() {
+        let dto = CreateUserDto {
+            name: "Test User".to_string(),
+            comment: Some("Test comment".to_string()),
+            telegram_id: Some(123456789),
+        };
+
+        let active_model: ActiveModel = dto.into();
+        
+        assert_eq!(active_model.name.unwrap(), "Test User");
+        assert_eq!(active_model.comment.unwrap(), Some("Test comment".to_string()));
+        assert_eq!(active_model.telegram_id.unwrap(), Some(123456789));
+    }
+
+    #[test]
+    fn test_user_display_name() {
+        let user = Model {
+            id: Uuid::new_v4(),
+            name: "John Doe".to_string(),
+            comment: Some("Admin user".to_string()),
+            telegram_id: None,
+            created_at: chrono::Utc::now(),
+            updated_at: chrono::Utc::now(),
+        };
+
+        assert_eq!(user.display_name(), "John Doe (Admin user)");
+
+        let user_no_comment = Model {
+            comment: None,
+            ..user
+        };
+
+        assert_eq!(user_no_comment.display_name(), "John Doe");
+    }
+
+    #[test]
+    fn test_has_telegram() {
+        let user_with_telegram = Model {
+            id: Uuid::new_v4(),
+            name: "User".to_string(),
+            comment: None,
+            telegram_id: Some(123456789),
+            created_at: chrono::Utc::now(),
+            updated_at: chrono::Utc::now(),
+        };
+
+        let user_without_telegram = Model {
+            telegram_id: None,
+            ..user_with_telegram.clone()
+        };
+
+        assert!(user_with_telegram.has_telegram());
+        assert!(!user_without_telegram.has_telegram());
+    }
+}
\ No newline at end of file
diff --git a/src/database/entities/user_access.rs b/src/database/entities/user_access.rs
new file mode 100644
index 0000000..2a222cf
--- /dev/null
+++ b/src/database/entities/user_access.rs
@@ -0,0 +1,188 @@
+use sea_orm::entity::prelude::*;
+use sea_orm::{Set, ActiveModelTrait};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_access")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: Uuid,
+    
+    /// User ID this access is for
+    pub user_id: Uuid,
+    
+    /// Server ID this access applies to
+    pub server_id: Uuid,
+    
+    /// Server inbound ID this access applies to
+    pub server_inbound_id: Uuid,
+    
+    /// User's unique identifier in xray (UUID for VLESS/VMess, password for Trojan)
+    pub xray_user_id: String,
+    
+    /// User's email in xray
+    pub xray_email: String,
+    
+    /// User level in xray (0-255)
+    pub level: i32,
+    
+    /// Whether this access is currently active
+    pub is_active: bool,
+    
+    /// When this access was created
+    pub created_at: DateTimeUtc,
+    
+    /// Last time this access was updated
+    pub updated_at: DateTimeUtc,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id"
+    )]
+    User,
+    #[sea_orm(
+        belongs_to = "super::server::Entity",
+        from = "Column::ServerId", 
+        to = "super::server::Column::Id"
+    )]
+    Server,
+    #[sea_orm(
+        belongs_to = "super::server_inbound::Entity",
+        from = "Column::ServerInboundId",
+        to = "super::server_inbound::Column::Id"
+    )]
+    ServerInbound,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl Related<super::server::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Server.def()
+    }
+}
+
+impl Related<super::server_inbound::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ServerInbound.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {
+    fn new() -> Self {
+        Self {
+            id: Set(Uuid::new_v4()),
+            created_at: Set(chrono::Utc::now()),
+            updated_at: Set(chrono::Utc::now()),
+            ..ActiveModelTrait::default()
+        }
+    }
+
+    fn before_save<'life0, 'async_trait, C>(
+        mut self,
+        _db: &'life0 C,
+        insert: bool,
+    ) -> core::pin::Pin<Box<dyn core::future::Future<Output = Result<Self, DbErr>> + Send + 'async_trait>>
+    where
+        'life0: 'async_trait,
+        C: 'async_trait + ConnectionTrait,
+        Self: 'async_trait,
+    {
+        Box::pin(async move {
+            if !insert {
+                self.updated_at = Set(chrono::Utc::now());
+            }
+            Ok(self)
+        })
+    }
+
+}
+
+/// User access creation data transfer object
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CreateUserAccessDto {
+    pub user_id: Uuid,
+    pub server_id: Uuid,
+    pub server_inbound_id: Uuid,
+    pub xray_user_id: String,
+    pub xray_email: String,
+    pub level: Option<i32>,
+}
+
+/// User access update data transfer object
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct UpdateUserAccessDto {
+    pub is_active: Option<bool>,
+    pub level: Option<i32>,
+}
+
+impl From<CreateUserAccessDto> for ActiveModel {
+    fn from(dto: CreateUserAccessDto) -> Self {
+        Self {
+            user_id: Set(dto.user_id),
+            server_id: Set(dto.server_id),
+            server_inbound_id: Set(dto.server_inbound_id),
+            xray_user_id: Set(dto.xray_user_id),
+            xray_email: Set(dto.xray_email),
+            level: Set(dto.level.unwrap_or(0)),
+            is_active: Set(true),
+            ..Self::new()
+        }
+    }
+}
+
+impl Model {
+    /// Update this model with data from UpdateUserAccessDto
+    pub fn apply_update(self, dto: UpdateUserAccessDto) -> ActiveModel {
+        let mut active_model: ActiveModel = self.into();
+        
+        if let Some(is_active) = dto.is_active {
+            active_model.is_active = Set(is_active);
+        }
+        if let Some(level) = dto.level {
+            active_model.level = Set(level);
+        }
+        
+        active_model
+    }
+}
+
+/// Response model for user access
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct UserAccessResponse {
+    pub id: Uuid,
+    pub user_id: Uuid,
+    pub server_id: Uuid,
+    pub server_inbound_id: Uuid,
+    pub xray_user_id: String,
+    pub xray_email: String,
+    pub level: i32,
+    pub is_active: bool,
+    pub created_at: String,
+    pub updated_at: String,
+}
+
+impl From<Model> for UserAccessResponse {
+    fn from(model: Model) -> Self {
+        Self {
+            id: model.id,
+            user_id: model.user_id,
+            server_id: model.server_id,
+            server_inbound_id: model.server_inbound_id,
+            xray_user_id: model.xray_user_id,
+            xray_email: model.xray_email,
+            level: model.level,
+            is_active: model.is_active,
+            created_at: model.created_at.to_rfc3339(),
+            updated_at: model.updated_at.to_rfc3339(),
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/database/migrations/m20241201_000001_create_users_table.rs b/src/database/migrations/m20241201_000001_create_users_table.rs
new file mode 100644
index 0000000..4e38563
--- /dev/null
+++ b/src/database/migrations/m20241201_000001_create_users_table.rs
@@ -0,0 +1,135 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        // Create users table
+        manager
+            .create_table(
+                Table::create()
+                    .table(Users::Table)
+                    .if_not_exists()
+                    .col(
+                        ColumnDef::new(Users::Id)
+                            .uuid()
+                            .not_null()
+                            .primary_key(),
+                    )
+                    .col(
+                        ColumnDef::new(Users::Name)
+                            .string_len(255)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Users::Comment)
+                            .text()
+                            .null(),
+                    )
+                    .col(
+                        ColumnDef::new(Users::TelegramId)
+                            .big_integer()
+                            .null(),
+                    )
+                    .col(
+                        ColumnDef::new(Users::CreatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Users::UpdatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .to_owned(),
+            )
+            .await?;
+
+        // Create index on name for faster searches
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("idx_users_name")
+                    .table(Users::Table)
+                    .col(Users::Name)
+                    .to_owned(),
+            )
+            .await?;
+
+        // Create unique index on telegram_id (if not null)
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("idx_users_telegram_id")
+                    .table(Users::Table)
+                    .col(Users::TelegramId)
+                    .unique()
+                    .to_owned(),
+            )
+            .await?;
+
+        // Create index on created_at for sorting
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("idx_users_created_at")
+                    .table(Users::Table)
+                    .col(Users::CreatedAt)
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        // Drop indexes first
+        manager
+            .drop_index(
+                Index::drop()
+                    .if_exists()
+                    .name("idx_users_created_at")
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_index(
+                Index::drop()
+                    .if_exists()
+                    .name("idx_users_telegram_id")
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_index(
+                Index::drop()
+                    .if_exists()
+                    .name("idx_users_name")
+                    .to_owned(),
+            )
+            .await?;
+
+        // Drop table
+        manager
+            .drop_table(Table::drop().table(Users::Table).to_owned())
+            .await
+    }
+}
+
+#[derive(DeriveIden)]
+enum Users {
+    Table,
+    Id,
+    Name,
+    Comment,
+    TelegramId,
+    CreatedAt,
+    UpdatedAt,
+}
\ No newline at end of file
diff --git a/src/database/migrations/m20241201_000002_create_certificates_table.rs b/src/database/migrations/m20241201_000002_create_certificates_table.rs
new file mode 100644
index 0000000..a4b6722
--- /dev/null
+++ b/src/database/migrations/m20241201_000002_create_certificates_table.rs
@@ -0,0 +1,120 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_table(
+                Table::create()
+                    .table(Certificates::Table)
+                    .if_not_exists()
+                    .col(
+                        ColumnDef::new(Certificates::Id)
+                            .uuid()
+                            .not_null()
+                            .primary_key(),
+                    )
+                    .col(
+                        ColumnDef::new(Certificates::Name)
+                            .string_len(255)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Certificates::CertType)
+                            .string_len(50)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Certificates::Domain)
+                            .string_len(255)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Certificates::CertData)
+                            .blob()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Certificates::KeyData)
+                            .blob()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Certificates::ChainData)
+                            .blob()
+                            .null(),
+                    )
+                    .col(
+                        ColumnDef::new(Certificates::ExpiresAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Certificates::AutoRenew)
+                            .boolean()
+                            .default(false)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Certificates::CreatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Certificates::UpdatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .to_owned(),
+            )
+            .await?;
+
+        // Index on domain for faster lookups
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("idx_certificates_domain")
+                    .table(Certificates::Table)
+                    .col(Certificates::Domain)
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .drop_index(
+                Index::drop()
+                    .if_exists()
+                    .name("idx_certificates_domain")
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_table(Table::drop().table(Certificates::Table).to_owned())
+            .await
+    }
+}
+
+#[derive(DeriveIden)]
+enum Certificates {
+    Table,
+    Id,
+    Name,
+    CertType,
+    Domain,
+    CertData,
+    KeyData,
+    ChainData,
+    ExpiresAt,
+    AutoRenew,
+    CreatedAt,
+    UpdatedAt,
+}
\ No newline at end of file
diff --git a/src/database/migrations/m20241201_000003_create_inbound_templates_table.rs b/src/database/migrations/m20241201_000003_create_inbound_templates_table.rs
new file mode 100644
index 0000000..ab83340
--- /dev/null
+++ b/src/database/migrations/m20241201_000003_create_inbound_templates_table.rs
@@ -0,0 +1,155 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_table(
+                Table::create()
+                    .table(InboundTemplates::Table)
+                    .if_not_exists()
+                    .col(
+                        ColumnDef::new(InboundTemplates::Id)
+                            .uuid()
+                            .not_null()
+                            .primary_key(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundTemplates::Name)
+                            .string_len(255)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundTemplates::Description)
+                            .text()
+                            .null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundTemplates::Protocol)
+                            .string_len(50)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundTemplates::DefaultPort)
+                            .integer()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundTemplates::BaseSettings)
+                            .json()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundTemplates::StreamSettings)
+                            .json()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundTemplates::RequiresTls)
+                            .boolean()
+                            .default(false)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundTemplates::RequiresDomain)
+                            .boolean()
+                            .default(false)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundTemplates::Variables)
+                            .json()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundTemplates::IsActive)
+                            .boolean()
+                            .default(true)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundTemplates::CreatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundTemplates::UpdatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .to_owned(),
+            )
+            .await?;
+
+        // Index on name for searches
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("idx_inbound_templates_name")
+                    .table(InboundTemplates::Table)
+                    .col(InboundTemplates::Name)
+                    .to_owned(),
+            )
+            .await?;
+
+        // Index on protocol
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("idx_inbound_templates_protocol")
+                    .table(InboundTemplates::Table)
+                    .col(InboundTemplates::Protocol)
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .drop_index(
+                Index::drop()
+                    .if_exists()
+                    .name("idx_inbound_templates_protocol")
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_index(
+                Index::drop()
+                    .if_exists()
+                    .name("idx_inbound_templates_name")
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_table(Table::drop().table(InboundTemplates::Table).to_owned())
+            .await
+    }
+}
+
+#[derive(DeriveIden)]
+enum InboundTemplates {
+    Table,
+    Id,
+    Name,
+    Description,
+    Protocol,
+    DefaultPort,
+    BaseSettings,
+    StreamSettings,
+    RequiresTls,
+    RequiresDomain,
+    Variables,
+    IsActive,
+    CreatedAt,
+    UpdatedAt,
+}
\ No newline at end of file
diff --git a/src/database/migrations/m20241201_000004_create_servers_table.rs b/src/database/migrations/m20241201_000004_create_servers_table.rs
new file mode 100644
index 0000000..c044c6c
--- /dev/null
+++ b/src/database/migrations/m20241201_000004_create_servers_table.rs
@@ -0,0 +1,136 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_table(
+                Table::create()
+                    .table(Servers::Table)
+                    .if_not_exists()
+                    .col(
+                        ColumnDef::new(Servers::Id)
+                            .uuid()
+                            .not_null()
+                            .primary_key(),
+                    )
+                    .col(
+                        ColumnDef::new(Servers::Name)
+                            .string_len(255)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Servers::Hostname)
+                            .string_len(255)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Servers::GrpcPort)
+                            .integer()
+                            .default(2053)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Servers::ApiCredentials)
+                            .text()
+                            .null(),
+                    )
+                    .col(
+                        ColumnDef::new(Servers::Status)
+                            .string_len(50)
+                            .default("unknown")
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Servers::DefaultCertificateId)
+                            .uuid()
+                            .null(),
+                    )
+                    .col(
+                        ColumnDef::new(Servers::CreatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(Servers::UpdatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .to_owned(),
+            )
+            .await?;
+
+        // Foreign key to certificates
+        manager
+            .create_foreign_key(
+                ForeignKey::create()
+                    .name("fk_servers_default_certificate")
+                    .from(Servers::Table, Servers::DefaultCertificateId)
+                    .to(Certificates::Table, Certificates::Id)
+                    .on_delete(ForeignKeyAction::SetNull)
+                    .to_owned(),
+            )
+            .await?;
+
+        // Index on hostname
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("idx_servers_hostname")
+                    .table(Servers::Table)
+                    .col(Servers::Hostname)
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .drop_foreign_key(
+                ForeignKey::drop()
+                    .name("fk_servers_default_certificate")
+                    .table(Servers::Table)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_index(
+                Index::drop()
+                    .if_exists()
+                    .name("idx_servers_hostname")
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_table(Table::drop().table(Servers::Table).to_owned())
+            .await
+    }
+}
+
+#[derive(DeriveIden)]
+enum Servers {
+    Table,
+    Id,
+    Name,
+    Hostname,
+    GrpcPort,
+    ApiCredentials,
+    Status,
+    DefaultCertificateId,
+    CreatedAt,
+    UpdatedAt,
+}
+
+#[derive(DeriveIden)]
+enum Certificates {
+    Table,
+    Id,
+}
\ No newline at end of file
diff --git a/src/database/migrations/m20241201_000005_create_server_inbounds_table.rs b/src/database/migrations/m20241201_000005_create_server_inbounds_table.rs
new file mode 100644
index 0000000..f342fda
--- /dev/null
+++ b/src/database/migrations/m20241201_000005_create_server_inbounds_table.rs
@@ -0,0 +1,195 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_table(
+                Table::create()
+                    .table(ServerInbounds::Table)
+                    .if_not_exists()
+                    .col(
+                        ColumnDef::new(ServerInbounds::Id)
+                            .uuid()
+                            .not_null()
+                            .primary_key(),
+                    )
+                    .col(
+                        ColumnDef::new(ServerInbounds::ServerId)
+                            .uuid()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(ServerInbounds::TemplateId)
+                            .uuid()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(ServerInbounds::Tag)
+                            .string_len(255)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(ServerInbounds::PortOverride)
+                            .integer()
+                            .null(),
+                    )
+                    .col(
+                        ColumnDef::new(ServerInbounds::CertificateId)
+                            .uuid()
+                            .null(),
+                    )
+                    .col(
+                        ColumnDef::new(ServerInbounds::VariableValues)
+                            .json()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(ServerInbounds::IsActive)
+                            .boolean()
+                            .default(true)
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(ServerInbounds::CreatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(ServerInbounds::UpdatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .to_owned(),
+            )
+            .await?;
+
+        // Foreign keys
+        manager
+            .create_foreign_key(
+                ForeignKey::create()
+                    .name("fk_server_inbounds_server")
+                    .from(ServerInbounds::Table, ServerInbounds::ServerId)
+                    .to(Servers::Table, Servers::Id)
+                    .on_delete(ForeignKeyAction::Cascade)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .create_foreign_key(
+                ForeignKey::create()
+                    .name("fk_server_inbounds_template")
+                    .from(ServerInbounds::Table, ServerInbounds::TemplateId)
+                    .to(InboundTemplates::Table, InboundTemplates::Id)
+                    .on_delete(ForeignKeyAction::Restrict)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .create_foreign_key(
+                ForeignKey::create()
+                    .name("fk_server_inbounds_certificate")
+                    .from(ServerInbounds::Table, ServerInbounds::CertificateId)
+                    .to(Certificates::Table, Certificates::Id)
+                    .on_delete(ForeignKeyAction::SetNull)
+                    .to_owned(),
+            )
+            .await?;
+
+        // Unique constraint on server_id + tag
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("idx_server_inbounds_server_tag")
+                    .table(ServerInbounds::Table)
+                    .col(ServerInbounds::ServerId)
+                    .col(ServerInbounds::Tag)
+                    .unique()
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .drop_foreign_key(
+                ForeignKey::drop()
+                    .name("fk_server_inbounds_certificate")
+                    .table(ServerInbounds::Table)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_foreign_key(
+                ForeignKey::drop()
+                    .name("fk_server_inbounds_template")
+                    .table(ServerInbounds::Table)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_foreign_key(
+                ForeignKey::drop()
+                    .name("fk_server_inbounds_server")
+                    .table(ServerInbounds::Table)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_index(
+                Index::drop()
+                    .if_exists()
+                    .name("idx_server_inbounds_server_tag")
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_table(Table::drop().table(ServerInbounds::Table).to_owned())
+            .await
+    }
+}
+
+#[derive(DeriveIden)]
+enum ServerInbounds {
+    Table,
+    Id,
+    ServerId,
+    TemplateId,
+    Tag,
+    PortOverride,
+    CertificateId,
+    VariableValues,
+    IsActive,
+    CreatedAt,
+    UpdatedAt,
+}
+
+#[derive(DeriveIden)]
+enum Servers {
+    Table,
+    Id,
+}
+
+#[derive(DeriveIden)]
+enum InboundTemplates {
+    Table,
+    Id,
+}
+
+#[derive(DeriveIden)]
+enum Certificates {
+    Table,
+    Id,
+}
\ No newline at end of file
diff --git a/src/database/migrations/m20241201_000006_create_user_access_table.rs b/src/database/migrations/m20241201_000006_create_user_access_table.rs
new file mode 100644
index 0000000..f247302
--- /dev/null
+++ b/src/database/migrations/m20241201_000006_create_user_access_table.rs
@@ -0,0 +1,196 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_table(
+                Table::create()
+                    .table(UserAccess::Table)
+                    .if_not_exists()
+                    .col(
+                        ColumnDef::new(UserAccess::Id)
+                            .uuid()
+                            .not_null()
+                            .primary_key(),
+                    )
+                    .col(
+                        ColumnDef::new(UserAccess::UserId)
+                            .uuid()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(UserAccess::ServerId)
+                            .uuid()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(UserAccess::ServerInboundId)
+                            .uuid()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(UserAccess::XrayUserId)
+                            .string()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(UserAccess::XrayEmail)
+                            .string()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(UserAccess::Level)
+                            .integer()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(UserAccess::IsActive)
+                            .boolean()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(UserAccess::CreatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(UserAccess::UpdatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .foreign_key(
+                        ForeignKey::create()
+                            .name("fk_user_access_user_id")
+                            .from(UserAccess::Table, UserAccess::UserId)
+                            .to(Users::Table, Users::Id)
+                            .on_delete(ForeignKeyAction::Cascade),
+                    )
+                    .foreign_key(
+                        ForeignKey::create()
+                            .name("fk_user_access_server_id")
+                            .from(UserAccess::Table, UserAccess::ServerId)
+                            .to(Servers::Table, Servers::Id)
+                            .on_delete(ForeignKeyAction::Cascade),
+                    )
+                    .foreign_key(
+                        ForeignKey::create()
+                            .name("fk_user_access_server_inbound_id")
+                            .from(UserAccess::Table, UserAccess::ServerInboundId)
+                            .to(ServerInbounds::Table, ServerInbounds::Id)
+                            .on_delete(ForeignKeyAction::Cascade),
+                    )
+                    .to_owned(),
+            )
+            .await?;
+
+        // Create indexes separately
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("idx_user_access_server_inbound")
+                    .table(UserAccess::Table)
+                    .col(UserAccess::ServerId)
+                    .col(UserAccess::ServerInboundId)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("idx_user_access_user_server")
+                    .table(UserAccess::Table)
+                    .col(UserAccess::UserId)
+                    .col(UserAccess::ServerId)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("idx_user_access_xray_email")
+                    .table(UserAccess::Table)
+                    .col(UserAccess::XrayEmail)
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        // Drop indexes first
+        manager
+            .drop_index(
+                Index::drop()
+                    .if_exists()
+                    .name("idx_user_access_xray_email")
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_index(
+                Index::drop()
+                    .if_exists()
+                    .name("idx_user_access_user_server")
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_index(
+                Index::drop()
+                    .if_exists()
+                    .name("idx_user_access_server_inbound")
+                    .to_owned(),
+            )
+            .await?;
+
+        // Drop table
+        manager
+            .drop_table(Table::drop().table(UserAccess::Table).to_owned())
+            .await
+    }
+}
+
+#[derive(DeriveIden)]
+enum UserAccess {
+    Table,
+    Id,
+    UserId,
+    ServerId,
+    ServerInboundId,
+    XrayUserId,
+    XrayEmail,
+    Level,
+    IsActive,
+    CreatedAt,
+    UpdatedAt,
+}
+
+#[derive(DeriveIden)]
+enum Users {
+    Table,
+    Id,
+}
+
+#[derive(DeriveIden)]
+enum Servers {
+    Table,
+    Id,
+}
+
+#[derive(DeriveIden)]
+enum ServerInbounds {
+    Table,
+    Id,
+}
\ No newline at end of file
diff --git a/src/database/migrations/m20241201_000007_create_inbound_users_table.rs b/src/database/migrations/m20241201_000007_create_inbound_users_table.rs
new file mode 100644
index 0000000..c801546
--- /dev/null
+++ b/src/database/migrations/m20241201_000007_create_inbound_users_table.rs
@@ -0,0 +1,125 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_table(
+                Table::create()
+                    .table(InboundUsers::Table)
+                    .if_not_exists()
+                    .col(
+                        ColumnDef::new(InboundUsers::Id)
+                            .uuid()
+                            .not_null()
+                            .primary_key(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundUsers::ServerInboundId)
+                            .uuid()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundUsers::Username)
+                            .string()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundUsers::Email)
+                            .string()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundUsers::XrayUserId)
+                            .string()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundUsers::Level)
+                            .integer()
+                            .not_null()
+                            .default(0),
+                    )
+                    .col(
+                        ColumnDef::new(InboundUsers::IsActive)
+                            .boolean()
+                            .not_null()
+                            .default(true),
+                    )
+                    .col(
+                        ColumnDef::new(InboundUsers::CreatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .col(
+                        ColumnDef::new(InboundUsers::UpdatedAt)
+                            .timestamp_with_time_zone()
+                            .not_null(),
+                    )
+                    .foreign_key(
+                        ForeignKey::create()
+                            .name("fk_inbound_users_server_inbound")
+                            .from(InboundUsers::Table, InboundUsers::ServerInboundId)
+                            .to(ServerInbounds::Table, ServerInbounds::Id)
+                            .on_delete(ForeignKeyAction::Cascade),
+                    )
+                    .to_owned(),
+            )
+            .await?;
+
+        // Create unique constraint: one user per inbound
+        manager
+            .create_index(
+                Index::create()
+                    .name("idx_inbound_users_unique_user_per_inbound")
+                    .table(InboundUsers::Table)
+                    .col(InboundUsers::ServerInboundId)
+                    .col(InboundUsers::Username)
+                    .unique()
+                    .to_owned(),
+            )
+            .await?;
+
+        // Create index on email for faster lookups
+        manager
+            .create_index(
+                Index::create()
+                    .name("idx_inbound_users_email")
+                    .table(InboundUsers::Table)
+                    .col(InboundUsers::Email)
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .drop_table(Table::drop().table(InboundUsers::Table).to_owned())
+            .await
+    }
+}
+
+#[derive(DeriveIden)]
+enum InboundUsers {
+    Table,
+    Id,
+    ServerInboundId,
+    Username,
+    Email,
+    XrayUserId,
+    Level,
+    IsActive,
+    CreatedAt,
+    UpdatedAt,
+}
+
+#[derive(DeriveIden)]
+enum ServerInbounds {
+    Table,
+    Id,
+}
\ No newline at end of file
diff --git a/src/database/migrations/mod.rs b/src/database/migrations/mod.rs
new file mode 100644
index 0000000..f7c7692
--- /dev/null
+++ b/src/database/migrations/mod.rs
@@ -0,0 +1,26 @@
+use sea_orm_migration::prelude::*;
+
+mod m20241201_000001_create_users_table;
+mod m20241201_000002_create_certificates_table;
+mod m20241201_000003_create_inbound_templates_table;
+mod m20241201_000004_create_servers_table;
+mod m20241201_000005_create_server_inbounds_table;
+mod m20241201_000006_create_user_access_table;
+mod m20241201_000007_create_inbound_users_table;
+
+pub struct Migrator;
+
+#[async_trait::async_trait]
+impl MigratorTrait for Migrator {
+    fn migrations() -> Vec<Box<dyn MigrationTrait>> {
+        vec![
+            Box::new(m20241201_000001_create_users_table::Migration),
+            Box::new(m20241201_000002_create_certificates_table::Migration),
+            Box::new(m20241201_000003_create_inbound_templates_table::Migration),
+            Box::new(m20241201_000004_create_servers_table::Migration),
+            Box::new(m20241201_000005_create_server_inbounds_table::Migration),
+            Box::new(m20241201_000006_create_user_access_table::Migration),
+            Box::new(m20241201_000007_create_inbound_users_table::Migration),
+        ]
+    }
+}
\ No newline at end of file
diff --git a/src/database/mod.rs b/src/database/mod.rs
new file mode 100644
index 0000000..4a57c7d
--- /dev/null
+++ b/src/database/mod.rs
@@ -0,0 +1,161 @@
+use anyhow::Result;
+use sea_orm::{Database, DatabaseConnection, ConnectOptions, Statement, DatabaseBackend, ConnectionTrait};
+use sea_orm_migration::MigratorTrait;
+use std::time::Duration;
+use tracing::{info, warn};
+
+use crate::config::DatabaseConfig;
+
+pub mod entities;
+pub mod migrations;
+pub mod repository;
+
+use migrations::Migrator;
+
+/// Database connection and management
+#[derive(Clone)]
+pub struct DatabaseManager {
+    connection: DatabaseConnection,
+}
+
+impl DatabaseManager {
+    /// Create a new database connection
+    pub async fn new(config: &DatabaseConfig) -> Result<Self> {
+        info!("Connecting to database...");
+        
+        // URL-encode the connection string to handle special characters in passwords
+        let encoded_url = Self::encode_database_url(&config.url)?;
+        
+        let mut opt = ConnectOptions::new(&encoded_url);
+        opt.max_connections(config.max_connections)
+            .min_connections(1)
+            .connect_timeout(Duration::from_secs(config.connection_timeout))
+            .acquire_timeout(Duration::from_secs(config.connection_timeout))
+            .idle_timeout(Duration::from_secs(600))
+            .max_lifetime(Duration::from_secs(3600))
+            .sqlx_logging(tracing::level_enabled!(tracing::Level::DEBUG))
+            .sqlx_logging_level(log::LevelFilter::Debug);
+
+        let connection = Database::connect(opt).await?;
+        
+        info!("Database connection established successfully");
+        
+        let manager = Self { connection };
+        
+        // Run migrations if auto_migrate is enabled
+        if config.auto_migrate {
+            manager.migrate().await?;
+        }
+        
+        Ok(manager)
+    }
+
+    /// Get database connection
+    pub fn connection(&self) -> &DatabaseConnection {
+        &self.connection
+    }
+
+    /// Run database migrations
+    pub async fn migrate(&self) -> Result<()> {
+        info!("Running database migrations...");
+        
+        match Migrator::up(&self.connection, None).await {
+            Ok(_) => {
+                info!("Database migrations completed successfully");
+                Ok(())
+            }
+            Err(e) => {
+                warn!("Migration error: {}", e);
+                Err(e.into())
+            }
+        }
+    }
+
+    /// Check database connection health
+    pub async fn health_check(&self) -> Result<bool> {
+        let stmt = Statement::from_string(DatabaseBackend::Postgres, "SELECT 1".to_owned());
+        match self.connection.execute(stmt).await {
+            Ok(_) => Ok(true),
+            Err(e) => {
+                warn!("Database health check failed: {}", e);
+                Ok(false)
+            }
+        }
+    }
+
+    /// Get database schema information
+    pub async fn get_schema_version(&self) -> Result<Option<String>> {
+        // This would typically query a migrations table
+        // For now, we'll just return a placeholder
+        Ok(Some("1.0.0".to_string()))
+    }
+
+    /// Encode database URL to handle special characters in passwords
+    fn encode_database_url(url: &str) -> Result<String> {
+        // Parse URL manually to handle special characters in password
+        if let Some(at_pos) = url.rfind('@') {
+            if let Some(_colon_pos) = url[..at_pos].rfind(':') {
+                if let Some(scheme_end) = url.find("://") {
+                    let scheme = &url[..scheme_end + 3];
+                    let user_pass = &url[scheme_end + 3..at_pos];
+                    let host_db = &url[at_pos..];
+                    
+                    if let Some(user_colon) = user_pass.find(':') {
+                        let user = &user_pass[..user_colon];
+                        let password = &user_pass[user_colon + 1..];
+                        
+                        // URL-encode the password part only
+                        let encoded_password = urlencoding::encode(password);
+                        let encoded_url = format!("{}{}:{}{}", scheme, user, encoded_password, host_db);
+                        
+                        return Ok(encoded_url);
+                    }
+                }
+            }
+        }
+        
+        // If parsing fails, return original URL
+        Ok(url.to_string())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::config::DatabaseConfig;
+
+    #[test]
+    fn test_encode_database_url() {
+        let url_with_special_chars = "postgresql://user:pass#word@localhost:5432/db";
+        let encoded = DatabaseManager::encode_database_url(url_with_special_chars).unwrap();
+        assert_eq!(encoded, "postgresql://user:pass%23word@localhost:5432/db");
+
+        let normal_url = "postgresql://user:password@localhost:5432/db";
+        let encoded_normal = DatabaseManager::encode_database_url(normal_url).unwrap();
+        assert_eq!(encoded_normal, "postgresql://user:password@localhost:5432/db");
+    }
+
+    #[tokio::test]
+    async fn test_database_connection() {
+        // This test requires a running PostgreSQL database
+        // Skip in CI or when database is not available
+        if std::env::var("DATABASE_URL").is_err() {
+            return;
+        }
+
+        let config = DatabaseConfig {
+            url: std::env::var("DATABASE_URL").unwrap(),
+            max_connections: 5,
+            connection_timeout: 30,
+            auto_migrate: false,
+        };
+
+        let db = DatabaseManager::new(&config).await;
+        assert!(db.is_ok());
+
+        if let Ok(db) = db {
+            let health = db.health_check().await;
+            assert!(health.is_ok());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/database/repository/certificate.rs b/src/database/repository/certificate.rs
new file mode 100644
index 0000000..44785d9
--- /dev/null
+++ b/src/database/repository/certificate.rs
@@ -0,0 +1,75 @@
+use sea_orm::*;
+use crate::database::entities::{certificate, prelude::*};
+use anyhow::Result;
+use uuid::Uuid;
+
+#[derive(Clone)]
+pub struct CertificateRepository {
+    db: DatabaseConnection,
+}
+
+impl CertificateRepository {
+    pub fn new(db: DatabaseConnection) -> Self {
+        Self { db }
+    }
+
+    pub async fn create(&self, cert_data: certificate::CreateCertificateDto) -> Result<certificate::Model> {
+        let cert = certificate::ActiveModel::from(cert_data);
+
+        let result = Certificate::insert(cert).exec(&self.db).await?;
+        
+        Certificate::find_by_id(result.last_insert_id)
+            .one(&self.db)
+            .await?
+            .ok_or_else(|| anyhow::anyhow!("Failed to retrieve created certificate"))
+    }
+
+    pub async fn find_all(&self) -> Result<Vec<certificate::Model>> {
+        Ok(Certificate::find().all(&self.db).await?)
+    }
+
+    pub async fn find_by_id(&self, id: Uuid) -> Result<Option<certificate::Model>> {
+        Ok(Certificate::find_by_id(id).one(&self.db).await?)
+    }
+
+    #[allow(dead_code)]
+    pub async fn find_by_domain(&self, domain: &str) -> Result<Vec<certificate::Model>> {
+        Ok(Certificate::find()
+            .filter(certificate::Column::Domain.eq(domain))
+            .all(&self.db)
+            .await?)
+    }
+
+    #[allow(dead_code)]
+    pub async fn find_by_type(&self, cert_type: &str) -> Result<Vec<certificate::Model>> {
+        Ok(Certificate::find()
+            .filter(certificate::Column::CertType.eq(cert_type))
+            .all(&self.db)
+            .await?)
+    }
+
+    pub async fn update(&self, id: Uuid, cert_data: certificate::UpdateCertificateDto) -> Result<certificate::Model> {
+        let cert = Certificate::find_by_id(id)
+            .one(&self.db)
+            .await?
+            .ok_or_else(|| anyhow::anyhow!("Certificate not found"))?;
+
+        let updated_cert = cert.apply_update(cert_data);
+
+        Ok(updated_cert.update(&self.db).await?)
+    }
+
+    pub async fn delete(&self, id: Uuid) -> Result<bool> {
+        let result = Certificate::delete_by_id(id).exec(&self.db).await?;
+        Ok(result.rows_affected > 0)
+    }
+
+    pub async fn find_expiring_soon(&self, days: i64) -> Result<Vec<certificate::Model>> {
+        let threshold = chrono::Utc::now() + chrono::Duration::days(days);
+        
+        Ok(Certificate::find()
+            .filter(certificate::Column::ExpiresAt.lt(threshold))
+            .all(&self.db)
+            .await?)
+    }
+}
\ No newline at end of file
diff --git a/src/database/repository/inbound_template.rs b/src/database/repository/inbound_template.rs
new file mode 100644
index 0000000..3bedd81
--- /dev/null
+++ b/src/database/repository/inbound_template.rs
@@ -0,0 +1,65 @@
+use sea_orm::*;
+use crate::database::entities::{inbound_template, prelude::*};
+use anyhow::Result;
+use uuid::Uuid;
+
+#[derive(Clone)]
+pub struct InboundTemplateRepository {
+    db: DatabaseConnection,
+}
+
+#[allow(dead_code)]
+impl InboundTemplateRepository {
+    pub fn new(db: DatabaseConnection) -> Self {
+        Self { db }
+    }
+
+    pub async fn create(&self, template_data: inbound_template::CreateInboundTemplateDto) -> Result<inbound_template::Model> {
+        let template = inbound_template::ActiveModel::from(template_data);
+
+        let result = InboundTemplate::insert(template).exec(&self.db).await?;
+        
+        InboundTemplate::find_by_id(result.last_insert_id)
+            .one(&self.db)
+            .await?
+            .ok_or_else(|| anyhow::anyhow!("Failed to retrieve created template"))
+    }
+
+    pub async fn find_all(&self) -> Result<Vec<inbound_template::Model>> {
+        Ok(InboundTemplate::find().all(&self.db).await?)
+    }
+
+    pub async fn find_by_id(&self, id: Uuid) -> Result<Option<inbound_template::Model>> {
+        Ok(InboundTemplate::find_by_id(id).one(&self.db).await?)
+    }
+
+    pub async fn find_by_name(&self, name: &str) -> Result<Option<inbound_template::Model>> {
+        Ok(InboundTemplate::find()
+            .filter(inbound_template::Column::Name.eq(name))
+            .one(&self.db)
+            .await?)
+    }
+
+    pub async fn find_by_protocol(&self, protocol: &str) -> Result<Vec<inbound_template::Model>> {
+        Ok(InboundTemplate::find()
+            .filter(inbound_template::Column::Protocol.eq(protocol))
+            .all(&self.db)
+            .await?)
+    }
+
+    pub async fn update(&self, id: Uuid, template_data: inbound_template::UpdateInboundTemplateDto) -> Result<inbound_template::Model> {
+        let template = InboundTemplate::find_by_id(id)
+            .one(&self.db)
+            .await?
+            .ok_or_else(|| anyhow::anyhow!("Template not found"))?;
+
+        let updated_template = template.apply_update(template_data);
+
+        Ok(updated_template.update(&self.db).await?)
+    }
+
+    pub async fn delete(&self, id: Uuid) -> Result<bool> {
+        let result = InboundTemplate::delete_by_id(id).exec(&self.db).await?;
+        Ok(result.rows_affected > 0)
+    }
+}
\ No newline at end of file
diff --git a/src/database/repository/inbound_users.rs b/src/database/repository/inbound_users.rs
new file mode 100644
index 0000000..bc394f0
--- /dev/null
+++ b/src/database/repository/inbound_users.rs
@@ -0,0 +1,132 @@
+use anyhow::Result;
+use sea_orm::{ActiveModelTrait, DatabaseConnection, EntityTrait, ColumnTrait, QueryFilter, Set};
+use uuid::Uuid;
+
+use crate::database::entities::inbound_users::{
+    Entity, Model, ActiveModel, CreateInboundUserDto, UpdateInboundUserDto, Column
+};
+
+pub struct InboundUsersRepository {
+    db: DatabaseConnection,
+}
+
+impl InboundUsersRepository {
+    pub fn new(db: DatabaseConnection) -> Self {
+        Self { db }
+    }
+
+    pub async fn find_all(&self) -> Result<Vec<Model>> {
+        let users = Entity::find().all(&self.db).await?;
+        Ok(users)
+    }
+
+    pub async fn find_by_id(&self, id: Uuid) -> Result<Option<Model>> {
+        let user = Entity::find_by_id(id).one(&self.db).await?;
+        Ok(user)
+    }
+
+    /// Find all users for a specific inbound
+    pub async fn find_by_inbound_id(&self, inbound_id: Uuid) -> Result<Vec<Model>> {
+        let users = Entity::find()
+            .filter(Column::ServerInboundId.eq(inbound_id))
+            .all(&self.db)
+            .await?;
+        Ok(users)
+    }
+
+    /// Find active users for a specific inbound
+    pub async fn find_active_by_inbound_id(&self, inbound_id: Uuid) -> Result<Vec<Model>> {
+        let users = Entity::find()
+            .filter(Column::ServerInboundId.eq(inbound_id))
+            .filter(Column::IsActive.eq(true))
+            .all(&self.db)
+            .await?;
+        Ok(users)
+    }
+
+    /// Find user by username and inbound (for uniqueness check)
+    pub async fn find_by_username_and_inbound(&self, username: &str, inbound_id: Uuid) -> Result<Option<Model>> {
+        let user = Entity::find()
+            .filter(Column::Username.eq(username))
+            .filter(Column::ServerInboundId.eq(inbound_id))
+            .one(&self.db)
+            .await?;
+        Ok(user)
+    }
+
+    /// Find user by email
+    pub async fn find_by_email(&self, email: &str) -> Result<Option<Model>> {
+        let user = Entity::find()
+            .filter(Column::Email.eq(email))
+            .one(&self.db)
+            .await?;
+        Ok(user)
+    }
+
+    pub async fn create(&self, dto: CreateInboundUserDto) -> Result<Model> {
+        let active_model: ActiveModel = dto.into();
+        let user = active_model.insert(&self.db).await?;
+        Ok(user)
+    }
+
+    pub async fn update(&self, id: Uuid, dto: UpdateInboundUserDto) -> Result<Option<Model>> {
+        let user = match self.find_by_id(id).await? {
+            Some(user) => user,
+            None => return Ok(None),
+        };
+
+        let updated_model = user.apply_update(dto);
+        let updated_user = updated_model.update(&self.db).await?;
+        Ok(Some(updated_user))
+    }
+
+    pub async fn delete(&self, id: Uuid) -> Result<bool> {
+        let result = Entity::delete_by_id(id).exec(&self.db).await?;
+        Ok(result.rows_affected > 0)
+    }
+
+    /// Enable user (set is_active = true)
+    pub async fn enable(&self, id: Uuid) -> Result<Option<Model>> {
+        let user = match self.find_by_id(id).await? {
+            Some(user) => user,
+            None => return Ok(None),
+        };
+
+        let mut active_model: ActiveModel = user.into();
+        active_model.is_active = Set(true);
+        active_model.updated_at = Set(chrono::Utc::now());
+        
+        let updated_user = active_model.update(&self.db).await?;
+        Ok(Some(updated_user))
+    }
+
+    /// Disable user (set is_active = false)
+    pub async fn disable(&self, id: Uuid) -> Result<Option<Model>> {
+        let user = match self.find_by_id(id).await? {
+            Some(user) => user,
+            None => return Ok(None),
+        };
+
+        let mut active_model: ActiveModel = user.into();
+        active_model.is_active = Set(false);
+        active_model.updated_at = Set(chrono::Utc::now());
+        
+        let updated_user = active_model.update(&self.db).await?;
+        Ok(Some(updated_user))
+    }
+
+    /// Remove all users for a specific inbound (when inbound is deleted)
+    pub async fn remove_all_for_inbound(&self, inbound_id: Uuid) -> Result<u64> {
+        let result = Entity::delete_many()
+            .filter(Column::ServerInboundId.eq(inbound_id))
+            .exec(&self.db)
+            .await?;
+        Ok(result.rows_affected)
+    }
+
+    /// Check if username already exists on this inbound
+    pub async fn username_exists_on_inbound(&self, username: &str, inbound_id: Uuid) -> Result<bool> {
+        let exists = self.find_by_username_and_inbound(username, inbound_id).await?;
+        Ok(exists.is_some())
+    }
+}
\ No newline at end of file
diff --git a/src/database/repository/mod.rs b/src/database/repository/mod.rs
new file mode 100644
index 0000000..777e435
--- /dev/null
+++ b/src/database/repository/mod.rs
@@ -0,0 +1,15 @@
+pub mod user;
+pub mod certificate;
+pub mod inbound_template;
+pub mod server;
+pub mod server_inbound;
+pub mod user_access;
+pub mod inbound_users;
+
+pub use user::UserRepository;
+pub use certificate::CertificateRepository;
+pub use inbound_template::InboundTemplateRepository;
+pub use server::ServerRepository;
+pub use server_inbound::ServerInboundRepository;
+pub use user_access::UserAccessRepository;
+pub use inbound_users::InboundUsersRepository;
\ No newline at end of file
diff --git a/src/database/repository/server.rs b/src/database/repository/server.rs
new file mode 100644
index 0000000..b8c38d2
--- /dev/null
+++ b/src/database/repository/server.rs
@@ -0,0 +1,79 @@
+use sea_orm::*;
+use crate::database::entities::{server, prelude::*};
+use anyhow::Result;
+use uuid::Uuid;
+
+#[derive(Clone)]
+pub struct ServerRepository {
+    db: DatabaseConnection,
+}
+
+#[allow(dead_code)]
+impl ServerRepository {
+    pub fn new(db: DatabaseConnection) -> Self {
+        Self { db }
+    }
+
+    pub async fn create(&self, server_data: server::CreateServerDto) -> Result<server::Model> {
+        let server = server::ActiveModel::from(server_data);
+
+        let result = Server::insert(server).exec(&self.db).await?;
+        
+        Server::find_by_id(result.last_insert_id)
+            .one(&self.db)
+            .await?
+            .ok_or_else(|| anyhow::anyhow!("Failed to retrieve created server"))
+    }
+
+    pub async fn find_all(&self) -> Result<Vec<server::Model>> {
+        Ok(Server::find().all(&self.db).await?)
+    }
+
+    pub async fn find_by_id(&self, id: Uuid) -> Result<Option<server::Model>> {
+        Ok(Server::find_by_id(id).one(&self.db).await?)
+    }
+
+    pub async fn find_by_name(&self, name: &str) -> Result<Option<server::Model>> {
+        Ok(Server::find()
+            .filter(server::Column::Name.eq(name))
+            .one(&self.db)
+            .await?)
+    }
+
+    pub async fn find_by_hostname(&self, hostname: &str) -> Result<Option<server::Model>> {
+        Ok(Server::find()
+            .filter(server::Column::Hostname.eq(hostname))
+            .one(&self.db)
+            .await?)
+    }
+
+    pub async fn find_by_status(&self, status: &str) -> Result<Vec<server::Model>> {
+        Ok(Server::find()
+            .filter(server::Column::Status.eq(status))
+            .all(&self.db)
+            .await?)
+    }
+
+    pub async fn update(&self, id: Uuid, server_data: server::UpdateServerDto) -> Result<server::Model> {
+        let server = Server::find_by_id(id)
+            .one(&self.db)
+            .await?
+            .ok_or_else(|| anyhow::anyhow!("Server not found"))?;
+
+        let updated_server = server.apply_update(server_data);
+
+        Ok(updated_server.update(&self.db).await?)
+    }
+
+    pub async fn delete(&self, id: Uuid) -> Result<bool> {
+        let result = Server::delete_by_id(id).exec(&self.db).await?;
+        Ok(result.rows_affected > 0)
+    }
+
+    pub async fn get_grpc_endpoint(&self, id: Uuid) -> Result<String> {
+        let server = self.find_by_id(id).await?
+            .ok_or_else(|| anyhow::anyhow!("Server not found"))?;
+        
+        Ok(format!("{}:{}", server.hostname, server.grpc_port))
+    }
+}
\ No newline at end of file
diff --git a/src/database/repository/server_inbound.rs b/src/database/repository/server_inbound.rs
new file mode 100644
index 0000000..7c6a860
--- /dev/null
+++ b/src/database/repository/server_inbound.rs
@@ -0,0 +1,159 @@
+use sea_orm::*;
+use crate::database::entities::{server_inbound, prelude::*};
+use anyhow::Result;
+use uuid::Uuid;
+
+#[derive(Clone)]
+pub struct ServerInboundRepository {
+    db: DatabaseConnection,
+}
+
+#[allow(dead_code)]
+impl ServerInboundRepository {
+    pub fn new(db: DatabaseConnection) -> Self {
+        Self { db }
+    }
+
+    pub async fn create(&self, server_id: Uuid, inbound_data: server_inbound::CreateServerInboundDto) -> Result<server_inbound::Model> {
+        let mut inbound: server_inbound::ActiveModel = inbound_data.into();
+        inbound.id = Set(Uuid::new_v4());
+        inbound.server_id = Set(server_id);
+        inbound.created_at = Set(chrono::Utc::now());
+        inbound.updated_at = Set(chrono::Utc::now());
+
+        let result = ServerInbound::insert(inbound).exec(&self.db).await?;
+        
+        ServerInbound::find_by_id(result.last_insert_id)
+            .one(&self.db)
+            .await?
+            .ok_or_else(|| anyhow::anyhow!("Failed to retrieve created server inbound"))
+    }
+
+    pub async fn create_with_protocol(&self, server_id: Uuid, inbound_data: server_inbound::CreateServerInboundDto, protocol: &str) -> Result<server_inbound::Model> {
+        let mut inbound: server_inbound::ActiveModel = inbound_data.into();
+        inbound.id = Set(Uuid::new_v4());
+        inbound.server_id = Set(server_id);
+        inbound.created_at = Set(chrono::Utc::now());
+        inbound.updated_at = Set(chrono::Utc::now());
+        
+        // Override tag with protocol prefix
+        let id = inbound.id.as_ref();
+        inbound.tag = Set(format!("{}-inbound-{}", protocol, id));
+
+        let result = ServerInbound::insert(inbound).exec(&self.db).await?;
+        
+        ServerInbound::find_by_id(result.last_insert_id)
+            .one(&self.db)
+            .await?
+            .ok_or_else(|| anyhow::anyhow!("Failed to retrieve created server inbound"))
+    }
+
+    pub async fn find_all(&self) -> Result<Vec<server_inbound::Model>> {
+        Ok(ServerInbound::find().all(&self.db).await?)
+    }
+
+    pub async fn find_by_id(&self, id: Uuid) -> Result<Option<server_inbound::Model>> {
+        Ok(ServerInbound::find_by_id(id).one(&self.db).await?)
+    }
+
+    pub async fn find_by_server_id(&self, server_id: Uuid) -> Result<Vec<server_inbound::Model>> {
+        Ok(ServerInbound::find()
+            .filter(server_inbound::Column::ServerId.eq(server_id))
+            .all(&self.db)
+            .await?)
+    }
+
+    pub async fn find_by_server_id_with_template(&self, server_id: Uuid) -> Result<Vec<server_inbound::ServerInboundResponse>> {
+        use crate::database::entities::{inbound_template, certificate};
+        
+        let inbounds = ServerInbound::find()
+            .filter(server_inbound::Column::ServerId.eq(server_id))
+            .all(&self.db)
+            .await?;
+
+        let mut responses = Vec::new();
+        for inbound in inbounds {
+            let mut response = server_inbound::ServerInboundResponse::from(inbound.clone());
+            
+            // Load template information
+            if let Ok(Some(template)) = InboundTemplate::find_by_id(inbound.template_id).one(&self.db).await {
+                response.template_name = Some(template.name);
+            }
+            
+            // Load certificate information
+            if let Some(cert_id) = inbound.certificate_id {
+                if let Ok(Some(certificate)) = Certificate::find_by_id(cert_id).one(&self.db).await {
+                    response.certificate_name = Some(certificate.domain);
+                }
+            }
+            
+            responses.push(response);
+        }
+
+        Ok(responses)
+    }
+
+    pub async fn find_by_template_id(&self, template_id: Uuid) -> Result<Vec<server_inbound::Model>> {
+        Ok(ServerInbound::find()
+            .filter(server_inbound::Column::TemplateId.eq(template_id))
+            .all(&self.db)
+            .await?)
+    }
+
+    pub async fn find_by_tag(&self, tag: &str) -> Result<Option<server_inbound::Model>> {
+        Ok(ServerInbound::find()
+            .filter(server_inbound::Column::Tag.eq(tag))
+            .one(&self.db)
+            .await?)
+    }
+
+    pub async fn find_active_by_server(&self, server_id: Uuid) -> Result<Vec<server_inbound::Model>> {
+        Ok(ServerInbound::find()
+            .filter(server_inbound::Column::ServerId.eq(server_id))
+            .filter(server_inbound::Column::IsActive.eq(true))
+            .all(&self.db)
+            .await?)
+    }
+
+    pub async fn update(&self, id: Uuid, inbound_data: server_inbound::UpdateServerInboundDto) -> Result<server_inbound::Model> {
+        let inbound = ServerInbound::find_by_id(id)
+            .one(&self.db)
+            .await?
+            .ok_or_else(|| anyhow::anyhow!("Server inbound not found"))?;
+
+        let updated_inbound = inbound.apply_update(inbound_data);
+
+        Ok(updated_inbound.update(&self.db).await?)
+    }
+
+    pub async fn delete(&self, id: Uuid) -> Result<bool> {
+        let result = ServerInbound::delete_by_id(id).exec(&self.db).await?;
+        Ok(result.rows_affected > 0)
+    }
+
+    pub async fn activate(&self, id: Uuid) -> Result<server_inbound::Model> {
+        let inbound = ServerInbound::find_by_id(id)
+            .one(&self.db)
+            .await?
+            .ok_or_else(|| anyhow::anyhow!("Server inbound not found"))?;
+
+        let mut inbound: server_inbound::ActiveModel = inbound.into();
+        inbound.is_active = Set(true);
+        inbound.updated_at = Set(chrono::Utc::now());
+
+        Ok(inbound.update(&self.db).await?)
+    }
+
+    pub async fn deactivate(&self, id: Uuid) -> Result<server_inbound::Model> {
+        let inbound = ServerInbound::find_by_id(id)
+            .one(&self.db)
+            .await?
+            .ok_or_else(|| anyhow::anyhow!("Server inbound not found"))?;
+
+        let mut inbound: server_inbound::ActiveModel = inbound.into();
+        inbound.is_active = Set(false);
+        inbound.updated_at = Set(chrono::Utc::now());
+
+        Ok(inbound.update(&self.db).await?)
+    }
+}
\ No newline at end of file
diff --git a/src/database/repository/user.rs b/src/database/repository/user.rs
new file mode 100644
index 0000000..f535c73
--- /dev/null
+++ b/src/database/repository/user.rs
@@ -0,0 +1,157 @@
+use anyhow::Result;
+use sea_orm::{DatabaseConnection, EntityTrait, QueryFilter, ColumnTrait, QueryOrder, PaginatorTrait};
+use uuid::Uuid;
+
+use crate::database::entities::user::{Entity as User, Column, Model, ActiveModel, CreateUserDto, UpdateUserDto};
+
+pub struct UserRepository {
+    db: DatabaseConnection,
+}
+
+impl UserRepository {
+    pub fn new(db: DatabaseConnection) -> Self {
+        Self { db }
+    }
+
+    /// Get all users with pagination
+    pub async fn get_all(&self, page: u64, per_page: u64) -> Result<Vec<Model>> {
+        let users = User::find()
+            .order_by_desc(Column::CreatedAt)
+            .paginate(&self.db, per_page)
+            .fetch_page(page.saturating_sub(1))
+            .await?;
+
+        Ok(users)
+    }
+
+    /// Get user by ID
+    pub async fn get_by_id(&self, id: Uuid) -> Result<Option<Model>> {
+        let user = User::find_by_id(id).one(&self.db).await?;
+        Ok(user)
+    }
+
+    /// Get user by telegram ID
+    pub async fn get_by_telegram_id(&self, telegram_id: i64) -> Result<Option<Model>> {
+        let user = User::find()
+            .filter(Column::TelegramId.eq(telegram_id))
+            .one(&self.db)
+            .await?;
+        Ok(user)
+    }
+
+    /// Search users by name
+    pub async fn search_by_name(&self, query: &str, page: u64, per_page: u64) -> Result<Vec<Model>> {
+        let users = User::find()
+            .filter(Column::Name.contains(query))
+            .order_by_desc(Column::CreatedAt)
+            .paginate(&self.db, per_page)
+            .fetch_page(page.saturating_sub(1))
+            .await?;
+
+        Ok(users)
+    }
+
+    /// Create a new user
+    pub async fn create(&self, dto: CreateUserDto) -> Result<Model> {
+        let active_model: ActiveModel = dto.into();
+        let user = User::insert(active_model).exec_with_returning(&self.db).await?;
+        Ok(user)
+    }
+
+    /// Update user by ID
+    pub async fn update(&self, id: Uuid, dto: UpdateUserDto) -> Result<Option<Model>> {
+        if let Some(user) = self.get_by_id(id).await? {
+            let active_model = user.apply_update(dto);
+            User::update(active_model).exec(&self.db).await?;
+            // Fetch the updated user
+            self.get_by_id(id).await
+        } else {
+            Ok(None)
+        }
+    }
+
+    /// Delete user by ID
+    pub async fn delete(&self, id: Uuid) -> Result<bool> {
+        let result = User::delete_by_id(id).exec(&self.db).await?;
+        Ok(result.rows_affected > 0)
+    }
+
+    /// Get total count of users
+    pub async fn count(&self) -> Result<u64> {
+        let count = User::find().count(&self.db).await?;
+        Ok(count)
+    }
+
+    /// Check if telegram ID is already used
+    pub async fn telegram_id_exists(&self, telegram_id: i64) -> Result<bool> {
+        let count = User::find()
+            .filter(Column::TelegramId.eq(telegram_id))
+            .count(&self.db)
+            .await?;
+        Ok(count > 0)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::database::DatabaseManager;
+    use crate::config::DatabaseConfig;
+
+    async fn setup_test_db() -> Result<UserRepository> {
+        let config = DatabaseConfig {
+            url: std::env::var("DATABASE_URL").unwrap_or_else(|_| 
+                "sqlite::memory:".to_string()
+            ),
+            max_connections: 5,
+            connection_timeout: 30,
+            auto_migrate: true,
+        };
+
+        let db_manager = DatabaseManager::new(&config).await?;
+        Ok(UserRepository::new(db_manager.connection().clone()))
+    }
+
+    #[tokio::test]
+    async fn test_user_crud() {
+        let repo = match setup_test_db().await {
+            Ok(repo) => repo,
+            Err(_) => return, // Skip test if no database available
+        };
+
+        // Create user
+        let create_dto = CreateUserDto {
+            name: "Test User".to_string(),
+            comment: Some("Test comment".to_string()),
+            telegram_id: Some(123456789),
+        };
+
+        let created_user = repo.create(create_dto).await.unwrap();
+        assert_eq!(created_user.name, "Test User");
+        assert_eq!(created_user.telegram_id, Some(123456789));
+
+        // Get by ID
+        let fetched_user = repo.get_by_id(created_user.id).await.unwrap();
+        assert!(fetched_user.is_some());
+        assert_eq!(fetched_user.unwrap().name, "Test User");
+
+        // Update user
+        let update_dto = UpdateUserDto {
+            name: Some("Updated User".to_string()),
+            comment: None,
+            telegram_id: None,
+        };
+
+        let updated_user = repo.update(created_user.id, update_dto).await.unwrap();
+        assert!(updated_user.is_some());
+        assert_eq!(updated_user.unwrap().name, "Updated User");
+
+        // Delete user
+        let deleted = repo.delete(created_user.id).await.unwrap();
+        assert!(deleted);
+
+        // Verify deletion
+        let deleted_user = repo.get_by_id(created_user.id).await.unwrap();
+        assert!(deleted_user.is_none());
+    }
+}
\ No newline at end of file
diff --git a/src/database/repository/user_access.rs b/src/database/repository/user_access.rs
new file mode 100644
index 0000000..63b5751
--- /dev/null
+++ b/src/database/repository/user_access.rs
@@ -0,0 +1,118 @@
+use sea_orm::*;
+use uuid::Uuid;
+use anyhow::Result;
+
+use crate::database::entities::user_access::{self, Entity as UserAccess, Model, ActiveModel, CreateUserAccessDto, UpdateUserAccessDto};
+
+pub struct UserAccessRepository {
+    db: DatabaseConnection,
+}
+
+impl UserAccessRepository {
+    pub fn new(db: DatabaseConnection) -> Self {
+        Self { db }
+    }
+
+    /// Find all user access records
+    pub async fn find_all(&self) -> Result<Vec<Model>> {
+        let records = UserAccess::find().all(&self.db).await?;
+        Ok(records)
+    }
+
+    /// Find user access by ID
+    pub async fn find_by_id(&self, id: Uuid) -> Result<Option<Model>> {
+        let record = UserAccess::find_by_id(id).one(&self.db).await?;
+        Ok(record)
+    }
+
+    /// Find user access by user ID
+    pub async fn find_by_user_id(&self, user_id: Uuid) -> Result<Vec<Model>> {
+        let records = UserAccess::find()
+            .filter(user_access::Column::UserId.eq(user_id))
+            .all(&self.db)
+            .await?;
+        Ok(records)
+    }
+
+    /// Find user access by server and inbound
+    pub async fn find_by_server_inbound(&self, server_id: Uuid, server_inbound_id: Uuid) -> Result<Vec<Model>> {
+        let records = UserAccess::find()
+            .filter(user_access::Column::ServerId.eq(server_id))
+            .filter(user_access::Column::ServerInboundId.eq(server_inbound_id))
+            .all(&self.db)
+            .await?;
+        Ok(records)
+    }
+
+    /// Find active user access for specific user, server and inbound
+    pub async fn find_active_access(&self, user_id: Uuid, server_id: Uuid, server_inbound_id: Uuid) -> Result<Option<Model>> {
+        let record = UserAccess::find()
+            .filter(user_access::Column::UserId.eq(user_id))
+            .filter(user_access::Column::ServerId.eq(server_id))
+            .filter(user_access::Column::ServerInboundId.eq(server_inbound_id))
+            .filter(user_access::Column::IsActive.eq(true))
+            .one(&self.db)
+            .await?;
+        Ok(record)
+    }
+
+    /// Create new user access
+    pub async fn create(&self, dto: CreateUserAccessDto) -> Result<Model> {
+        let active_model: ActiveModel = dto.into();
+        let model = active_model.insert(&self.db).await?;
+        Ok(model)
+    }
+
+    /// Update user access
+    pub async fn update(&self, id: Uuid, dto: UpdateUserAccessDto) -> Result<Option<Model>> {
+        let existing = match self.find_by_id(id).await? {
+            Some(model) => model,
+            None => return Ok(None),
+        };
+
+        let active_model = existing.apply_update(dto);
+        let updated = active_model.update(&self.db).await?;
+        Ok(Some(updated))
+    }
+
+    /// Delete user access
+    pub async fn delete(&self, id: Uuid) -> Result<bool> {
+        let result = UserAccess::delete_by_id(id).exec(&self.db).await?;
+        Ok(result.rows_affected > 0)
+    }
+
+    /// Enable user access (set is_active = true)
+    pub async fn enable(&self, id: Uuid) -> Result<Option<Model>> {
+        self.update(id, UpdateUserAccessDto {
+            is_active: Some(true),
+            level: None,
+        }).await
+    }
+
+    /// Disable user access (set is_active = false)
+    pub async fn disable(&self, id: Uuid) -> Result<Option<Model>> {
+        self.update(id, UpdateUserAccessDto {
+            is_active: Some(false),
+            level: None,
+        }).await
+    }
+
+    /// Get all active access for a user
+    pub async fn find_active_for_user(&self, user_id: Uuid) -> Result<Vec<Model>> {
+        let records = UserAccess::find()
+            .filter(user_access::Column::UserId.eq(user_id))
+            .filter(user_access::Column::IsActive.eq(true))
+            .all(&self.db)
+            .await?;
+        Ok(records)
+    }
+
+    /// Remove all access for a specific server inbound
+    pub async fn remove_all_for_inbound(&self, server_inbound_id: Uuid) -> Result<u64> {
+        let result = UserAccess::delete_many()
+            .filter(user_access::Column::ServerInboundId.eq(server_inbound_id))
+            .exec(&self.db)
+            .await?;
+        Ok(result.rows_affected)
+    }
+}
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
new file mode 100644
index 0000000..546dde3
--- /dev/null
+++ b/src/main.rs
@@ -0,0 +1,186 @@
+use anyhow::Result;
+use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
+
+mod config;
+mod database;
+mod services;
+mod web;
+
+use config::{AppConfig, args::parse_args};
+use database::DatabaseManager;
+use services::{TaskScheduler, XrayService};
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    // Parse command line arguments first
+    let args = parse_args();
+
+    // Initialize logging early with basic configuration
+    init_logging(&args.log_level.as_deref().unwrap_or("info"))?;
+
+    tracing::info!("Starting Xray Admin Panel v{}", env!("CARGO_PKG_VERSION"));
+
+    // Handle special flags
+    if args.print_default_config {
+        print_default_config()?;
+        return Ok(());
+    }
+
+    // Load configuration
+    let config = match AppConfig::load() {
+        Ok(config) => {
+            tracing::info!("Configuration loaded successfully");
+            config
+        }
+        Err(e) => {
+            tracing::error!("Failed to load configuration: {}", e);
+            if args.validate_config {
+                std::process::exit(1);
+            }
+            tracing::warn!("Using default configuration");
+            AppConfig::default()
+        }
+    };
+
+    // Validate configuration if requested
+    if args.validate_config {
+        tracing::info!("Configuration validation passed");
+        return Ok(());
+    }
+
+    // Display configuration summary
+    config.display_summary();
+
+    // Print environment info in debug mode
+    if tracing::level_enabled!(tracing::Level::DEBUG) {
+        config::env::EnvVars::print_env_info();
+    }
+
+
+    // Initialize database connection
+    tracing::info!("Initializing database connection...");
+    let db = match DatabaseManager::new(&config.database).await {
+        Ok(db) => {
+            tracing::info!("Database initialized successfully");
+            db
+        }
+        Err(e) => {
+            tracing::error!("Failed to initialize database: {}", e);
+            return Err(e);
+        }
+    };
+
+    // Perform database health check
+    match db.health_check().await {
+        Ok(true) => tracing::info!("Database health check passed"),
+        Ok(false) => tracing::warn!("Database health check failed"),
+        Err(e) => tracing::error!("Database health check error: {}", e),
+    }
+
+    // Get schema version
+    if let Ok(Some(version)) = db.get_schema_version().await {
+        tracing::info!("Database schema version: {}", version);
+    }
+
+    // Initialize event bus first
+    let event_receiver = crate::services::events::init_event_bus();
+    tracing::info!("Event bus initialized");
+
+    // Initialize xray service
+    let xray_service = XrayService::new();
+    
+    // Initialize and start task scheduler with dependencies
+    let mut task_scheduler = TaskScheduler::new().await?;
+    task_scheduler.start(db.clone(), xray_service).await?;
+    tracing::info!("Task scheduler started with xray sync");
+
+    // Start event-driven sync handler with the receiver
+    TaskScheduler::start_event_handler(db.clone(), event_receiver).await;
+    tracing::info!("Event-driven sync handler started");
+
+    // Start web server with task scheduler
+    tracing::info!("Starting web server on {}:{}", config.web.host, config.web.port);
+    
+    tokio::select! {
+        result = web::start_server(db, config.web.clone()) => {
+            match result {
+                Ok(_) => tracing::info!("Web server stopped gracefully"),
+                Err(e) => tracing::error!("Web server error: {}", e),
+            }
+        }
+        _ = tokio::signal::ctrl_c() => {
+            tracing::info!("Shutdown signal received, stopping services...");
+            if let Err(e) = task_scheduler.shutdown().await {
+                tracing::error!("Error shutting down task scheduler: {}", e);
+            }
+        }
+    }
+
+    Ok(())
+}
+
+fn init_logging(level: &str) -> Result<()> {
+    let filter = tracing_subscriber::EnvFilter::try_from_default_env()
+        .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(level));
+
+    tracing_subscriber::registry()
+        .with(filter)
+        .with(
+            tracing_subscriber::fmt::layer()
+                .with_target(true)  // Show module names
+                .with_thread_ids(false)
+                .with_thread_names(false)
+                .with_file(false)
+                .with_line_number(false)
+                .compact()
+        )
+        .try_init()?;
+
+    Ok(())
+}
+
+fn print_default_config() -> Result<()> {
+    let default_config = AppConfig::default();
+    let toml_content = toml::to_string_pretty(&default_config)?;
+    
+    println!("# Default configuration for Xray Admin Panel");
+    println!("# Save this to config.toml and modify as needed\n");
+    println!("{}", toml_content);
+    
+    Ok(())
+}
+
+#[allow(dead_code)]
+fn mask_url(url: &str) -> String {
+    if let Ok(parsed) = url::Url::parse(url) {
+        if parsed.password().is_some() {
+            let mut masked = parsed.clone();
+            masked.set_password(Some("***")).unwrap();
+            masked.to_string()
+        } else {
+            url.to_string()
+        }
+    } else {
+        url.to_string()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_mask_url() {
+        let url = "postgresql://user:password@localhost/db";
+        let masked = mask_url(url);
+        assert!(masked.contains("***"));
+        assert!(!masked.contains("password"));
+    }
+
+    #[test]
+    fn test_mask_url_no_password() {
+        let url = "postgresql://user@localhost/db";
+        let masked = mask_url(url);
+        assert_eq!(masked, url);
+    }
+}
\ No newline at end of file
diff --git a/src/services/certificates.rs b/src/services/certificates.rs
new file mode 100644
index 0000000..b1de12b
--- /dev/null
+++ b/src/services/certificates.rs
@@ -0,0 +1,41 @@
+/// Certificate management service
+#[derive(Clone)]
+pub struct CertificateService {
+    // Mock implementation for now
+}
+
+#[allow(dead_code)]
+impl CertificateService {
+    pub fn new() -> Self {
+        Self {}
+    }
+
+    /// Generate self-signed certificate
+    pub async fn generate_self_signed(&self, domain: &str) -> anyhow::Result<(String, String)> {
+        tracing::info!("Generating self-signed certificate for domain: {}", domain);
+        
+        // Mock implementation - would use rcgen to generate actual certificate
+        let cert_pem = format!("-----BEGIN CERTIFICATE-----\nMOCK CERT FOR {}\n-----END CERTIFICATE-----", domain);
+        let key_pem = format!("-----BEGIN PRIVATE KEY-----\nMOCK KEY FOR {}\n-----END PRIVATE KEY-----", domain);
+        
+        Ok((cert_pem, key_pem))
+    }
+
+
+    /// Renew certificate
+    pub async fn renew_certificate(&self, domain: &str) -> anyhow::Result<(String, String)> {
+        tracing::info!("Renewing certificate for domain: {}", domain);
+        
+        // Mock implementation
+        let cert_pem = format!("-----BEGIN CERTIFICATE-----\nRENEWED CERT FOR {}\n-----END CERTIFICATE-----", domain);
+        let key_pem = format!("-----BEGIN PRIVATE KEY-----\nRENEWED KEY FOR {}\n-----END PRIVATE KEY-----", domain);
+        
+        Ok((cert_pem, key_pem))
+    }
+}
+
+impl Default for CertificateService {
+    fn default() -> Self {
+        Self::new()
+    }
+}
\ No newline at end of file
diff --git a/src/services/events.rs b/src/services/events.rs
new file mode 100644
index 0000000..0e6ea31
--- /dev/null
+++ b/src/services/events.rs
@@ -0,0 +1,30 @@
+use std::sync::OnceLock;
+use tokio::sync::broadcast;
+use uuid::Uuid;
+
+#[derive(Clone, Debug)]
+pub enum SyncEvent {
+    InboundChanged(Uuid), // server_id
+    UserAccessChanged(Uuid), // server_id
+}
+
+static EVENT_SENDER: OnceLock<broadcast::Sender<SyncEvent>> = OnceLock::new();
+
+/// Initialize the event bus and return a receiver
+pub fn init_event_bus() -> broadcast::Receiver<SyncEvent> {
+    let (tx, rx) = broadcast::channel(100);
+    EVENT_SENDER.set(tx).expect("Event bus already initialized");
+    rx
+}
+
+/// Send a sync event (non-blocking)
+pub fn send_sync_event(event: SyncEvent) {
+    if let Some(sender) = EVENT_SENDER.get() {
+        match sender.send(event.clone()) {
+            Ok(_) => tracing::info!("Event sent: {:?}", event),
+            Err(_) => tracing::warn!("No event receivers"),
+        }
+    } else {
+        tracing::error!("Event bus not initialized");
+    }
+}
\ No newline at end of file
diff --git a/src/services/mod.rs b/src/services/mod.rs
new file mode 100644
index 0000000..c9dbee6
--- /dev/null
+++ b/src/services/mod.rs
@@ -0,0 +1,7 @@
+pub mod xray;
+pub mod certificates;
+pub mod events;
+pub mod tasks;
+
+pub use xray::XrayService;
+pub use tasks::TaskScheduler;
\ No newline at end of file
diff --git a/src/services/tasks.rs b/src/services/tasks.rs
new file mode 100644
index 0000000..29a9e92
--- /dev/null
+++ b/src/services/tasks.rs
@@ -0,0 +1,484 @@
+use anyhow::Result;
+use tokio_cron_scheduler::{JobScheduler, Job};
+use tracing::{info, error, warn};
+use crate::database::DatabaseManager;
+use crate::database::repository::{ServerRepository, ServerInboundRepository, InboundTemplateRepository, InboundUsersRepository, CertificateRepository};
+use crate::database::entities::inbound_users;
+use crate::services::XrayService;
+use crate::services::events::SyncEvent;
+use sea_orm::{EntityTrait, ColumnTrait, QueryFilter, RelationTrait, JoinType};
+use uuid::Uuid;
+use serde_json::Value;
+use std::collections::HashMap;
+use std::sync::{Arc, RwLock};
+use chrono::{DateTime, Utc};
+use serde::{Serialize, Deserialize};
+
+pub struct TaskScheduler {
+    scheduler: JobScheduler,
+    task_status: Arc<RwLock<HashMap<String, TaskStatus>>>,
+}
+
+/// Status of a background task
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TaskStatus {
+    pub name: String,
+    pub description: String,
+    pub schedule: String,
+    pub status: TaskState,
+    pub last_run: Option<DateTime<Utc>>,
+    pub next_run: Option<DateTime<Utc>>,
+    pub total_runs: u64,
+    pub success_count: u64,
+    pub error_count: u64,
+    pub last_error: Option<String>,
+    pub last_duration_ms: Option<u64>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum TaskState {
+    Idle,
+    Running,
+    Success,
+    Error,
+}
+
+impl TaskScheduler {
+    pub async fn new() -> Result<Self> {
+        let scheduler = JobScheduler::new().await?;
+        let task_status = Arc::new(RwLock::new(HashMap::new()));
+        Ok(Self { scheduler, task_status })
+    }
+
+    /// Get current status of all tasks
+    pub fn get_task_status(&self) -> HashMap<String, TaskStatus> {
+        self.task_status.read().unwrap().clone()
+    }
+
+    /// Start event-driven sync handler
+    pub async fn start_event_handler(db: DatabaseManager, mut event_receiver: tokio::sync::broadcast::Receiver<SyncEvent>) {
+        let xray_service = XrayService::new();
+        
+        tokio::spawn(async move {
+            info!("Starting event-driven sync handler");
+            
+            while let Ok(event) = event_receiver.recv().await {
+                match event {
+                    SyncEvent::InboundChanged(server_id) | SyncEvent::UserAccessChanged(server_id) => {
+                        info!("Received sync event for server {}", server_id);
+                        
+                        if let Err(e) = sync_single_server_by_id(&xray_service, &db, server_id).await {
+                            error!("Failed to sync server {} from event: {}", server_id, e);
+                        } else {
+                            info!("Successfully synced server {} from event", server_id);
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+    pub async fn start(&mut self, db: DatabaseManager, xray_service: XrayService) -> Result<()> {
+        info!("Starting task scheduler with database synchronization");
+        
+        // Initialize task status
+        {
+            let mut status = self.task_status.write().unwrap();
+            status.insert("xray_sync".to_string(), TaskStatus {
+                name: "Xray Synchronization".to_string(),
+                description: "Synchronizes database state with xray servers".to_string(),
+                schedule: "0 * * * * * (every minute)".to_string(),
+                status: TaskState::Idle,
+                last_run: None,
+                next_run: Some(Utc::now() + chrono::Duration::minutes(1)),
+                total_runs: 0,
+                success_count: 0,
+                error_count: 0,
+                last_error: None,
+                last_duration_ms: None,
+            });
+        }
+        
+        // Run initial sync on startup
+        info!("Running initial xray synchronization on startup");
+        let start_time = Utc::now();
+        self.update_task_status("xray_sync", TaskState::Running, None);
+        
+        match sync_xray_state(db.clone(), xray_service.clone()).await {
+            Ok(_) => {
+                let duration = (Utc::now() - start_time).num_milliseconds() as u64;
+                self.update_task_status("xray_sync", TaskState::Success, Some(duration));
+                info!("Initial xray sync completed successfully");
+            },
+            Err(e) => {
+                let duration = (Utc::now() - start_time).num_milliseconds() as u64;
+                self.update_task_status_with_error("xray_sync", e.to_string(), Some(duration));
+                error!("Initial xray sync failed: {}", e);
+            }
+        }
+        
+        // Add synchronization task that runs every minute
+        let db_clone = db.clone();
+        let xray_service_clone = xray_service.clone();
+        let task_status_clone = self.task_status.clone();
+        
+        let sync_job = Job::new_async("0 */5 * * * *", move |_uuid, _l| {
+            let db = db_clone.clone();
+            let xray_service = xray_service_clone.clone();
+            let task_status = task_status_clone.clone();
+            
+            Box::pin(async move {
+                info!("Running scheduled xray synchronization");
+                let start_time = Utc::now();
+                
+                // Update status to running
+                {
+                    let mut status = task_status.write().unwrap();
+                    if let Some(task) = status.get_mut("xray_sync") {
+                        task.status = TaskState::Running;
+                        task.last_run = Some(start_time);
+                        task.total_runs += 1;
+                        task.next_run = Some(start_time + chrono::Duration::minutes(1));
+                    }
+                }
+                
+                match sync_xray_state(db, xray_service).await {
+                    Ok(_) => {
+                        let duration = (Utc::now() - start_time).num_milliseconds() as u64;
+                        let mut status = task_status.write().unwrap();
+                        if let Some(task) = status.get_mut("xray_sync") {
+                            task.status = TaskState::Success;
+                            task.success_count += 1;
+                            task.last_duration_ms = Some(duration);
+                            task.last_error = None;
+                        }
+                        info!("Scheduled xray sync completed successfully in {}ms", duration);
+                    },
+                    Err(e) => {
+                        let duration = (Utc::now() - start_time).num_milliseconds() as u64;
+                        let mut status = task_status.write().unwrap();
+                        if let Some(task) = status.get_mut("xray_sync") {
+                            task.status = TaskState::Error;
+                            task.error_count += 1;
+                            task.last_duration_ms = Some(duration);
+                            task.last_error = Some(e.to_string());
+                        }
+                        error!("Scheduled xray sync failed: {}", e);
+                    }
+                }
+            })
+        })?;
+        
+        self.scheduler.add(sync_job).await?;
+        
+        info!("Task scheduler started with sync job running every minute");
+        
+        self.scheduler.start().await?;
+        Ok(())
+    }
+
+    fn update_task_status(&self, task_id: &str, state: TaskState, duration_ms: Option<u64>) {
+        let mut status = self.task_status.write().unwrap();
+        if let Some(task) = status.get_mut(task_id) {
+            task.status = state;
+            task.last_run = Some(Utc::now());
+            task.total_runs += 1;
+            task.success_count += 1;
+            task.last_duration_ms = duration_ms;
+            task.last_error = None;
+        }
+    }
+
+    fn update_task_status_with_error(&self, task_id: &str, error: String, duration_ms: Option<u64>) {
+        let mut status = self.task_status.write().unwrap();
+        if let Some(task) = status.get_mut(task_id) {
+            task.status = TaskState::Error;
+            task.last_run = Some(Utc::now());
+            task.total_runs += 1;
+            task.error_count += 1;
+            task.last_duration_ms = duration_ms;
+            task.last_error = Some(error);
+        }
+    }
+
+    pub async fn shutdown(&mut self) -> Result<()> {
+        info!("Shutting down task scheduler");
+        self.scheduler.shutdown().await?;
+        Ok(())
+    }
+}
+
+/// Synchronize xray server state with database state
+async fn sync_xray_state(db: DatabaseManager, xray_service: XrayService) -> Result<()> {
+    info!("Starting xray state synchronization");
+    
+    let server_repo = ServerRepository::new(db.connection().clone());
+    let inbound_repo = ServerInboundRepository::new(db.connection().clone());
+    let template_repo = InboundTemplateRepository::new(db.connection().clone());
+    
+    // Get all servers from database
+    let servers = match server_repo.find_all().await {
+        Ok(servers) => servers,
+        Err(e) => {
+            error!("Failed to fetch servers: {}", e);
+            return Err(e.into());
+        }
+    };
+    
+    info!("Found {} servers to synchronize", servers.len());
+    
+    for server in servers {
+        info!("Synchronizing server: {} ({}:{})", server.name, server.hostname, server.grpc_port);
+        
+        let endpoint = format!("{}:{}", server.hostname, server.grpc_port);
+        
+        // Test connection first
+        match xray_service.test_connection(server.id, &endpoint).await {
+            Ok(true) => {
+                info!("Connection to server {} successful", server.name);
+            },
+            Ok(false) => {
+                warn!("Cannot connect to server {} at {}, skipping", server.name, endpoint);
+                continue;
+            },
+            Err(e) => {
+                error!("Error testing connection to server {}: {}", server.name, e);
+                continue;
+            }
+        }
+        
+        // Get desired inbounds from database
+        let desired_inbounds = match get_desired_inbounds_from_db(&db, &server, &inbound_repo, &template_repo).await {
+            Ok(inbounds) => inbounds,
+            Err(e) => {
+                error!("Failed to get desired inbounds for server {}: {}", server.name, e);
+                continue;
+            }
+        };
+        
+        info!("Server {}: desired={} inbounds", server.name, desired_inbounds.len());
+        
+        // Synchronize inbounds
+        if let Err(e) = sync_server_inbounds(
+            &xray_service, 
+            server.id, 
+            &endpoint, 
+            &desired_inbounds
+        ).await {
+            error!("Failed to sync inbounds for server {}: {}", server.name, e);
+        } else {
+            info!("Successfully synchronized server {}", server.name);
+        }
+    }
+    
+    info!("Xray state synchronization completed");
+    Ok(())
+}
+
+
+/// Get desired inbounds configuration from database
+async fn get_desired_inbounds_from_db(
+    db: &DatabaseManager,
+    server: &crate::database::entities::server::Model,
+    inbound_repo: &ServerInboundRepository,
+    template_repo: &InboundTemplateRepository,
+) -> Result<HashMap<String, DesiredInbound>> {
+    info!("Getting desired inbounds for server {} from database", server.name);
+    
+    // Get all inbounds for this server
+    let inbounds = inbound_repo.find_by_server_id(server.id).await?;
+    let mut desired_inbounds = HashMap::new();
+    
+    for inbound in inbounds {
+        // Get template for this inbound
+        let template = match template_repo.find_by_id(inbound.template_id).await? {
+            Some(template) => template,
+            None => {
+                warn!("Template {} not found for inbound {}, skipping", inbound.template_id, inbound.tag);
+                continue;
+            }
+        };
+        
+        // Get users for this inbound
+        let users = get_users_for_inbound(db, inbound.id).await?;
+        
+        info!("Inbound {}: {} users found", inbound.tag, users.len());
+        
+        // Get port from template or override
+        let port = inbound.port_override.unwrap_or(template.default_port);
+        
+        // Get certificate if specified
+        let (cert_pem, key_pem) = if let Some(_cert_id) = inbound.certificate_id {
+            match load_certificate_from_db(db, inbound.certificate_id).await {
+                Ok((cert, key)) => (cert, key),
+                Err(e) => {
+                    warn!("Failed to load certificate for inbound {}: {}", inbound.tag, e);
+                    (None, None)
+                }
+            }
+        } else {
+            (None, None)
+        };
+        
+        let desired_inbound = DesiredInbound {
+            tag: inbound.tag.clone(),
+            port,
+            protocol: template.protocol.clone(),
+            settings: template.base_settings.clone(),
+            stream_settings: template.stream_settings.clone(),
+            users,
+            cert_pem,
+            key_pem,
+        };
+        
+        desired_inbounds.insert(inbound.tag.clone(), desired_inbound);
+    }
+    
+    info!("Found {} desired inbounds for server {}", desired_inbounds.len(), server.name);
+    Ok(desired_inbounds)
+}
+
+/// Get users for specific inbound from database
+async fn get_users_for_inbound(db: &DatabaseManager, inbound_id: Uuid) -> Result<Vec<XrayUser>> {
+    let inbound_users_repo = InboundUsersRepository::new(db.connection().clone());
+    
+    let inbound_users = inbound_users_repo.find_active_by_inbound_id(inbound_id).await?;
+    
+    let users: Vec<XrayUser> = inbound_users.into_iter().map(|user| {
+        XrayUser {
+            id: user.xray_user_id,
+            email: user.email,
+            level: user.level,
+        }
+    }).collect();
+    
+    Ok(users)
+}
+
+/// Load certificate from database
+async fn load_certificate_from_db(db: &DatabaseManager, cert_id: Option<Uuid>) -> Result<(Option<String>, Option<String>)> {
+    let cert_id = match cert_id {
+        Some(id) => id,
+        None => return Ok((None, None)),
+    };
+    
+    let cert_repo = CertificateRepository::new(db.connection().clone());
+    
+    match cert_repo.find_by_id(cert_id).await? {
+        Some(cert) => {
+            info!("Loaded certificate: {}", cert.domain);
+            Ok((Some(cert.certificate_pem()), Some(cert.private_key_pem())))
+        },
+        None => {
+            warn!("Certificate {} not found", cert_id);
+            Ok((None, None))
+        }
+    }
+}
+
+/// Synchronize inbounds for a single server
+async fn sync_server_inbounds(
+    xray_service: &XrayService,
+    server_id: Uuid,
+    endpoint: &str,
+    desired_inbounds: &HashMap<String, DesiredInbound>,
+) -> Result<()> {
+    
+    // Create or update inbounds
+    // Since xray has no API to list inbounds, we always recreate them
+    for (tag, desired) in desired_inbounds {
+        info!("Creating/updating inbound: {} with {} users", tag, desired.users.len());
+        
+        // Always try to remove inbound first (ignore errors if it doesn't exist)
+        if let Err(e) = xray_service.remove_inbound(server_id, endpoint, tag).await {
+            // Log but don't fail - inbound might not exist
+            info!("Inbound {} removal result: {} (this is normal if inbound didn't exist)", tag, e);
+        }
+        
+        // Create inbound with users
+        let users_json: Vec<Value> = desired.users.iter().map(|user| {
+            serde_json::json!({
+                "id": user.id,
+                "email": user.email,
+                "level": user.level
+            })
+        }).collect();
+        
+        match xray_service.create_inbound_with_users(
+            server_id,
+            endpoint,
+            &desired.tag,
+            desired.port,
+            &desired.protocol,
+            desired.settings.clone(),
+            desired.stream_settings.clone(),
+            &users_json,
+            desired.cert_pem.as_deref(),
+            desired.key_pem.as_deref(),
+        ).await {
+            Ok(_) => {
+                info!("Successfully created inbound {} with {} users", tag, desired.users.len());
+            },
+            Err(e) => {
+                error!("Failed to create inbound {}: {}", tag, e);
+            }
+        }
+    }
+    
+    Ok(())
+}
+
+/// Sync a single server by ID (for event-driven sync)
+async fn sync_single_server_by_id(
+    xray_service: &XrayService,
+    db: &DatabaseManager,
+    server_id: Uuid,
+) -> Result<()> {
+    let server_repo = ServerRepository::new(db.connection().clone());
+    let inbound_repo = ServerInboundRepository::new(db.connection().clone());
+    let template_repo = InboundTemplateRepository::new(db.connection().clone());
+    
+    // Get server
+    let server = match server_repo.find_by_id(server_id).await? {
+        Some(server) => server,
+        None => {
+            warn!("Server {} not found for sync", server_id);
+            return Ok(());
+        }
+    };
+    
+    // For now, sync all servers (can add active/inactive flag later)
+    
+    // Get desired inbounds from database
+    let desired_inbounds = get_desired_inbounds_from_db(db, &server, &inbound_repo, &template_repo).await?;
+    
+    // Build endpoint
+    let endpoint = format!("{}:{}", server.hostname, server.grpc_port);
+    
+    // Sync server
+    sync_server_inbounds(xray_service, server_id, &endpoint, &desired_inbounds).await?;
+    
+    Ok(())
+}
+
+
+/// Represents desired inbound configuration from database
+#[derive(Debug, Clone)]
+struct DesiredInbound {
+    tag: String,
+    port: i32,
+    protocol: String,
+    settings: Value,
+    stream_settings: Value,
+    users: Vec<XrayUser>,
+    cert_pem: Option<String>,
+    key_pem: Option<String>,
+}
+
+/// Represents xray user configuration
+#[derive(Debug, Clone)]
+struct XrayUser {
+    id: String,
+    email: String,
+    level: i32,
+}
\ No newline at end of file
diff --git a/src/services/xray/client.rs b/src/services/xray/client.rs
new file mode 100644
index 0000000..0b604e6
--- /dev/null
+++ b/src/services/xray/client.rs
@@ -0,0 +1,91 @@
+use anyhow::{Result, anyhow};
+use serde_json::Value;
+use xray_core::Client;
+
+// Import submodules from the same directory
+use super::stats::StatsClient;
+use super::inbounds::InboundClient;
+use super::users::UserClient;
+
+/// Xray gRPC client wrapper
+pub struct XrayClient {
+    endpoint: String,
+    client: Client,
+}
+
+#[allow(dead_code)]
+impl XrayClient {
+    /// Connect to Xray gRPC server
+    pub async fn connect(endpoint: &str) -> Result<Self> {
+        tracing::info!("Connecting to Xray at {}", endpoint);
+        
+        let client = Client::from_url(endpoint).await
+            .map_err(|e| anyhow!("Failed to connect to Xray at {}: {}", endpoint, e))?;
+
+        // Don't clone - we'll use &self.client when calling methods
+
+        Ok(Self {
+            endpoint: endpoint.to_string(),
+            client,
+        })
+    }
+
+    /// Get server statistics
+    pub async fn get_stats(&self) -> Result<Value> {
+        let stats_client = StatsClient::new(self.endpoint.clone(), &self.client);
+        stats_client.get_stats().await
+    }
+
+    /// Query specific statistics with pattern
+    pub async fn query_stats(&self, pattern: &str, reset: bool) -> Result<Value> {
+        let stats_client = StatsClient::new(self.endpoint.clone(), &self.client);
+        stats_client.query_stats(pattern, reset).await
+    }
+
+    /// Restart Xray with new configuration
+    pub async fn restart_with_config(&self, config: &crate::services::xray::XrayConfig) -> Result<()> {
+        let inbound_client = InboundClient::new(self.endpoint.clone(), &self.client);
+        inbound_client.restart_with_config(config).await
+    }
+
+    /// Add inbound configuration
+    pub async fn add_inbound(&self, inbound: &Value) -> Result<()> {
+        let inbound_client = InboundClient::new(self.endpoint.clone(), &self.client);
+        inbound_client.add_inbound(inbound).await
+    }
+
+    /// Add inbound configuration with TLS certificate
+    pub async fn add_inbound_with_certificate(&self, inbound: &Value, cert_pem: Option<&str>, key_pem: Option<&str>) -> Result<()> {
+        let inbound_client = InboundClient::new(self.endpoint.clone(), &self.client);
+        inbound_client.add_inbound_with_certificate(inbound, None, cert_pem, key_pem).await
+    }
+
+    /// Add inbound configuration with users and TLS certificate
+    pub async fn add_inbound_with_users_and_certificate(&self, inbound: &Value, users: &[Value], cert_pem: Option<&str>, key_pem: Option<&str>) -> Result<()> {
+        let inbound_client = InboundClient::new(self.endpoint.clone(), &self.client);
+        inbound_client.add_inbound_with_certificate(inbound, Some(users), cert_pem, key_pem).await
+    }
+
+    /// Remove inbound by tag
+    pub async fn remove_inbound(&self, tag: &str) -> Result<()> {
+        let inbound_client = InboundClient::new(self.endpoint.clone(), &self.client);
+        inbound_client.remove_inbound(tag).await
+    }
+
+    /// Add user to inbound
+    pub async fn add_user(&self, inbound_tag: &str, user: &Value) -> Result<()> {
+        let user_client = UserClient::new(self.endpoint.clone(), &self.client);
+        user_client.add_user(inbound_tag, user).await
+    }
+
+    /// Remove user from inbound
+    pub async fn remove_user(&self, inbound_tag: &str, email: &str) -> Result<()> {
+        let user_client = UserClient::new(self.endpoint.clone(), &self.client);
+        user_client.remove_user(inbound_tag, email).await
+    }
+
+    /// Get connection endpoint
+    pub fn endpoint(&self) -> &str {
+        &self.endpoint
+    }
+}
\ No newline at end of file
diff --git a/src/services/xray/config.rs b/src/services/xray/config.rs
new file mode 100644
index 0000000..d4d292d
--- /dev/null
+++ b/src/services/xray/config.rs
@@ -0,0 +1,285 @@
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use std::collections::HashMap;
+
+/// Xray configuration structure
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct XrayConfig {
+    pub log: LogConfig,
+    pub api: ApiConfig,
+    pub dns: Option<DnsConfig>,
+    pub routing: Option<RoutingConfig>,
+    pub policy: Option<PolicyConfig>,
+    pub inbounds: Vec<InboundConfig>,
+    pub outbounds: Vec<OutboundConfig>,
+    pub transport: Option<TransportConfig>,
+    pub stats: Option<StatsConfig>,
+    pub reverse: Option<ReverseConfig>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct LogConfig {
+    pub access: Option<String>,
+    pub error: Option<String>,
+    #[serde(rename = "loglevel")]
+    pub log_level: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ApiConfig {
+    pub tag: String,
+    pub listen: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DnsConfig {
+    pub servers: Vec<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct RoutingConfig {
+    #[serde(rename = "domainStrategy")]
+    pub domain_strategy: Option<String>,
+    pub rules: Vec<RoutingRule>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct RoutingRule {
+    #[serde(rename = "type")]
+    pub rule_type: String,
+    pub domain: Option<Vec<String>>,
+    pub ip: Option<Vec<String>>,
+    pub port: Option<String>,
+    #[serde(rename = "outboundTag")]
+    pub outbound_tag: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PolicyConfig {
+    pub levels: HashMap<String, PolicyLevel>,
+    pub system: Option<SystemPolicy>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PolicyLevel {
+    #[serde(rename = "handshakeTimeout")]
+    pub handshake_timeout: Option<u32>,
+    #[serde(rename = "connIdle")]
+    pub conn_idle: Option<u32>,
+    #[serde(rename = "uplinkOnly")]
+    pub uplink_only: Option<u32>,
+    #[serde(rename = "downlinkOnly")]
+    pub downlink_only: Option<u32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SystemPolicy {
+    #[serde(rename = "statsInboundUplink")]
+    pub stats_inbound_uplink: Option<bool>,
+    #[serde(rename = "statsInboundDownlink")]
+    pub stats_inbound_downlink: Option<bool>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct InboundConfig {
+    pub tag: String,
+    pub port: u16,
+    pub listen: Option<String>,
+    pub protocol: String,
+    pub settings: Value,
+    #[serde(rename = "streamSettings")]
+    pub stream_settings: Option<Value>,
+    pub sniffing: Option<SniffingConfig>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OutboundConfig {
+    pub tag: String,
+    pub protocol: String,
+    pub settings: Value,
+    #[serde(rename = "streamSettings")]
+    pub stream_settings: Option<Value>,
+    pub mux: Option<MuxConfig>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SniffingConfig {
+    pub enabled: bool,
+    #[serde(rename = "destOverride")]
+    pub dest_override: Vec<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct MuxConfig {
+    pub enabled: bool,
+    pub concurrency: Option<i32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TransportConfig {
+    #[serde(rename = "tcpSettings")]
+    pub tcp_settings: Option<Value>,
+    #[serde(rename = "kcpSettings")]
+    pub kcp_settings: Option<Value>,
+    #[serde(rename = "wsSettings")]
+    pub ws_settings: Option<Value>,
+    #[serde(rename = "httpSettings")]
+    pub http_settings: Option<Value>,
+    #[serde(rename = "dsSettings")]
+    pub ds_settings: Option<Value>,
+    #[serde(rename = "quicSettings")]
+    pub quic_settings: Option<Value>,
+    #[serde(rename = "grpcSettings")]
+    pub grpc_settings: Option<Value>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct StatsConfig {}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ReverseConfig {
+    pub bridges: Option<Vec<BridgeConfig>>,
+    pub portals: Option<Vec<PortalConfig>>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct BridgeConfig {
+    pub tag: String,
+    pub domain: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PortalConfig {
+    pub tag: String,
+    pub domain: String,
+}
+
+#[allow(dead_code)]
+impl XrayConfig {
+    /// Create a new basic Xray configuration
+    pub fn new() -> Self {
+        Self {
+            log: LogConfig {
+                access: Some("/var/log/xray/access.log".to_string()),
+                error: Some("/var/log/xray/error.log".to_string()),
+                log_level: "warning".to_string(),
+            },
+            api: ApiConfig {
+                tag: "api".to_string(),
+                listen: "127.0.0.1:2053".to_string(),
+            },
+            dns: None,
+            routing: Some(RoutingConfig {
+                domain_strategy: Some("IPIfNonMatch".to_string()),
+                rules: vec![
+                    RoutingRule {
+                        rule_type: "field".to_string(),
+                        domain: None,
+                        ip: Some(vec!["geoip:private".to_string()]),
+                        port: None,
+                        outbound_tag: "direct".to_string(),
+                    }
+                ],
+            }),
+            policy: Some(PolicyConfig {
+                levels: {
+                    let mut levels = HashMap::new();
+                    levels.insert("0".to_string(), PolicyLevel {
+                        handshake_timeout: Some(4),
+                        conn_idle: Some(300),
+                        uplink_only: Some(2),
+                        downlink_only: Some(5),
+                    });
+                    levels
+                },
+                system: Some(SystemPolicy {
+                    stats_inbound_uplink: Some(true),
+                    stats_inbound_downlink: Some(true),
+                }),
+            }),
+            inbounds: vec![],
+            outbounds: vec![
+                OutboundConfig {
+                    tag: "direct".to_string(),
+                    protocol: "freedom".to_string(),
+                    settings: serde_json::json!({}),
+                    stream_settings: None,
+                    mux: None,
+                },
+                OutboundConfig {
+                    tag: "blocked".to_string(),
+                    protocol: "blackhole".to_string(),
+                    settings: serde_json::json!({
+                        "response": {
+                            "type": "http"
+                        }
+                    }),
+                    stream_settings: None,
+                    mux: None,
+                },
+            ],
+            transport: None,
+            stats: Some(StatsConfig {}),
+            reverse: None,
+        }
+    }
+
+    /// Add inbound to configuration
+    pub fn add_inbound(&mut self, inbound: InboundConfig) {
+        self.inbounds.push(inbound);
+    }
+
+    /// Remove inbound by tag
+    pub fn remove_inbound(&mut self, tag: &str) -> bool {
+        let initial_len = self.inbounds.len();
+        self.inbounds.retain(|inbound| inbound.tag != tag);
+        self.inbounds.len() != initial_len
+    }
+
+    /// Find inbound by tag
+    pub fn find_inbound(&self, tag: &str) -> Option<&InboundConfig> {
+        self.inbounds.iter().find(|inbound| inbound.tag == tag)
+    }
+
+    /// Find inbound by tag (mutable)
+    pub fn find_inbound_mut(&mut self, tag: &str) -> Option<&mut InboundConfig> {
+        self.inbounds.iter_mut().find(|inbound| inbound.tag == tag)
+    }
+
+    /// Convert to JSON Value
+    pub fn to_json(&self) -> Value {
+        serde_json::to_value(self).unwrap_or(Value::Null)
+    }
+
+    /// Create from JSON Value
+    pub fn from_json(value: &Value) -> Result<Self, serde_json::Error> {
+        serde_json::from_value(value.clone())
+    }
+
+    /// Validate configuration
+    pub fn validate(&self) -> Result<(), String> {
+        // Check for duplicate inbound tags
+        let mut tags = std::collections::HashSet::new();
+        for inbound in &self.inbounds {
+            if !tags.insert(&inbound.tag) {
+                return Err(format!("Duplicate inbound tag: {}", inbound.tag));
+            }
+        }
+
+        // Check for duplicate outbound tags
+        tags.clear();
+        for outbound in &self.outbounds {
+            if !tags.insert(&outbound.tag) {
+                return Err(format!("Duplicate outbound tag: {}", outbound.tag));
+            }
+        }
+
+        Ok(())
+    }
+}
+
+impl Default for XrayConfig {
+    fn default() -> Self {
+        Self::new()
+    }
+}
\ No newline at end of file
diff --git a/src/services/xray/inbounds.rs b/src/services/xray/inbounds.rs
new file mode 100644
index 0000000..9833e56
--- /dev/null
+++ b/src/services/xray/inbounds.rs
@@ -0,0 +1,325 @@
+use anyhow::{Result, anyhow};
+use serde_json::Value;
+use xray_core::{
+    tonic::Request,
+    app::proxyman::command::{AddInboundRequest, RemoveInboundRequest},
+    core::InboundHandlerConfig,
+    common::serial::TypedMessage,
+    common::protocol::User,
+    app::proxyman::ReceiverConfig,
+    common::net::{PortList, PortRange},
+    transport::internet::StreamConfig,
+    transport::internet::tls::{Config as TlsConfig, Certificate as TlsCertificate},
+    proxy::vless::inbound::Config as VlessInboundConfig,
+    proxy::vless::Account as VlessAccount,
+    proxy::vmess::inbound::Config as VmessInboundConfig,
+    proxy::vmess::Account as VmessAccount,
+    proxy::trojan::ServerConfig as TrojanServerConfig,
+    proxy::trojan::Account as TrojanAccount,
+    proxy::shadowsocks::ServerConfig as ShadowsocksServerConfig,
+    proxy::shadowsocks::Account as ShadowsocksAccount,
+    Client,
+    prost_types,
+};
+use prost::Message;
+
+pub struct InboundClient<'a> {
+    endpoint: String,
+    client: &'a Client,
+}
+
+impl<'a> InboundClient<'a> {
+    pub fn new(endpoint: String, client: &'a Client) -> Self {
+        Self { endpoint, client }
+    }
+
+    /// Add inbound configuration
+    pub async fn add_inbound(&self, inbound: &Value) -> Result<()> {
+        self.add_inbound_with_certificate(inbound, None, None, None).await
+    }
+
+    /// Add inbound configuration with TLS certificate and users
+    pub async fn add_inbound_with_certificate(&self, inbound: &Value, users: Option<&[Value]>, cert_pem: Option<&str>, key_pem: Option<&str>) -> Result<()> {
+        tracing::info!("Adding inbound to Xray server at {}", self.endpoint);
+        tracing::debug!("Inbound config: {}", serde_json::to_string_pretty(inbound)?);
+        
+        let tag = inbound["tag"].as_str().unwrap_or("").to_string();
+        let port = inbound["port"].as_u64().unwrap_or(8080) as u32;
+        let protocol = inbound["protocol"].as_str().unwrap_or("vless");
+        
+        tracing::debug!("Creating inbound: tag={}, port={}, protocol={}", tag, port, protocol);
+        
+        // Create receiver configuration (port binding) - use simple port number
+        let port_list = PortList {
+            range: vec![PortRange {
+                from: port,
+                to: port,
+            }],
+        };
+
+        // Create stream settings with TLS if certificates are provided
+        let stream_settings = if cert_pem.is_some() && key_pem.is_some() {
+            let cert_pem = cert_pem.unwrap();
+            let key_pem = key_pem.unwrap();
+            
+            tracing::info!("Creating TLS stream settings for inbound");
+            tracing::debug!("Certificate length: {}, Key length: {}", cert_pem.len(), key_pem.len());
+            
+            // Create TLS certificate with OneTimeLoading = true
+            // Convert PEM strings to byte vectors (certificate should be raw bytes, not PEM string)
+            let tls_cert = TlsCertificate {
+                certificate: cert_pem.as_bytes().to_vec(), // PEM as bytes
+                key: key_pem.as_bytes().to_vec(), // PEM key as bytes
+                usage: 0, // Default usage
+                ocsp_stapling: 0, // Default OCSP
+                one_time_loading: true, // OneTimeLoading = true as in example
+                build_chain: false,
+                certificate_path: "".to_string(),
+                key_path: "".to_string(),
+            };
+            
+            // Create TLS config using Default and set only necessary fields
+            let mut tls_config = TlsConfig::default();
+            tls_config.certificate = vec![tls_cert];
+            
+            // Create TLS security settings using prost_types::Any instead of TypedMessage
+            let tls_any = prost_types::Any::from_msg(&tls_config)
+                .map_err(|e| anyhow!("Failed to serialize TLS config: {}", e))?;
+            
+            let tls_message = TypedMessage {
+                r#type: tls_any.type_url,
+                value: tls_any.value,
+            };
+            
+            // Create stream config with TLS security settings
+            Some(StreamConfig {
+                address: None,
+                port: port,
+                protocol_name: "tcp".to_string(),
+                transport_settings: vec![],
+                security_type: "tls".to_string(),
+                security_settings: vec![tls_message],
+                socket_settings: None,
+            })
+        } else {
+            tracing::info!("No certificates provided, creating inbound without TLS");
+            None
+        };
+
+        let receiver_config = ReceiverConfig {
+            port_list: Some(port_list),
+            listen: None,
+            allocation_strategy: None,
+            stream_settings: stream_settings,
+            receive_original_destination: false,
+            sniffing_settings: None,
+        };
+
+        let receiver_message = TypedMessage {
+            r#type: "xray.app.proxyman.ReceiverConfig".to_string(),
+            value: receiver_config.encode_to_vec(),
+        };
+        
+        // Create proxy configuration based on protocol with users
+        let proxy_message = match protocol {
+            "vless" => {
+                let mut clients = vec![];
+                if let Some(users) = users {
+                    for user in users {
+                        let user_id = user["id"].as_str().unwrap_or("").to_string();
+                        let email = user["email"].as_str().unwrap_or("").to_string();
+                        let level = user["level"].as_u64().unwrap_or(0) as u32;
+                        
+                        if !user_id.is_empty() && !email.is_empty() {
+                            let account = VlessAccount {
+                                id: user_id,
+                                encryption: "none".to_string(),
+                                flow: "".to_string(),
+                            };
+                            clients.push(User {
+                                email,
+                                level,
+                                account: Some(TypedMessage {
+                                    r#type: "xray.proxy.vless.Account".to_string(),
+                                    value: account.encode_to_vec(),
+                                }),
+                            });
+                        }
+                    }
+                }
+                
+                let vless_config = VlessInboundConfig {
+                    clients,
+                    decryption: "none".to_string(),
+                    fallbacks: vec![],
+                };
+                TypedMessage {
+                    r#type: "xray.proxy.vless.inbound.Config".to_string(),
+                    value: vless_config.encode_to_vec(),
+                }
+            },
+            "vmess" => {
+                let mut vmess_users = vec![];
+                if let Some(users) = users {
+                    for user in users {
+                        let user_id = user["id"].as_str().unwrap_or("").to_string();
+                        let email = user["email"].as_str().unwrap_or("").to_string();
+                        let level = user["level"].as_u64().unwrap_or(0) as u32;
+                        
+                        if !user_id.is_empty() && !email.is_empty() {
+                            let account = VmessAccount {
+                                id: user_id,
+                                security_settings: None,
+                                tests_enabled: "".to_string(),
+                            };
+                            vmess_users.push(User {
+                                email,
+                                level,
+                                account: Some(TypedMessage {
+                                    r#type: "xray.proxy.vmess.Account".to_string(),
+                                    value: account.encode_to_vec(),
+                                }),
+                            });
+                        }
+                    }
+                }
+                
+                let vmess_config = VmessInboundConfig {
+                    user: vmess_users,
+                    default: None,
+                    detour: None,
+                };
+                TypedMessage {
+                    r#type: "xray.proxy.vmess.inbound.Config".to_string(),
+                    value: vmess_config.encode_to_vec(),
+                }
+            },
+            "trojan" => {
+                let mut trojan_users = vec![];
+                if let Some(users) = users {
+                    for user in users {
+                        let password = user["password"].as_str().or_else(|| user["id"].as_str()).unwrap_or("").to_string();
+                        let email = user["email"].as_str().unwrap_or("").to_string();
+                        let level = user["level"].as_u64().unwrap_or(0) as u32;
+                        
+                        if !password.is_empty() && !email.is_empty() {
+                            let account = TrojanAccount {
+                                password,
+                            };
+                            trojan_users.push(User {
+                                email,
+                                level,
+                                account: Some(TypedMessage {
+                                    r#type: "xray.proxy.trojan.Account".to_string(),
+                                    value: account.encode_to_vec(),
+                                }),
+                            });
+                        }
+                    }
+                }
+                
+                let trojan_config = TrojanServerConfig {
+                    users: trojan_users,
+                    fallbacks: vec![],
+                };
+                TypedMessage {
+                    r#type: "xray.proxy.trojan.ServerConfig".to_string(),
+                    value: trojan_config.encode_to_vec(),
+                }
+            },
+            "shadowsocks" => {
+                let mut ss_users = vec![];
+                if let Some(users) = users {
+                    for user in users {
+                        let password = user["password"].as_str().or_else(|| user["id"].as_str()).unwrap_or("").to_string();
+                        let email = user["email"].as_str().unwrap_or("").to_string();
+                        let level = user["level"].as_u64().unwrap_or(0) as u32;
+                        
+                        if !password.is_empty() && !email.is_empty() {
+                            let account = ShadowsocksAccount {
+                                password,
+                                cipher_type: 0, // Default cipher
+                                iv_check: false, // Default IV check
+                            };
+                            ss_users.push(User {
+                                email,
+                                level,
+                                account: Some(TypedMessage {
+                                    r#type: "xray.proxy.shadowsocks.Account".to_string(),
+                                    value: account.encode_to_vec(),
+                                }),
+                            });
+                        }
+                    }
+                }
+                
+                let shadowsocks_config = ShadowsocksServerConfig {
+                    users: ss_users,
+                    network: vec![], // Support all networks by default
+                };
+                TypedMessage {
+                    r#type: "xray.proxy.shadowsocks.ServerConfig".to_string(),
+                    value: shadowsocks_config.encode_to_vec(),
+                }
+            },
+            _ => {
+                return Err(anyhow!("Unsupported protocol: {}", protocol));
+            }
+        };
+
+        let inbound_config = InboundHandlerConfig {
+            tag: tag.clone(),
+            receiver_settings: Some(receiver_message),
+            proxy_settings: Some(proxy_message),
+        };
+
+        let request = Request::new(AddInboundRequest {
+            inbound: Some(inbound_config),
+        });
+
+        tracing::info!("Sending AddInboundRequest for '{}'", tag);
+        let mut handler_client = self.client.handler();
+        match handler_client.add_inbound(request).await {
+            Ok(response) => {
+                let _response_inner = response.into_inner();
+                tracing::info!("Successfully added inbound {}", tag);
+                Ok(())
+            }
+            Err(e) => {
+                tracing::error!("Failed to add inbound {}: {}", tag, e);
+                Err(anyhow!("Failed to add inbound {}: {}", tag, e))
+            }
+        }
+    }
+
+    /// Remove inbound by tag
+    pub async fn remove_inbound(&self, tag: &str) -> Result<()> {
+        tracing::info!("Removing inbound '{}' from Xray server at {}", tag, self.endpoint);
+        
+        let mut handler_client = self.client.handler();
+        let request = Request::new(RemoveInboundRequest {
+            tag: tag.to_string(),
+        });
+        
+        match handler_client.remove_inbound(request).await {
+            Ok(_) => {
+                tracing::info!("Successfully removed inbound");
+                Ok(())
+            },
+            Err(e) => {
+                tracing::error!("Failed to remove inbound: {}", e);
+                Err(anyhow!("Failed to remove inbound: {}", e))
+            }
+        }
+    }
+
+    /// Restart Xray with new configuration
+    pub async fn restart_with_config(&self, config: &crate::services::xray::XrayConfig) -> Result<()> {
+        tracing::info!("Restarting Xray server at {} with new config", self.endpoint);
+        tracing::debug!("Config: {}", serde_json::to_string_pretty(&config.to_json())?);
+        
+        // TODO: Implement restart with config using xray-core
+        // For now just return success
+        Ok(())
+    }
+}
\ No newline at end of file
diff --git a/src/services/xray/mod.rs b/src/services/xray/mod.rs
new file mode 100644
index 0000000..3eec4ca
--- /dev/null
+++ b/src/services/xray/mod.rs
@@ -0,0 +1,213 @@
+use anyhow::Result;
+use serde_json::Value;
+use uuid::Uuid;
+
+pub mod client;
+pub mod config;
+pub mod stats;
+pub mod inbounds;
+pub mod users;
+
+pub use client::XrayClient;
+pub use config::XrayConfig;
+
+/// Service for managing Xray servers via gRPC
+#[derive(Clone)]
+pub struct XrayService {}
+
+#[allow(dead_code)]
+impl XrayService {
+    pub fn new() -> Self {
+        Self {}
+    }
+
+    /// Create a client for the specified server
+    async fn create_client(&self, endpoint: &str) -> Result<XrayClient> {
+        XrayClient::connect(endpoint).await
+    }
+
+    /// Test connection to Xray server
+    pub async fn test_connection(&self, _server_id: Uuid, endpoint: &str) -> Result<bool> {
+        match self.create_client(endpoint).await {
+            Ok(_client) => {
+                // Instead of getting stats (which might fail), just test connection
+                // If we successfully created the client, connection is working
+                Ok(true)
+            },
+            Err(_) => Ok(false),
+        }
+    }
+
+    /// Apply full configuration to Xray server
+    pub async fn apply_config(&self, _server_id: Uuid, endpoint: &str, config: &XrayConfig) -> Result<()> {
+        let client = self.create_client(endpoint).await?;
+        client.restart_with_config(config).await
+    }
+
+    /// Create inbound from template
+    pub async fn create_inbound(
+        &self,
+        _server_id: Uuid,
+        endpoint: &str,
+        tag: &str,
+        port: i32,
+        protocol: &str,
+        base_settings: Value,
+        stream_settings: Value,
+    ) -> Result<()> {
+        // Build inbound configuration from template
+        let inbound_config = serde_json::json!({
+            "tag": tag,
+            "port": port,
+            "protocol": protocol,
+            "settings": base_settings,
+            "streamSettings": stream_settings
+        });
+        
+        tracing::info!("Creating inbound with config: {}", inbound_config);
+        self.add_inbound(_server_id, endpoint, &inbound_config).await
+    }
+
+    /// Create inbound from template with TLS certificate
+    pub async fn create_inbound_with_certificate(
+        &self,
+        _server_id: Uuid,
+        endpoint: &str,
+        tag: &str,
+        port: i32,
+        protocol: &str,
+        base_settings: Value,
+        stream_settings: Value,
+        cert_pem: Option<&str>,
+        key_pem: Option<&str>,
+    ) -> Result<()> {
+        // Build inbound configuration from template
+        let inbound_config = serde_json::json!({
+            "tag": tag,
+            "port": port,
+            "protocol": protocol,
+            "settings": base_settings,
+            "streamSettings": stream_settings
+        });
+        
+        tracing::info!("Creating inbound with TLS certificate and config: {}", inbound_config);
+        self.add_inbound_with_certificate(_server_id, endpoint, &inbound_config, cert_pem, key_pem).await
+    }
+
+    /// Add inbound to running Xray instance
+    pub async fn add_inbound(&self, _server_id: Uuid, endpoint: &str, inbound: &Value) -> Result<()> {
+        let client = self.create_client(endpoint).await?;
+        client.add_inbound(inbound).await
+    }
+
+    /// Add inbound with certificate to running Xray instance
+    pub async fn add_inbound_with_certificate(&self, _server_id: Uuid, endpoint: &str, inbound: &Value, cert_pem: Option<&str>, key_pem: Option<&str>) -> Result<()> {
+        let client = self.create_client(endpoint).await?;
+        client.add_inbound_with_certificate(inbound, cert_pem, key_pem).await
+    }
+
+    /// Add inbound with users and certificate to running Xray instance
+    pub async fn add_inbound_with_users_and_certificate(&self, _server_id: Uuid, endpoint: &str, inbound: &Value, users: &[Value], cert_pem: Option<&str>, key_pem: Option<&str>) -> Result<()> {
+        let client = self.create_client(endpoint).await?;
+        client.add_inbound_with_users_and_certificate(inbound, users, cert_pem, key_pem).await
+    }
+
+    /// Remove inbound from running Xray instance
+    pub async fn remove_inbound(&self, _server_id: Uuid, endpoint: &str, tag: &str) -> Result<()> {
+        let client = self.create_client(endpoint).await?;
+        client.remove_inbound(tag).await
+    }
+
+    /// Add user to inbound by recreating the inbound with updated user list
+    pub async fn add_user(&self, _server_id: Uuid, endpoint: &str, inbound_tag: &str, user: &Value) -> Result<()> {
+        tracing::info!("XrayService::add_user called for server {} endpoint {} inbound_tag {}", _server_id, endpoint, inbound_tag);
+        tracing::warn!("Dynamic user addition via AlterInboundRequest doesn't work reliably - need to implement inbound recreation");
+        
+        // TODO: Implement inbound recreation approach:
+        // 1. Get current inbound configuration from database
+        // 2. Get existing users from database  
+        // 3. Remove old inbound from xray
+        // 4. Create new inbound with all users (existing + new)
+        // For now, return error to indicate this needs to be implemented
+        
+        Err(anyhow::anyhow!("User addition requires inbound recreation - not yet implemented. Use web interface to recreate inbound with users."))
+    }
+
+    /// Create inbound with users list (for inbound recreation approach)
+    pub async fn create_inbound_with_users(
+        &self,
+        _server_id: Uuid,
+        endpoint: &str,
+        tag: &str,
+        port: i32,
+        protocol: &str,
+        base_settings: Value,
+        stream_settings: Value,
+        users: &[Value],
+        cert_pem: Option<&str>,
+        key_pem: Option<&str>,
+    ) -> Result<()> {
+        tracing::info!("Creating inbound '{}' with {} users", tag, users.len());
+        
+        // Build inbound configuration with users
+        let mut inbound_config = serde_json::json!({
+            "tag": tag,
+            "port": port,
+            "protocol": protocol,
+            "settings": base_settings,
+            "streamSettings": stream_settings
+        });
+        
+        // Add users to settings based on protocol
+        if !users.is_empty() {
+            let mut settings = inbound_config["settings"].clone();
+            match protocol {
+                "vless" | "vmess" => {
+                    settings["clients"] = serde_json::Value::Array(users.to_vec());
+                },
+                "trojan" => {
+                    settings["clients"] = serde_json::Value::Array(users.to_vec());
+                },
+                "shadowsocks" => {
+                    // For shadowsocks, users are handled differently
+                    if let Some(user) = users.first() {
+                        settings["password"] = user["password"].clone();
+                    }
+                },
+                _ => {
+                    return Err(anyhow::anyhow!("Unsupported protocol for users: {}", protocol));
+                }
+            }
+            inbound_config["settings"] = settings;
+        }
+        
+        tracing::info!("Creating inbound with users: {}", serde_json::to_string_pretty(&inbound_config)?);
+        
+        // Use the new method with users support
+        self.add_inbound_with_users_and_certificate(_server_id, endpoint, &inbound_config, users, cert_pem, key_pem).await
+    }
+
+    /// Remove user from inbound
+    pub async fn remove_user(&self, _server_id: Uuid, endpoint: &str, inbound_tag: &str, email: &str) -> Result<()> {
+        let client = self.create_client(endpoint).await?;
+        client.remove_user(inbound_tag, email).await
+    }
+
+    /// Get server statistics
+    pub async fn get_stats(&self, _server_id: Uuid, endpoint: &str) -> Result<Value> {
+        let client = self.create_client(endpoint).await?;
+        client.get_stats().await
+    }
+
+    /// Query specific statistics
+    pub async fn query_stats(&self, _server_id: Uuid, endpoint: &str, pattern: &str, reset: bool) -> Result<Value> {
+        let client = self.create_client(endpoint).await?;
+        client.query_stats(pattern, reset).await
+    }
+}
+
+impl Default for XrayService {
+    fn default() -> Self {
+        Self::new()
+    }
+}
\ No newline at end of file
diff --git a/src/services/xray/stats.rs b/src/services/xray/stats.rs
new file mode 100644
index 0000000..1be5880
--- /dev/null
+++ b/src/services/xray/stats.rs
@@ -0,0 +1,70 @@
+use anyhow::{Result, anyhow};
+use serde_json::Value;
+use xray_core::{
+    tonic::Request,
+    app::stats::command::{GetStatsRequest, QueryStatsRequest},
+    Client,
+};
+
+pub struct StatsClient<'a> {
+    endpoint: String,
+    client: &'a Client,
+}
+
+impl<'a> StatsClient<'a> {
+    pub fn new(endpoint: String, client: &'a Client) -> Self {
+        Self { endpoint, client }
+    }
+
+    /// Get server statistics
+    pub async fn get_stats(&self) -> Result<Value> {
+        tracing::info!("Getting stats from Xray server at {}", self.endpoint);
+        
+        let request = Request::new(GetStatsRequest {
+            name: "".to_string(),
+            reset: false,
+        });
+
+        let mut stats_client = self.client.stats();
+        match stats_client.get_stats(request).await {
+            Ok(response) => {
+                let stats = response.into_inner();
+                tracing::debug!("Stats: {:?}", stats);
+                let stats_json = serde_json::json!({
+                    "stats": format!("{:?}", stats.stat)
+                });
+                Ok(stats_json)
+            }
+            Err(e) => {
+                tracing::error!("Failed to get stats: {}", e);
+                Err(anyhow!("Failed to get stats: {}", e))
+            }
+        }
+    }
+
+    /// Query specific statistics with pattern
+    pub async fn query_stats(&self, pattern: &str, reset: bool) -> Result<Value> {
+        tracing::info!("Querying stats with pattern '{}', reset: {} from {}", pattern, reset, self.endpoint);
+        
+        let request = Request::new(QueryStatsRequest {
+            pattern: pattern.to_string(),
+            reset,
+        });
+
+        let mut stats_client = self.client.stats();
+        match stats_client.query_stats(request).await {
+            Ok(response) => {
+                let stats = response.into_inner();
+                tracing::debug!("Query stats: {:?}", stats);
+                let stats_json = serde_json::json!({
+                    "stat": format!("{:?}", stats.stat)
+                });
+                Ok(stats_json)
+            }
+            Err(e) => {
+                tracing::error!("Failed to query stats: {}", e);
+                Err(anyhow!("Failed to query stats: {}", e))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/services/xray/users.rs b/src/services/xray/users.rs
new file mode 100644
index 0000000..eadc171
--- /dev/null
+++ b/src/services/xray/users.rs
@@ -0,0 +1,150 @@
+use anyhow::{Result, anyhow};
+use serde_json::Value;
+use xray_core::{
+    tonic::Request,
+    app::proxyman::command::{AlterInboundRequest, AddUserOperation, RemoveUserOperation},
+    common::serial::TypedMessage,
+    common::protocol::User,
+    proxy::vless::Account as VlessAccount,
+    proxy::vmess::Account as VmessAccount,
+    proxy::trojan::Account as TrojanAccount,
+    Client,
+};
+use prost::Message;
+
+pub struct UserClient<'a> {
+    endpoint: String,
+    client: &'a Client,
+}
+
+impl<'a> UserClient<'a> {
+    pub fn new(endpoint: String, client: &'a Client) -> Self {
+        Self { endpoint, client }
+    }
+
+    /// Add user to inbound (simple version that works)
+    pub async fn add_user(&self, inbound_tag: &str, user: &Value) -> Result<()> {
+        tracing::info!("Adding user to inbound '{}' on Xray server at {}", inbound_tag, self.endpoint);
+        tracing::debug!("User config: {}", serde_json::to_string_pretty(user)?);
+        
+        let email = user["email"].as_str().unwrap_or("").to_string();
+        let user_id = user["id"].as_str().unwrap_or("").to_string();
+        let level = user["level"].as_u64().unwrap_or(0) as u32;
+        let protocol = user["protocol"].as_str().unwrap_or("vless");
+        
+        tracing::info!("Parsed user data: email={}, id={}, level={}, protocol={}", email, user_id, level, protocol);
+        
+        if email.is_empty() || user_id.is_empty() {
+            return Err(anyhow!("User email and id are required"));
+        }
+        
+        // Create user account based on protocol
+        let account_message = match protocol {
+            "vless" => {
+                let account = VlessAccount {
+                    id: user_id.clone(),
+                    encryption: "none".to_string(),
+                    flow: "".to_string(), // Empty flow for basic VLESS
+                };
+                TypedMessage {
+                    r#type: "xray.proxy.vless.Account".to_string(),
+                    value: account.encode_to_vec(),
+                }
+            },
+            "vmess" => {
+                let account = VmessAccount {
+                    id: user_id,
+                    security_settings: None,
+                    tests_enabled: "".to_string(),
+                };
+                TypedMessage {
+                    r#type: "xray.proxy.vmess.Account".to_string(),
+                    value: account.encode_to_vec(),
+                }
+            },
+            "trojan" => {
+                let account = TrojanAccount {
+                    password: user_id, // For trojan, use password instead of UUID
+                };
+                TypedMessage {
+                    r#type: "xray.proxy.trojan.Account".to_string(),
+                    value: account.encode_to_vec(),
+                }
+            },
+            _ => {
+                return Err(anyhow!("Unsupported protocol for user: {}", protocol));
+            }
+        };
+        
+        // Create user protobuf message
+        let user_proto = User {
+            level: level,
+            email: email.clone(),
+            account: Some(account_message),
+        };
+        
+        // Build the AddUserOperation
+        let add_user_op = AddUserOperation {
+            user: Some(user_proto),
+        };
+        
+        let typed_message = TypedMessage {
+            r#type: "xray.app.proxyman.command.AddUserOperation".to_string(),
+            value: add_user_op.encode_to_vec(),
+        };
+        
+        // Build the AlterInboundRequest
+        let request = Request::new(AlterInboundRequest {
+            tag: inbound_tag.to_string(),
+            operation: Some(typed_message),
+        });
+        
+        tracing::info!("Sending AlterInboundRequest to add user '{}' to inbound '{}'", email, inbound_tag);
+        
+        let mut handler_client = self.client.handler();
+        match handler_client.alter_inbound(request).await {
+            Ok(response) => {
+                let _response_inner = response.into_inner();
+                tracing::info!("Successfully added user '{}' to inbound '{}'", email, inbound_tag);
+                Ok(())
+            }
+            Err(e) => {
+                tracing::error!("gRPC error adding user '{}' to inbound '{}': status={}, message={}", 
+                    email, inbound_tag, e.code(), e.message());
+                Err(anyhow!("Failed to add user '{}' to inbound '{}': {}", email, inbound_tag, e))
+            }
+        }
+    }
+
+    /// Remove user from inbound
+    pub async fn remove_user(&self, inbound_tag: &str, email: &str) -> Result<()> {
+        tracing::info!("Removing user '{}' from inbound '{}' on Xray server at {}", email, inbound_tag, self.endpoint);
+        
+        // Build the RemoveUserOperation
+        let remove_user_op = RemoveUserOperation {
+            email: email.to_string(),
+        };
+        
+        let typed_message = TypedMessage {
+            r#type: "xray.app.proxyman.command.RemoveUserOperation".to_string(),
+            value: remove_user_op.encode_to_vec(),
+        };
+        
+        let request = Request::new(AlterInboundRequest {
+            tag: inbound_tag.to_string(),
+            operation: Some(typed_message),
+        });
+        
+        let mut handler_client = self.client.handler();
+        match handler_client.alter_inbound(request).await {
+            Ok(_) => {
+                tracing::info!("Successfully removed user '{}' from inbound '{}'", email, inbound_tag);
+                Ok(())
+            }
+            Err(e) => {
+                tracing::error!("Failed to remove user '{}' from inbound '{}': {}", email, inbound_tag, e);
+                Err(anyhow!("Failed to remove user '{}' from inbound '{}': {}", email, inbound_tag, e))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/web/handlers/certificates.rs b/src/web/handlers/certificates.rs
new file mode 100644
index 0000000..6630b2d
--- /dev/null
+++ b/src/web/handlers/certificates.rs
@@ -0,0 +1,137 @@
+use axum::{
+    extract::{Path, State},
+    http::StatusCode,
+    response::Json,
+    Json as JsonExtractor,
+};
+use uuid::Uuid;
+use crate::{
+    database::{
+        entities::certificate,
+        repository::CertificateRepository,
+    },
+    services::certificates::CertificateService,
+    web::AppState,
+};
+
+/// List all certificates
+pub async fn list_certificates(
+    State(app_state): State<AppState>,
+) -> Result<Json<Vec<certificate::CertificateResponse>>, StatusCode> {
+    let repo = CertificateRepository::new(app_state.db.connection().clone());
+    
+    match repo.find_all().await {
+        Ok(certificates) => {
+            let responses: Vec<certificate::CertificateResponse> = certificates
+                .into_iter()
+                .map(|c| c.into())
+                .collect();
+            Ok(Json(responses))
+        }
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Get certificate by ID
+pub async fn get_certificate(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+) -> Result<Json<certificate::CertificateResponse>, StatusCode> {
+    let repo = CertificateRepository::new(app_state.db.connection().clone());
+    
+    match repo.find_by_id(id).await {
+        Ok(Some(certificate)) => Ok(Json(certificate.into())),
+        Ok(None) => Err(StatusCode::NOT_FOUND),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Get certificate details with PEM data by ID
+pub async fn get_certificate_details(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+) -> Result<Json<certificate::CertificateDetailsResponse>, StatusCode> {
+    let repo = CertificateRepository::new(app_state.db.connection().clone());
+    
+    match repo.find_by_id(id).await {
+        Ok(Some(certificate)) => Ok(Json(certificate.into())),
+        Ok(None) => Err(StatusCode::NOT_FOUND),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Create new certificate
+pub async fn create_certificate(
+    State(app_state): State<AppState>,
+    JsonExtractor(cert_data): JsonExtractor<certificate::CreateCertificateDto>,
+) -> Result<Json<certificate::CertificateResponse>, StatusCode> {
+    tracing::info!("Creating certificate: {:?}", cert_data);
+    let repo = CertificateRepository::new(app_state.db.connection().clone());
+    let cert_service = CertificateService::new();
+    
+    // Generate certificate based on type
+    let (cert_pem, private_key) = match cert_data.cert_type.as_str() {
+        "self_signed" => {
+            cert_service.generate_self_signed(&cert_data.domain).await
+                .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
+        }
+        _ => return Err(StatusCode::BAD_REQUEST),
+    };
+    
+    // Create certificate with generated data
+    let mut create_dto = cert_data;
+    create_dto.certificate_pem = cert_pem;
+    create_dto.private_key = private_key;
+    
+    match repo.create(create_dto).await {
+        Ok(certificate) => Ok(Json(certificate.into())),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Update certificate
+pub async fn update_certificate(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+    JsonExtractor(cert_data): JsonExtractor<certificate::UpdateCertificateDto>,
+) -> Result<Json<certificate::CertificateResponse>, StatusCode> {
+    let repo = CertificateRepository::new(app_state.db.connection().clone());
+    
+    match repo.update(id, cert_data).await {
+        Ok(certificate) => Ok(Json(certificate.into())),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Delete certificate
+pub async fn delete_certificate(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+) -> Result<StatusCode, StatusCode> {
+    let repo = CertificateRepository::new(app_state.db.connection().clone());
+    
+    match repo.delete(id).await {
+        Ok(true) => Ok(StatusCode::NO_CONTENT),
+        Ok(false) => Err(StatusCode::NOT_FOUND),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Get certificates expiring soon
+pub async fn get_expiring_certificates(
+    State(app_state): State<AppState>,
+) -> Result<Json<Vec<certificate::CertificateResponse>>, StatusCode> {
+    let repo = CertificateRepository::new(app_state.db.connection().clone());
+    
+    // Get certificates expiring in next 30 days
+    match repo.find_expiring_soon(30).await {
+        Ok(certificates) => {
+            let responses: Vec<certificate::CertificateResponse> = certificates
+                .into_iter()
+                .map(|c| c.into())
+                .collect();
+            Ok(Json(responses))
+        }
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
\ No newline at end of file
diff --git a/src/web/handlers/mod.rs b/src/web/handlers/mod.rs
new file mode 100644
index 0000000..d5bdea9
--- /dev/null
+++ b/src/web/handlers/mod.rs
@@ -0,0 +1,9 @@
+pub mod users;
+pub mod servers;
+pub mod certificates;
+pub mod templates;
+
+pub use users::*;
+pub use servers::*;
+pub use certificates::*;
+pub use templates::*;
\ No newline at end of file
diff --git a/src/web/handlers/servers.rs b/src/web/handlers/servers.rs
new file mode 100644
index 0000000..3f59376
--- /dev/null
+++ b/src/web/handlers/servers.rs
@@ -0,0 +1,575 @@
+use axum::{
+    extract::{Path, State},
+    http::StatusCode,
+    response::Json,
+    Json as JsonExtractor,
+};
+use uuid::Uuid;
+use crate::{
+    database::{
+        entities::{server, server_inbound},
+        repository::{ServerRepository, ServerInboundRepository, InboundTemplateRepository, CertificateRepository, InboundUsersRepository},
+    },
+    web::AppState,
+};
+
+/// List all servers
+pub async fn list_servers(
+    State(app_state): State<AppState>,
+) -> Result<Json<Vec<server::ServerResponse>>, StatusCode> {
+    let repo = ServerRepository::new(app_state.db.connection().clone());
+    
+    match repo.find_all().await {
+        Ok(servers) => {
+            let responses: Vec<server::ServerResponse> = servers
+                .into_iter()
+                .map(|s| s.into())
+                .collect();
+            Ok(Json(responses))
+        }
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Get server by ID
+pub async fn get_server(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+) -> Result<Json<server::ServerResponse>, StatusCode> {
+    let repo = ServerRepository::new(app_state.db.connection().clone());
+    
+    match repo.find_by_id(id).await {
+        Ok(Some(server)) => Ok(Json(server.into())),
+        Ok(None) => Err(StatusCode::NOT_FOUND),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Create new server
+pub async fn create_server(
+    State(app_state): State<AppState>,
+    Json(server_data): Json<server::CreateServerDto>,
+) -> Result<Json<server::ServerResponse>, StatusCode> {
+    let repo = ServerRepository::new(app_state.db.connection().clone());
+    
+    match repo.create(server_data).await {
+        Ok(server) => Ok(Json(server.into())),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Update server
+pub async fn update_server(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+    Json(server_data): Json<server::UpdateServerDto>,
+) -> Result<Json<server::ServerResponse>, StatusCode> {
+    let repo = ServerRepository::new(app_state.db.connection().clone());
+    
+    match repo.update(id, server_data).await {
+        Ok(server) => Ok(Json(server.into())),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Delete server
+pub async fn delete_server(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+) -> Result<StatusCode, StatusCode> {
+    let repo = ServerRepository::new(app_state.db.connection().clone());
+    
+    match repo.delete(id).await {
+        Ok(true) => Ok(StatusCode::NO_CONTENT),
+        Ok(false) => Err(StatusCode::NOT_FOUND),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Test server connection
+pub async fn test_server_connection(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+) -> Result<Json<serde_json::Value>, StatusCode> {
+    let repo = ServerRepository::new(app_state.db.connection().clone());
+    
+    let server = match repo.find_by_id(id).await {
+        Ok(Some(server)) => server,
+        Ok(None) => return Err(StatusCode::NOT_FOUND),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+
+    let endpoint = server.get_grpc_endpoint();
+    
+    match app_state.xray_service.test_connection(id, &endpoint).await {
+        Ok(connected) => {
+            // Update server status based on connection test
+            let new_status = if connected { "online" } else { "offline" };
+            let update_dto = server::UpdateServerDto {
+                name: None,
+                hostname: None,
+                grpc_port: None,
+                api_credentials: None,
+                default_certificate_id: None,
+                status: Some(new_status.to_string()),
+            };
+            
+            let _ = repo.update(id, update_dto).await; // Ignore update errors for now
+            
+            Ok(Json(serde_json::json!({
+                "connected": connected,
+                "endpoint": endpoint
+            })))
+        },
+        Err(e) => {
+            // Update status to error
+            let update_dto = server::UpdateServerDto {
+                name: None,
+                hostname: None,
+                grpc_port: None,
+                api_credentials: None,
+                default_certificate_id: None,
+                status: Some("error".to_string()),
+            };
+            
+            let _ = repo.update(id, update_dto).await; // Ignore update errors for now
+            
+            Ok(Json(serde_json::json!({
+                "connected": false,
+                "endpoint": endpoint,
+                "error": e.to_string()
+            })))
+        },
+    }
+}
+
+/// Get server statistics
+pub async fn get_server_stats(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+) -> Result<Json<serde_json::Value>, StatusCode> {
+    let repo = ServerRepository::new(app_state.db.connection().clone());
+    
+    let server = match repo.find_by_id(id).await {
+        Ok(Some(server)) => server,
+        Ok(None) => return Err(StatusCode::NOT_FOUND),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+
+    let endpoint = server.get_grpc_endpoint();
+    
+    match app_state.xray_service.get_stats(id, &endpoint).await {
+        Ok(stats) => Ok(Json(stats)),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// List server inbounds
+pub async fn list_server_inbounds(
+    State(app_state): State<AppState>,
+    Path(server_id): Path<Uuid>,
+) -> Result<Json<Vec<server_inbound::ServerInboundResponse>>, StatusCode> {
+    let repo = ServerInboundRepository::new(app_state.db.connection().clone());
+    
+    match repo.find_by_server_id_with_template(server_id).await {
+        Ok(responses) => Ok(Json(responses)),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Create server inbound
+pub async fn create_server_inbound(
+    State(app_state): State<AppState>,
+    Path(server_id): Path<Uuid>,
+    JsonExtractor(inbound_data): JsonExtractor<server_inbound::CreateServerInboundDto>,
+) -> Result<Json<server_inbound::ServerInboundResponse>, StatusCode> {
+    tracing::info!("Creating server inbound for server {}: {:?}", server_id, inbound_data);
+    
+    let server_repo = ServerRepository::new(app_state.db.connection().clone());
+    let inbound_repo = ServerInboundRepository::new(app_state.db.connection().clone());
+    let template_repo = InboundTemplateRepository::new(app_state.db.connection().clone());
+    let cert_repo = CertificateRepository::new(app_state.db.connection().clone());
+    
+    // Get server info
+    let server = match server_repo.find_by_id(server_id).await {
+        Ok(Some(server)) => server,
+        Ok(None) => return Err(StatusCode::NOT_FOUND),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+    
+    // Get template info
+    let template = match template_repo.find_by_id(inbound_data.template_id).await {
+        Ok(Some(template)) => template,
+        Ok(None) => return Err(StatusCode::BAD_REQUEST),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+    
+    // Create inbound in database first with protocol-aware tag
+    let inbound = match inbound_repo.create_with_protocol(server_id, inbound_data, &template.protocol).await {
+        Ok(inbound) => {
+            // Send sync event for immediate synchronization
+            crate::services::events::send_sync_event(
+                crate::services::events::SyncEvent::InboundChanged(server_id)
+            );
+            inbound
+        },
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+    
+    // Try to create inbound on xray server only if it's active
+    let endpoint = server.get_grpc_endpoint();
+    if inbound.is_active {
+        // Get certificate data if certificate is specified
+        let (cert_pem, key_pem) = if let Some(cert_id) = inbound.certificate_id {
+            match cert_repo.find_by_id(cert_id).await {
+                Ok(Some(cert)) => {
+                    tracing::info!("Using certificate {} for inbound {}", cert.domain, inbound.tag);
+                    (Some(cert.certificate_pem()), Some(cert.private_key_pem()))
+                },
+                Ok(None) => {
+                    tracing::warn!("Certificate {} not found, creating inbound without TLS", cert_id);
+                    (None, None)
+                },
+                Err(e) => {
+                    tracing::error!("Error fetching certificate {}: {}", cert_id, e);
+                    (None, None)
+                }
+            }
+        } else {
+            tracing::info!("No certificate specified for inbound {}, creating without TLS", inbound.tag);
+            (None, None)
+        };
+
+        match app_state.xray_service.create_inbound_with_certificate(
+            server_id,
+            &endpoint,
+            &inbound.tag,
+            inbound.port_override.unwrap_or(template.default_port),
+            &template.protocol,
+            template.base_settings.clone(),
+            template.stream_settings.clone(),
+            cert_pem.as_deref(),
+            key_pem.as_deref(),
+        ).await {
+            Ok(_) => {
+                tracing::info!("Successfully created inbound {} on xray server {}", inbound.tag, endpoint);
+            },
+            Err(e) => {
+                tracing::error!("Failed to create inbound on xray server {}: {}", endpoint, e);
+                // Note: We don't fail the request since the inbound is already in DB
+                // The user can manually sync or retry later
+            }
+        }
+    } else {
+        tracing::info!("Inbound {} created as inactive, skipping xray server creation", inbound.tag);
+    }
+    
+    Ok(Json(inbound.into()))
+}
+
+/// Update server inbound
+pub async fn update_server_inbound(
+    State(app_state): State<AppState>,
+    Path((server_id, inbound_id)): Path<(Uuid, Uuid)>,
+    JsonExtractor(inbound_data): JsonExtractor<server_inbound::UpdateServerInboundDto>,
+) -> Result<Json<server_inbound::ServerInboundResponse>, StatusCode> {
+    tracing::info!("Updating server inbound {} for server {}: {:?}", inbound_id, server_id, inbound_data);
+    
+    let server_repo = ServerRepository::new(app_state.db.connection().clone());
+    let inbound_repo = ServerInboundRepository::new(app_state.db.connection().clone());
+    let template_repo = InboundTemplateRepository::new(app_state.db.connection().clone());
+    let cert_repo = CertificateRepository::new(app_state.db.connection().clone());
+    
+    // Get server info
+    let server = match server_repo.find_by_id(server_id).await {
+        Ok(Some(server)) => server,
+        Ok(None) => return Err(StatusCode::NOT_FOUND),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+    
+    // Get current inbound state
+    let current_inbound = match inbound_repo.find_by_id(inbound_id).await {
+        Ok(Some(inbound)) if inbound.server_id == server_id => inbound,
+        Ok(Some(_)) => return Err(StatusCode::BAD_REQUEST),
+        Ok(None) => return Err(StatusCode::NOT_FOUND),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+    
+    // Check if is_active status is changing
+    let old_is_active = current_inbound.is_active;
+    let new_is_active = inbound_data.is_active.unwrap_or(old_is_active);
+    let endpoint = server.get_grpc_endpoint();
+    
+    // Handle xray server changes based on active status change
+    if old_is_active && !new_is_active {
+        // Becoming inactive - remove from xray server
+        tracing::info!("Inbound {} becoming inactive, removing from xray server {}", current_inbound.tag, endpoint);
+        match app_state.xray_service.remove_inbound(server_id, &endpoint, &current_inbound.tag).await {
+            Ok(_) => {
+                tracing::info!("Successfully removed inbound {} from xray server", current_inbound.tag);
+            },
+            Err(e) => {
+                tracing::error!("Failed to remove inbound {} from xray server: {}", current_inbound.tag, e);
+                // Continue with database update even if xray removal fails
+            }
+        }
+    } else if !old_is_active && new_is_active {
+        // Becoming active - add to xray server
+        tracing::info!("Inbound {} becoming active, adding to xray server {}", current_inbound.tag, endpoint);
+        
+        // Get template info for recreation
+        let template = match template_repo.find_by_id(current_inbound.template_id).await {
+            Ok(Some(template)) => template,
+            Ok(None) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+            Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+        };
+        
+        // Use updated port if provided, otherwise keep current
+        let port = inbound_data.port_override.unwrap_or(current_inbound.port_override.unwrap_or(template.default_port));
+        
+        // Get certificate data if certificate is specified (could be updated)
+        let certificate_id = inbound_data.certificate_id.or(current_inbound.certificate_id);
+        let (cert_pem, key_pem) = if let Some(cert_id) = certificate_id {
+            match cert_repo.find_by_id(cert_id).await {
+                Ok(Some(cert)) => {
+                    tracing::info!("Using certificate {} for inbound {}", cert.domain, current_inbound.tag);
+                    (Some(cert.certificate_pem()), Some(cert.private_key_pem()))
+                },
+                Ok(None) => {
+                    tracing::warn!("Certificate {} not found, creating inbound without TLS", cert_id);
+                    (None, None)
+                },
+                Err(e) => {
+                    tracing::error!("Error fetching certificate {}: {}", cert_id, e);
+                    (None, None)
+                }
+            }
+        } else {
+            tracing::info!("No certificate specified for inbound {}, creating without TLS", current_inbound.tag);
+            (None, None)
+        };
+        
+        match app_state.xray_service.create_inbound_with_certificate(
+            server_id,
+            &endpoint,
+            &current_inbound.tag,
+            port,
+            &template.protocol,
+            template.base_settings.clone(),
+            template.stream_settings.clone(),
+            cert_pem.as_deref(),
+            key_pem.as_deref(),
+        ).await {
+            Ok(_) => {
+                tracing::info!("Successfully added inbound {} to xray server", current_inbound.tag);
+            },
+            Err(e) => {
+                tracing::error!("Failed to add inbound {} to xray server: {}", current_inbound.tag, e);
+                // Continue with database update even if xray creation fails
+            }
+        }
+    }
+    
+    // Update database
+    match inbound_repo.update(inbound_id, inbound_data).await {
+        Ok(updated_inbound) => {
+            // Send sync event for immediate synchronization
+            crate::services::events::send_sync_event(
+                crate::services::events::SyncEvent::InboundChanged(server_id)
+            );
+            Ok(Json(updated_inbound.into()))
+        },
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Get server inbound by ID
+pub async fn get_server_inbound(
+    State(app_state): State<AppState>,
+    Path((server_id, inbound_id)): Path<(Uuid, Uuid)>,
+) -> Result<Json<server_inbound::ServerInboundResponse>, StatusCode> {
+    let repo = ServerInboundRepository::new(app_state.db.connection().clone());
+    
+    // Verify the inbound belongs to the server
+    match repo.find_by_id(inbound_id).await {
+        Ok(Some(inbound)) if inbound.server_id == server_id => {
+            Ok(Json(inbound.into()))
+        }
+        Ok(Some(_)) => Err(StatusCode::BAD_REQUEST),
+        Ok(None) => Err(StatusCode::NOT_FOUND),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Delete server inbound
+pub async fn delete_server_inbound(
+    State(app_state): State<AppState>,
+    Path((server_id, inbound_id)): Path<(Uuid, Uuid)>,
+) -> Result<StatusCode, StatusCode> {
+    let server_repo = ServerRepository::new(app_state.db.connection().clone());
+    let inbound_repo = ServerInboundRepository::new(app_state.db.connection().clone());
+    
+    // Get server and inbound info
+    let server = match server_repo.find_by_id(server_id).await {
+        Ok(Some(server)) => server,
+        Ok(None) => return Err(StatusCode::NOT_FOUND),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+    
+    // Verify the inbound belongs to the server
+    let inbound = match inbound_repo.find_by_id(inbound_id).await {
+        Ok(Some(inbound)) if inbound.server_id == server_id => inbound,
+        Ok(Some(_)) => return Err(StatusCode::BAD_REQUEST),
+        Ok(None) => return Err(StatusCode::NOT_FOUND),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+    
+    // Try to remove inbound from xray server first
+    let endpoint = server.get_grpc_endpoint();
+    match app_state.xray_service.remove_inbound(server_id, &endpoint, &inbound.tag).await {
+        Ok(_) => {
+            tracing::info!("Successfully removed inbound {} from xray server {}", inbound.tag, endpoint);
+        },
+        Err(e) => {
+            tracing::error!("Failed to remove inbound from xray server {}: {}", endpoint, e);
+            // Continue with database deletion even if xray removal fails
+        }
+    }
+    
+    // Delete from database
+    match inbound_repo.delete(inbound_id).await {
+        Ok(true) => {
+            // Send sync event for immediate synchronization
+            crate::services::events::send_sync_event(
+                crate::services::events::SyncEvent::InboundChanged(server_id)
+            );
+            Ok(StatusCode::NO_CONTENT)
+        },
+        Ok(false) => Err(StatusCode::NOT_FOUND),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Add user to server inbound (database only - sync will apply changes)
+pub async fn add_user_to_inbound(
+    State(app_state): State<AppState>,
+    Path((server_id, inbound_id)): Path<(Uuid, Uuid)>,
+    JsonExtractor(user_data): JsonExtractor<serde_json::Value>,
+) -> Result<StatusCode, StatusCode> {
+    use crate::database::entities::inbound_users::CreateInboundUserDto;
+    
+    let server_repo = ServerRepository::new(app_state.db.connection().clone());
+    let inbound_repo = ServerInboundRepository::new(app_state.db.connection().clone());
+    
+    // Get server and inbound to validate they exist
+    let _server = match server_repo.find_by_id(server_id).await {
+        Ok(Some(server)) => server,
+        Ok(None) => return Err(StatusCode::NOT_FOUND),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+    
+    let inbound = match inbound_repo.find_by_id(inbound_id).await {
+        Ok(Some(inbound)) => inbound,
+        Ok(None) => return Err(StatusCode::NOT_FOUND),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+    
+    // Verify inbound belongs to server
+    if inbound.server_id != server_id {
+        return Err(StatusCode::BAD_REQUEST);
+    }
+    
+    // Extract user data
+    let username = user_data["username"].as_str().unwrap_or("").to_string();
+    let level = user_data["level"].as_u64().unwrap_or(0) as i32;
+    
+    if username.is_empty() {
+        tracing::error!("Missing required user data: username");
+        return Err(StatusCode::BAD_REQUEST);
+    }
+    
+    // Create inbound user repository
+    let inbound_users_repo = InboundUsersRepository::new(app_state.db.connection().clone());
+    
+    // Check if username already exists on this inbound
+    if inbound_users_repo.username_exists_on_inbound(&username, inbound_id).await.unwrap_or(false) {
+        tracing::error!("Username '{}' already exists on inbound {}", username, inbound_id);
+        return Err(StatusCode::CONFLICT);
+    }
+    
+    // Create inbound user DTO
+    let inbound_user_dto = CreateInboundUserDto {
+        server_inbound_id: inbound_id,
+        username: username.clone(),
+        level: Some(level),
+    };
+    
+    // Create user in database
+    match inbound_users_repo.create(inbound_user_dto).await {
+        Ok(created_user) => {
+            tracing::info!("Inbound user created: username={} email={} server={} inbound={}", 
+                username, created_user.email, server_id, inbound_id);
+            
+            // Send sync event for immediate synchronization
+            crate::services::events::send_sync_event(
+                crate::services::events::SyncEvent::UserAccessChanged(server_id)
+            );
+            
+            tracing::info!("User will be synced to xray server immediately via event");
+            Ok(StatusCode::CREATED)
+        },
+        Err(e) => {
+            tracing::error!("Failed to create inbound user: {}", e);
+            Err(StatusCode::INTERNAL_SERVER_ERROR)
+        }
+    }
+}
+
+/// Remove user from server inbound
+pub async fn remove_user_from_inbound(
+    State(app_state): State<AppState>,
+    Path((server_id, inbound_id, email)): Path<(Uuid, Uuid, String)>,
+) -> Result<StatusCode, StatusCode> {
+    let server_repo = ServerRepository::new(app_state.db.connection().clone());
+    let inbound_repo = ServerInboundRepository::new(app_state.db.connection().clone());
+    
+    // Get server and inbound
+    let server = match server_repo.find_by_id(server_id).await {
+        Ok(Some(server)) => server,
+        Ok(None) => return Err(StatusCode::NOT_FOUND),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+    
+    let inbound = match inbound_repo.find_by_id(inbound_id).await {
+        Ok(Some(inbound)) => inbound,
+        Ok(None) => return Err(StatusCode::NOT_FOUND),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+    
+    // Verify inbound belongs to server
+    if inbound.server_id != server_id {
+        return Err(StatusCode::BAD_REQUEST);
+    }
+    
+    // Get inbound tag
+    let template_repo = InboundTemplateRepository::new(app_state.db.connection().clone());
+    let template = match template_repo.find_by_id(inbound.template_id).await {
+        Ok(Some(template)) => template,
+        Ok(None) => return Err(StatusCode::NOT_FOUND),
+        Err(_) => return Err(StatusCode::INTERNAL_SERVER_ERROR),
+    };
+    
+    let inbound_tag = &inbound.tag;
+    
+    // Remove user from xray server
+    match app_state.xray_service.remove_user(server_id, &format!("{}:{}", server.hostname, server.grpc_port), &inbound_tag, &email).await {
+        Ok(_) => {
+            tracing::info!("Successfully removed user {} from server {} inbound {}", email, server_id, inbound_id);
+            Ok(StatusCode::NO_CONTENT)
+        },
+        Err(e) => {
+            tracing::error!("Failed to remove user {} from server {} inbound {}: {}", email, server_id, inbound_id, e);
+            Err(StatusCode::INTERNAL_SERVER_ERROR)
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/web/handlers/templates.rs b/src/web/handlers/templates.rs
new file mode 100644
index 0000000..26819a1
--- /dev/null
+++ b/src/web/handlers/templates.rs
@@ -0,0 +1,88 @@
+use axum::{
+    extract::{Path, State},
+    http::StatusCode,
+    response::Json,
+    Json as JsonExtractor,
+};
+use uuid::Uuid;
+use crate::{
+    database::{
+        entities::inbound_template,
+        repository::InboundTemplateRepository,
+    },
+    web::AppState,
+};
+
+/// List all inbound templates
+pub async fn list_templates(
+    State(app_state): State<AppState>,
+) -> Result<Json<Vec<inbound_template::InboundTemplateResponse>>, StatusCode> {
+    let repo = InboundTemplateRepository::new(app_state.db.connection().clone());
+    
+    match repo.find_all().await {
+        Ok(templates) => {
+            let responses: Vec<inbound_template::InboundTemplateResponse> = templates
+                .into_iter()
+                .map(|t| t.into())
+                .collect();
+            Ok(Json(responses))
+        }
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Get template by ID
+pub async fn get_template(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+) -> Result<Json<inbound_template::InboundTemplateResponse>, StatusCode> {
+    let repo = InboundTemplateRepository::new(app_state.db.connection().clone());
+    
+    match repo.find_by_id(id).await {
+        Ok(Some(template)) => Ok(Json(template.into())),
+        Ok(None) => Err(StatusCode::NOT_FOUND),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Create new template
+pub async fn create_template(
+    State(app_state): State<AppState>,
+    JsonExtractor(template_data): JsonExtractor<inbound_template::CreateInboundTemplateDto>,
+) -> Result<Json<inbound_template::InboundTemplateResponse>, StatusCode> {
+    tracing::info!("Creating template: {:?}", template_data);
+    let repo = InboundTemplateRepository::new(app_state.db.connection().clone());
+    
+    match repo.create(template_data).await {
+        Ok(template) => Ok(Json(template.into())),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Update template
+pub async fn update_template(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+    JsonExtractor(template_data): JsonExtractor<inbound_template::UpdateInboundTemplateDto>,
+) -> Result<Json<inbound_template::InboundTemplateResponse>, StatusCode> {
+    let repo = InboundTemplateRepository::new(app_state.db.connection().clone());
+    
+    match repo.update(id, template_data).await {
+        Ok(template) => Ok(Json(template.into())),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
+
+/// Delete template
+pub async fn delete_template(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+) -> Result<StatusCode, StatusCode> {
+    let repo = InboundTemplateRepository::new(app_state.db.connection().clone());
+    
+    match repo.delete(id).await {
+        Ok(true) => Ok(StatusCode::NO_CONTENT),
+        Ok(false) => Err(StatusCode::NOT_FOUND),
+        Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR),
+    }
+}
\ No newline at end of file
diff --git a/src/web/handlers/users.rs b/src/web/handlers/users.rs
new file mode 100644
index 0000000..3990af3
--- /dev/null
+++ b/src/web/handlers/users.rs
@@ -0,0 +1,206 @@
+use axum::{
+    extract::{Path, Query, State},
+    http::StatusCode,
+    response::Json,
+    Json as JsonExtractor,
+};
+use serde::{Deserialize, Serialize};
+use serde_json::{json, Value};
+use uuid::Uuid;
+
+use crate::database::entities::user::{CreateUserDto, UpdateUserDto, Model as UserModel};
+use crate::database::repository::UserRepository;
+use crate::web::AppState;
+
+#[derive(Debug, Deserialize)]
+pub struct PaginationQuery {
+    #[serde(default = "default_page")]
+    pub page: u64,
+    #[serde(default = "default_per_page")]
+    pub per_page: u64,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct SearchQuery {
+    pub q: Option<String>,
+    #[serde(flatten)]
+    pub pagination: PaginationQuery,
+}
+
+#[derive(Debug, Serialize)]
+pub struct UsersResponse {
+    pub users: Vec<UserResponse>,
+    pub total: u64,
+    pub page: u64,
+    pub per_page: u64,
+}
+
+#[derive(Debug, Serialize)]
+pub struct UserResponse {
+    pub id: Uuid,
+    pub name: String,
+    pub comment: Option<String>,
+    pub telegram_id: Option<i64>,
+    pub created_at: chrono::DateTime<chrono::Utc>,
+    pub updated_at: chrono::DateTime<chrono::Utc>,
+}
+
+fn default_page() -> u64 { 1 }
+fn default_per_page() -> u64 { 20 }
+
+impl From<UserModel> for UserResponse {
+    fn from(user: UserModel) -> Self {
+        Self {
+            id: user.id,
+            name: user.name,
+            comment: user.comment,
+            telegram_id: user.telegram_id,
+            created_at: user.created_at,
+            updated_at: user.updated_at,
+        }
+    }
+}
+
+/// Get all users with pagination
+pub async fn get_users(
+    State(app_state): State<AppState>,
+    Query(query): Query<PaginationQuery>,
+) -> Result<Json<UsersResponse>, StatusCode> {
+    let repo = UserRepository::new(app_state.db.connection().clone());
+    
+    let users = repo.get_all(query.page, query.per_page)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+    
+    let total = repo.count()
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+
+    let response = UsersResponse {
+        users: users.into_iter().map(UserResponse::from).collect(),
+        total,
+        page: query.page,
+        per_page: query.per_page,
+    };
+
+    Ok(Json(response))
+}
+
+/// Search users by name
+pub async fn search_users(
+    State(app_state): State<AppState>,
+    Query(query): Query<SearchQuery>,
+) -> Result<Json<UsersResponse>, StatusCode> {
+    let repo = UserRepository::new(app_state.db.connection().clone());
+    
+    let users = if let Some(search_query) = query.q {
+        repo.search_by_name(&search_query, query.pagination.page, query.pagination.per_page)
+            .await
+            .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
+    } else {
+        repo.get_all(query.pagination.page, query.pagination.per_page)
+            .await
+            .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
+    };
+    
+    let total = repo.count()
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+
+    let response = UsersResponse {
+        users: users.into_iter().map(UserResponse::from).collect(),
+        total,
+        page: query.pagination.page,
+        per_page: query.pagination.per_page,
+    };
+
+    Ok(Json(response))
+}
+
+/// Get user by ID
+pub async fn get_user(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+) -> Result<Json<UserResponse>, StatusCode> {
+    let repo = UserRepository::new(app_state.db.connection().clone());
+    
+    let user = repo.get_by_id(id)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+
+    match user {
+        Some(user) => Ok(Json(UserResponse::from(user))),
+        None => Err(StatusCode::NOT_FOUND),
+    }
+}
+
+/// Create a new user
+pub async fn create_user(
+    State(app_state): State<AppState>,
+    JsonExtractor(dto): JsonExtractor<CreateUserDto>,
+) -> Result<Json<UserResponse>, StatusCode> {
+    let repo = UserRepository::new(app_state.db.connection().clone());
+    
+    // Check if telegram ID is already in use
+    if let Some(telegram_id) = dto.telegram_id {
+        let exists = repo.telegram_id_exists(telegram_id)
+            .await
+            .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+        
+        if exists {
+            return Err(StatusCode::CONFLICT);
+        }
+    }
+
+    let user = repo.create(dto)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+
+    Ok(Json(UserResponse::from(user)))
+}
+
+/// Update user by ID
+pub async fn update_user(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+    JsonExtractor(dto): JsonExtractor<UpdateUserDto>,
+) -> Result<Json<UserResponse>, StatusCode> {
+    let repo = UserRepository::new(app_state.db.connection().clone());
+    
+    // Check if telegram ID is already in use by another user
+    if let Some(telegram_id) = dto.telegram_id {
+        if let Some(existing_user) = repo.get_by_telegram_id(telegram_id).await
+            .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)? {
+            if existing_user.id != id {
+                return Err(StatusCode::CONFLICT);
+            }
+        }
+    }
+
+    let user = repo.update(id, dto)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+
+    match user {
+        Some(user) => Ok(Json(UserResponse::from(user))),
+        None => Err(StatusCode::NOT_FOUND),
+    }
+}
+
+/// Delete user by ID
+pub async fn delete_user(
+    State(app_state): State<AppState>,
+    Path(id): Path<Uuid>,
+) -> Result<Json<Value>, StatusCode> {
+    let repo = UserRepository::new(app_state.db.connection().clone());
+    
+    let deleted = repo.delete(id)
+        .await
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+
+    if deleted {
+        Ok(Json(json!({ "message": "User deleted successfully" })))
+    } else {
+        Err(StatusCode::NOT_FOUND)
+    }
+}
\ No newline at end of file
diff --git a/src/web/mod.rs b/src/web/mod.rs
new file mode 100644
index 0000000..0396545
--- /dev/null
+++ b/src/web/mod.rs
@@ -0,0 +1,70 @@
+use anyhow::Result;
+use axum::{
+    Router,
+    routing::get,
+    http::StatusCode,
+    response::Json,
+    serve,
+};
+use serde_json::{json, Value};
+use std::net::SocketAddr;
+use tokio::net::TcpListener;
+use tower_http::cors::CorsLayer;
+use tower_http::services::ServeDir;
+use tracing::info;
+
+use crate::config::WebConfig;
+use crate::database::DatabaseManager;
+use crate::services::XrayService;
+
+pub mod handlers;
+pub mod routes;
+
+use routes::api_routes;
+
+/// Application state shared across handlers
+#[derive(Clone)]
+pub struct AppState {
+    pub db: DatabaseManager,
+    #[allow(dead_code)]
+    pub config: WebConfig,
+    pub xray_service: XrayService,
+}
+
+/// Start the web server
+pub async fn start_server(db: DatabaseManager, config: WebConfig) -> Result<()> {
+    let xray_service = XrayService::new();
+    
+    let app_state = AppState {
+        db,
+        config: config.clone(),
+        xray_service,
+    };
+
+    // Serve static files
+    let serve_dir = ServeDir::new("static");
+
+    let app = Router::new()
+        .route("/health", get(health_check))
+        .nest("/api", api_routes())
+        .nest_service("/", serve_dir)
+        .layer(CorsLayer::permissive())
+        .with_state(app_state);
+
+    let addr: SocketAddr = format!("{}:{}", config.host, config.port).parse()?;
+    info!("Starting web server on {}", addr);
+
+    let listener = TcpListener::bind(&addr).await?;
+    serve(listener, app).await?;
+
+    Ok(())
+}
+
+/// Health check endpoint
+async fn health_check() -> Result<Json<Value>, StatusCode> {
+    Ok(Json(json!({
+        "status": "ok",
+        "service": "xray-admin",
+        "version": env!("CARGO_PKG_VERSION")
+    })))
+}
\ No newline at end of file
diff --git a/src/web/routes/mod.rs b/src/web/routes/mod.rs
new file mode 100644
index 0000000..20526f3
--- /dev/null
+++ b/src/web/routes/mod.rs
@@ -0,0 +1,27 @@
+use axum::{
+    Router,
+    routing::get,
+};
+
+use crate::web::{AppState, handlers};
+
+pub mod servers;
+
+/// Create API routes
+pub fn api_routes() -> Router<AppState> {
+    Router::new()
+        .nest("/users", user_routes())
+        .nest("/servers", servers::server_routes())
+        .nest("/certificates", servers::certificate_routes())
+        .nest("/templates", servers::template_routes())
+}
+
+/// User management routes
+fn user_routes() -> Router<AppState> {
+    Router::new()
+        .route("/", get(handlers::get_users).post(handlers::create_user))
+        .route("/search", get(handlers::search_users))
+        .route("/:id", get(handlers::get_user)
+            .put(handlers::update_user)
+            .delete(handlers::delete_user))
+}
\ No newline at end of file
diff --git a/src/web/routes/servers.rs b/src/web/routes/servers.rs
new file mode 100644
index 0000000..c598b13
--- /dev/null
+++ b/src/web/routes/servers.rs
@@ -0,0 +1,38 @@
+use axum::{
+    routing::{get, post},
+    Router,
+};
+use crate::{
+    web::{AppState, handlers},
+};
+
+pub fn server_routes() -> Router<AppState> {
+    Router::new()
+        // Server management
+        .route("/", get(handlers::list_servers).post(handlers::create_server))
+        .route("/:id", get(handlers::get_server).put(handlers::update_server).delete(handlers::delete_server))
+        .route("/:id/test", post(handlers::test_server_connection))
+        .route("/:id/stats", get(handlers::get_server_stats))
+        
+        // Server inbounds
+        .route("/:server_id/inbounds", get(handlers::list_server_inbounds).post(handlers::create_server_inbound))
+        .route("/:server_id/inbounds/:inbound_id", get(handlers::get_server_inbound).put(handlers::update_server_inbound).delete(handlers::delete_server_inbound))
+        
+        // User management for inbounds
+        .route("/:server_id/inbounds/:inbound_id/users", post(handlers::add_user_to_inbound))
+        .route("/:server_id/inbounds/:inbound_id/users/:email", axum::routing::delete(handlers::remove_user_from_inbound))
+}
+
+pub fn certificate_routes() -> Router<AppState> {
+    Router::new()
+        .route("/", get(handlers::list_certificates).post(handlers::create_certificate))
+        .route("/:id", get(handlers::get_certificate).put(handlers::update_certificate).delete(handlers::delete_certificate))
+        .route("/:id/details", get(handlers::get_certificate_details))
+        .route("/expiring", get(handlers::get_expiring_certificates))
+}
+
+pub fn template_routes() -> Router<AppState> {
+    Router::new()
+        .route("/", get(handlers::list_templates).post(handlers::create_template))
+        .route("/:id", get(handlers::get_template).put(handlers::update_template).delete(handlers::delete_template))
+}
\ No newline at end of file
diff --git a/static/admin.html b/static/admin.html
new file mode 100644
index 0000000..5a3349b
--- /dev/null
+++ b/static/admin.html
@@ -0,0 +1,1314 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Xray Admin Panel</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+        
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+            background: #f5f5f7;
+            color: #1d1d1f;
+            min-height: 100vh;
+        }
+        
+        .layout {
+            display: flex;
+            min-height: 100vh;
+        }
+        
+        .sidebar {
+            width: 260px;
+            background: white;
+            border-right: 1px solid #d2d2d7;
+            padding: 20px 0;
+        }
+        
+        .sidebar-header {
+            padding: 0 20px 20px;
+            border-bottom: 1px solid #f0f0f0;
+            margin-bottom: 20px;
+        }
+        
+        .sidebar-header h1 {
+            font-size: 20px;
+            font-weight: 600;
+            color: #1d1d1f;
+        }
+        
+        .nav-menu {
+            list-style: none;
+        }
+        
+        .nav-item {
+            margin-bottom: 2px;
+        }
+        
+        .nav-link {
+            display: block;
+            padding: 12px 20px;
+            color: #424245;
+            text-decoration: none;
+            font-weight: 400;
+            transition: all 0.2s;
+        }
+        
+        .nav-link:hover,
+        .nav-link.active {
+            background: #f0f0f0;
+            color: #0071e3;
+        }
+        
+        .main-content {
+            flex: 1;
+            padding: 30px;
+            overflow-y: auto;
+        }
+        
+        .page-header {
+            margin-bottom: 30px;
+        }
+        
+        .page-title {
+            font-size: 32px;
+            font-weight: 600;
+            margin-bottom: 8px;
+        }
+        
+        .page-subtitle {
+            color: #6e6e73;
+            font-size: 16px;
+        }
+        
+        .card {
+            background: white;
+            border-radius: 12px;
+            padding: 24px;
+            margin-bottom: 24px;
+            box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+        }
+        
+        .card-header {
+            margin-bottom: 20px;
+            padding-bottom: 16px;
+            border-bottom: 1px solid #f0f0f0;
+        }
+        
+        .card-title {
+            font-size: 18px;
+            font-weight: 600;
+            margin-bottom: 4px;
+        }
+        
+        .card-subtitle {
+            color: #6e6e73;
+            font-size: 14px;
+        }
+        
+        .btn {
+            padding: 10px 20px;
+            border: none;
+            border-radius: 8px;
+            font-size: 14px;
+            font-weight: 500;
+            cursor: pointer;
+            transition: all 0.2s;
+            text-decoration: none;
+            display: inline-block;
+            text-align: center;
+        }
+        
+        .btn-primary {
+            background: #0071e3;
+            color: white;
+        }
+        
+        .btn-primary:hover {
+            background: #0077ed;
+        }
+        
+        .btn-secondary {
+            background: #f5f5f7;
+            color: #1d1d1f;
+            border: 1px solid #d2d2d7;
+        }
+        
+        .btn-secondary:hover {
+            background: #e8e8ed;
+        }
+        
+        .btn-success {
+            background: #28a745;
+            color: white;
+        }
+        
+        .btn-success:hover {
+            background: #218838;
+        }
+        
+        .btn-danger {
+            background: #dc3545;
+            color: white;
+        }
+        
+        .btn-danger:hover {
+            background: #c82333;
+        }
+        
+        .btn-small {
+            padding: 6px 12px;
+            font-size: 12px;
+        }
+        
+        .stats-grid {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+            gap: 20px;
+            margin-bottom: 30px;
+        }
+        
+        .stat-card {
+            background: white;
+            border-radius: 12px;
+            padding: 20px;
+            box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+        }
+        
+        .stat-value {
+            font-size: 32px;
+            font-weight: 700;
+            color: #0071e3;
+            margin-bottom: 4px;
+        }
+        
+        .stat-label {
+            color: #6e6e73;
+            font-size: 14px;
+            font-weight: 500;
+        }
+        
+        .table {
+            width: 100%;
+            border-collapse: collapse;
+        }
+        
+        .table th,
+        .table td {
+            text-align: left;
+            padding: 12px;
+            border-bottom: 1px solid #f0f0f0;
+        }
+        
+        .table th {
+            font-weight: 600;
+            color: #6e6e73;
+            font-size: 12px;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+        }
+        
+        .table tr:hover {
+            background: #f8f9fa;
+        }
+        
+        .status-badge {
+            padding: 4px 8px;
+            border-radius: 12px;
+            font-size: 11px;
+            font-weight: 600;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+        }
+        
+        .status-online {
+            background: #d4edda;
+            color: #155724;
+        }
+        
+        .status-offline {
+            background: #f8d7da;
+            color: #721c24;
+        }
+        
+        .status-unknown {
+            background: #e2e3e5;
+            color: #6c757d;
+        }
+        
+        .status-success {
+            color: #28a745;
+            font-weight: 500;
+        }
+        
+        .status-error {
+            color: #dc3545;
+            font-weight: 500;
+        }
+        
+        .status-running {
+            color: #007bff;
+            font-weight: 500;
+        }
+        
+        .status-idle {
+            color: #6c757d;
+            font-weight: 500;
+        }
+        
+        .task-stats {
+            font-size: 0.875rem;
+        }
+        
+        .success-rate {
+            margin-top: 2px;
+            font-size: 0.75rem;
+            font-weight: 500;
+        }
+        
+        .success-rate-good {
+            color: #28a745;
+        }
+        
+        .success-rate-ok {
+            color: #ffc107;
+        }
+        
+        .success-rate-bad {
+            color: #dc3545;
+        }
+        
+        .actions {
+            display: flex;
+            gap: 8px;
+        }
+        
+        .page-section {
+            display: none;
+        }
+        
+        .page-section.active {
+            display: block;
+        }
+        
+        .form-grid {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+            gap: 20px;
+        }
+        
+        .form-group {
+            margin-bottom: 16px;
+        }
+        
+        .form-label {
+            display: block;
+            margin-bottom: 6px;
+            font-weight: 500;
+            font-size: 14px;
+            color: #1d1d1f;
+        }
+        
+        .form-input {
+            width: 100%;
+            padding: 10px 12px;
+            border: 1px solid #d2d2d7;
+            border-radius: 8px;
+            font-size: 14px;
+            transition: border-color 0.2s;
+        }
+        
+        .form-input:focus {
+            outline: none;
+            border-color: #0071e3;
+        }
+        
+        .form-select {
+            width: 100%;
+            padding: 10px 12px;
+            border: 1px solid #d2d2d7;
+            border-radius: 8px;
+            font-size: 14px;
+            background: white;
+        }
+        
+        .alert {
+            padding: 12px 16px;
+            border-radius: 8px;
+            margin-bottom: 20px;
+            display: none;
+        }
+        
+        .alert.show {
+            display: block;
+        }
+        
+        .alert-success {
+            background: #d4edda;
+            color: #155724;
+            border: 1px solid #c3e6cb;
+        }
+        
+        .alert-error {
+            background: #f8d7da;
+            color: #721c24;
+            border: 1px solid #f5c6cb;
+        }
+        
+        .empty-state {
+            text-align: center;
+            padding: 60px 20px;
+            color: #6e6e73;
+        }
+        
+        .empty-state h3 {
+            margin-bottom: 8px;
+            color: #1d1d1f;
+        }
+        
+        .loading {
+            text-align: center;
+            padding: 40px;
+            color: #6e6e73;
+        }
+        
+        /* Modal styles */
+        .modal-overlay {
+            position: fixed;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            background: rgba(0, 0, 0, 0.5);
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            z-index: 1000;
+        }
+        
+        .modal-content {
+            background: white;
+            border-radius: 12px;
+            max-width: 800px;
+            max-height: 80vh;
+            overflow-y: auto;
+            width: 90%;
+            box-shadow: 0 10px 30px rgba(0, 0, 0, 0.3);
+        }
+        
+        .modal-header {
+            padding: 20px;
+            border-bottom: 1px solid #f0f0f0;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+        
+        .modal-header h2 {
+            margin: 0;
+            font-size: 18px;
+            font-weight: 600;
+        }
+        
+        .modal-body {
+            padding: 20px;
+        }
+        
+        .server-section {
+            margin-bottom: 30px;
+            padding: 15px;
+            border: 1px solid #f0f0f0;
+            border-radius: 8px;
+        }
+        
+        .server-section h3 {
+            margin: 0 0 15px 0;
+            font-size: 16px;
+            font-weight: 600;
+            color: #1d1d1f;
+        }
+        
+        .inbound-item {
+            margin: 10px 0;
+        }
+        
+        .inbound-item label {
+            display: flex;
+            align-items: center;
+            cursor: pointer;
+            padding: 8px;
+            border-radius: 4px;
+            transition: background-color 0.2s;
+        }
+        
+        .inbound-item label:hover {
+            background: #f8f9fa;
+        }
+        
+        .inbound-item input[type="checkbox"] {
+            margin-right: 10px;
+        }
+        
+        .user-details {
+            margin-top: 30px;
+            padding: 20px;
+            background: #f8f9fa;
+            border-radius: 8px;
+        }
+        
+        .user-details label {
+            display: block;
+            margin-bottom: 15px;
+            font-weight: 500;
+        }
+        
+        .user-details input {
+            width: 100%;
+            padding: 8px 12px;
+            border: 1px solid #d2d2d7;
+            border-radius: 4px;
+            margin-top: 5px;
+        }
+        
+        .input-group {
+            display: flex;
+            margin-top: 5px;
+        }
+        
+        .input-group input {
+            margin-top: 0;
+            border-radius: 4px 0 0 4px;
+            border-right: none;
+        }
+        
+        .refresh-btn {
+            background: #f8f9fa;
+            border: 1px solid #d2d2d7;
+            border-radius: 0 4px 4px 0;
+            padding: 8px 12px;
+            cursor: pointer;
+            font-size: 16px;
+            transition: background-color 0.2s;
+        }
+        
+        .refresh-btn:hover {
+            background: #e9ecef;
+        }
+        
+        .modal-actions {
+            margin-top: 20px;
+            display: flex;
+            gap: 10px;
+            justify-content: flex-end;
+        }
+    </style>
+</head>
+<body>
+    <div class="layout">
+        <aside class="sidebar">
+            <div class="sidebar-header">
+                <h1>Xray Admin</h1>
+            </div>
+            <nav>
+                <ul class="nav-menu">
+                    <li class="nav-item">
+                        <a href="#dashboard" class="nav-link active" onclick="showPage('dashboard')">Dashboard</a>
+                    </li>
+                    <li class="nav-item">
+                        <a href="#servers" class="nav-link" onclick="showPage('servers')">Servers</a>
+                    </li>
+                    <li class="nav-item">
+                        <a href="#templates" class="nav-link" onclick="showPage('templates')">Templates</a>
+                    </li>
+                    <li class="nav-item">
+                        <a href="#certificates" class="nav-link" onclick="showPage('certificates')">Certificates</a>
+                    </li>
+                    <li class="nav-item">
+                        <a href="#users" class="nav-link" onclick="showPage('users')">Users</a>
+                    </li>
+                    <li class="nav-item">
+                        <a href="#tasks" class="nav-link" onclick="showPage('tasks')">Tasks</a>
+                    </li>
+                </ul>
+            </nav>
+        </aside>
+        
+        <main class="main-content">
+            <div id="alert" class="alert"></div>
+            
+            <!-- Dashboard -->
+            <section id="dashboard" class="page-section active">
+                <div class="page-header">
+                    <h1 class="page-title">Dashboard</h1>
+                    <p class="page-subtitle">Overview of your Xray infrastructure</p>
+                </div>
+                
+                <div class="stats-grid">
+                    <div class="stat-card">
+                        <div class="stat-value" id="totalServers">-</div>
+                        <div class="stat-label">Total Servers</div>
+                    </div>
+                    <div class="stat-card">
+                        <div class="stat-value" id="onlineServers">-</div>
+                        <div class="stat-label">Online Servers</div>
+                    </div>
+                    <div class="stat-card">
+                        <div class="stat-value" id="totalCertificates">-</div>
+                        <div class="stat-label">Certificates</div>
+                    </div>
+                    <div class="stat-card">
+                        <div class="stat-value" id="totalUsers">-</div>
+                        <div class="stat-label">Users</div>
+                    </div>
+                </div>
+                
+                <div class="card">
+                    <div class="card-header">
+                        <h2 class="card-title">Recent Activity</h2>
+                        <p class="card-subtitle">Latest server status and activity</p>
+                    </div>
+                    <div id="recentActivity" class="loading">Loading...</div>
+                </div>
+            </section>
+            
+            <!-- Servers -->
+            <section id="servers" class="page-section">
+                <div class="page-header">
+                    <h1 class="page-title">Servers</h1>
+                    <p class="page-subtitle">Manage your Xray server instances</p>
+                </div>
+                
+                <div class="card">
+                    <div class="card-header">
+                        <h2 class="card-title">Add New Server</h2>
+                        <p class="card-subtitle">Register a new Xray server instance</p>
+                    </div>
+                    <form id="serverForm" class="form-grid">
+                        <div class="form-group">
+                            <label class="form-label" for="serverName">Server Name *</label>
+                            <input type="text" id="serverName" class="form-input" placeholder="Enter server name">
+                        </div>
+                        <div class="form-group">
+                            <label class="form-label" for="serverHostname">Hostname *</label>
+                            <input type="text" id="serverHostname" class="form-input" placeholder="server.example.com">
+                        </div>
+                        <div class="form-group">
+                            <label class="form-label" for="serverPort">gRPC Port</label>
+                            <input type="number" id="serverPort" class="form-input" placeholder="2053">
+                        </div>
+                        <div class="form-group">
+                            <label class="form-label" for="serverCredentials">API Credentials</label>
+                            <input type="text" id="serverCredentials" class="form-input" placeholder="Optional credentials">
+                        </div>
+                        <div class="form-group">
+                            <button type="submit" class="btn btn-primary">Add Server</button>
+                        </div>
+                    </form>
+                </div>
+                
+                <div class="card">
+                    <div class="card-header">
+                        <h2 class="card-title">Servers List</h2>
+                    </div>
+                    <div id="serversTable" class="loading">Loading...</div>
+                </div>
+            </section>
+            
+            <!-- Templates -->
+            <section id="templates" class="page-section">
+                <div class="page-header">
+                    <h1 class="page-title">Inbound Templates</h1>
+                    <p class="page-subtitle">Manage reusable inbound configurations</p>
+                </div>
+                
+                <div class="card">
+                    <div class="card-header">
+                        <h2 class="card-title">Templates List</h2>
+                    </div>
+                    <div id="templatesTable" class="loading">Loading...</div>
+                </div>
+            </section>
+            
+            <!-- Certificates -->
+            <section id="certificates" class="page-section">
+                <div class="page-header">
+                    <h1 class="page-title">SSL Certificates</h1>
+                    <p class="page-subtitle">Manage SSL/TLS certificates for your servers</p>
+                </div>
+                
+                <div class="card">
+                    <div class="card-header">
+                        <h2 class="card-title">Certificates List</h2>
+                    </div>
+                    <div id="certificatesTable" class="loading">Loading...</div>
+                </div>
+            </section>
+            
+            <!-- Users -->
+            <section id="users" class="page-section">
+                <div class="page-header">
+                    <h1 class="page-title">Users</h1>
+                    <p class="page-subtitle">Manage user accounts and access</p>
+                </div>
+                
+                <div class="card">
+                    <div class="card-header">
+                        <h2 class="card-title">Users List</h2>
+                    </div>
+                    <div id="usersTable" class="loading">Loading...</div>
+                </div>
+            </section>
+
+            <section id="tasks" class="page-section">
+                <div class="page-header">
+                    <h1 class="page-title">Background Tasks</h1>
+                    <p class="page-subtitle">Monitor scheduled tasks and background jobs</p>
+                </div>
+                
+                <div class="card">
+                    <div class="card-header">
+                        <h2 class="card-title">Active Tasks</h2>
+                        <button class="button button-outline" onclick="refreshTasks()">
+                            <span class="icon">🔄</span>
+                            Refresh
+                        </button>
+                    </div>
+                    <div id="tasksTable" class="loading">Loading...</div>
+                </div>
+            </section>
+        </main>
+    </div>
+    
+    <script>
+        const API_BASE = '/api';
+        let currentPage = 'dashboard';
+        
+        // Navigation
+        function showPage(page) {
+            // Hide all pages
+            document.querySelectorAll('.page-section').forEach(section => {
+                section.classList.remove('active');
+            });
+            
+            // Remove active class from all nav links
+            document.querySelectorAll('.nav-link').forEach(link => {
+                link.classList.remove('active');
+            });
+            
+            // Show selected page
+            document.getElementById(page).classList.add('active');
+            document.querySelector(`[onclick="showPage('${page}')"]`).classList.add('active');
+            
+            currentPage = page;
+            
+            // Load page data
+            loadPageData(page);
+        }
+        
+        function loadPageData(page) {
+            switch(page) {
+                case 'dashboard':
+                    loadDashboard();
+                    break;
+                case 'servers':
+                    loadServers();
+                    break;
+                case 'templates':
+                    loadTemplates();
+                    break;
+                case 'certificates':
+                    loadCertificates();
+                    break;
+                case 'users':
+                    loadUsers();
+                    break;
+                case 'tasks':
+                    loadTasks();
+                    break;
+            }
+        }
+        
+        // Dashboard
+        async function loadDashboard() {
+            try {
+                // Load statistics
+                const [servers, certificates, users] = await Promise.all([
+                    fetch(`${API_BASE}/servers`).then(r => r.json()),
+                    fetch(`${API_BASE}/certificates`).then(r => r.json()),
+                    fetch(`${API_BASE}/users`).then(r => r.json())
+                ]);
+                
+                document.getElementById('totalServers').textContent = servers.length;
+                document.getElementById('onlineServers').textContent = servers.filter(s => s.status === 'online').length;
+                document.getElementById('totalCertificates').textContent = certificates.length;
+                document.getElementById('totalUsers').textContent = users.users ? users.users.length : users.length;
+                
+                // Recent activity
+                const activity = servers.slice(0, 5).map(server => 
+                    `<p>Server "${server.name}" is ${server.status}</p>`
+                ).join('');
+                
+                document.getElementById('recentActivity').innerHTML = activity || '<p>No recent activity</p>';
+            } catch (error) {
+                showAlert('Error loading dashboard: ' + error.message, 'error');
+            }
+        }
+        
+        // Servers
+        async function loadServers() {
+            try {
+                const response = await fetch(`${API_BASE}/servers`);
+                const servers = await response.json();
+                
+                if (servers.length === 0) {
+                    document.getElementById('serversTable').innerHTML = '<div class="empty-state"><h3>No servers found</h3><p>Add your first server to get started</p></div>';
+                    return;
+                }
+                
+                const table = `
+                    <table class="table">
+                        <thead>
+                            <tr>
+                                <th>Name</th>
+                                <th>Hostname</th>
+                                <th>Port</th>
+                                <th>Status</th>
+                                <th>Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            ${servers.map(server => `
+                                <tr>
+                                    <td><strong>${escapeHtml(server.name)}</strong></td>
+                                    <td>${escapeHtml(server.hostname)}</td>
+                                    <td>${server.grpc_port}</td>
+                                    <td><span class="status-badge status-${server.status}">${server.status}</span></td>
+                                    <td>
+                                        <div class="actions">
+                                            <button class="btn btn-small btn-success" onclick="testConnection('${server.id}')">Test</button>
+                                            <button class="btn btn-small btn-danger" onclick="deleteServer('${server.id}', '${escapeHtml(server.name)}')">Delete</button>
+                                        </div>
+                                    </td>
+                                </tr>
+                            `).join('')}
+                        </tbody>
+                    </table>
+                `;
+                
+                document.getElementById('serversTable').innerHTML = table;
+            } catch (error) {
+                document.getElementById('serversTable').innerHTML = '<div class="empty-state"><h3>Error loading servers</h3><p>' + error.message + '</p></div>';
+            }
+        }
+        
+        // Templates
+        async function loadTemplates() {
+            try {
+                const response = await fetch(`${API_BASE}/templates`);
+                const templates = await response.json();
+                
+                if (templates.length === 0) {
+                    document.getElementById('templatesTable').innerHTML = '<div class="empty-state"><h3>No templates found</h3><p>Templates help you quickly configure server inbounds</p></div>';
+                    return;
+                }
+                
+                const table = `
+                    <table class="table">
+                        <thead>
+                            <tr>
+                                <th>Name</th>
+                                <th>Protocol</th>
+                                <th>Default Port</th>
+                                <th>TLS Required</th>
+                                <th>Active</th>
+                                <th>Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            ${templates.map(template => `
+                                <tr>
+                                    <td><strong>${escapeHtml(template.name)}</strong></td>
+                                    <td>${template.protocol}</td>
+                                    <td>${template.default_port}</td>
+                                    <td>${template.requires_tls ? 'Yes' : 'No'}</td>
+                                    <td><span class="status-badge ${template.is_active ? 'status-online' : 'status-offline'}">${template.is_active ? 'Active' : 'Inactive'}</span></td>
+                                    <td>
+                                        <div class="actions">
+                                            <button class="btn btn-small btn-secondary">Edit</button>
+                                            <button class="btn btn-small btn-danger">Delete</button>
+                                        </div>
+                                    </td>
+                                </tr>
+                            `).join('')}
+                        </tbody>
+                    </table>
+                `;
+                
+                document.getElementById('templatesTable').innerHTML = table;
+            } catch (error) {
+                document.getElementById('templatesTable').innerHTML = '<div class="empty-state"><h3>Error loading templates</h3><p>' + error.message + '</p></div>';
+            }
+        }
+        
+        // Certificates
+        async function loadCertificates() {
+            try {
+                const response = await fetch(`${API_BASE}/certificates`);
+                const certificates = await response.json();
+                
+                if (certificates.length === 0) {
+                    document.getElementById('certificatesTable').innerHTML = '<div class="empty-state"><h3>No certificates found</h3><p>Upload or generate SSL certificates for your servers</p></div>';
+                    return;
+                }
+                
+                const table = `
+                    <table class="table">
+                        <thead>
+                            <tr>
+                                <th>Name</th>
+                                <th>Domain</th>
+                                <th>Type</th>
+                                <th>Expires</th>
+                                <th>Auto Renew</th>
+                                <th>Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            ${certificates.map(cert => `
+                                <tr>
+                                    <td><strong>${escapeHtml(cert.name)}</strong></td>
+                                    <td>${escapeHtml(cert.domain)}</td>
+                                    <td>${cert.cert_type}</td>
+                                    <td>${new Date(cert.expires_at).toLocaleDateString()}</td>
+                                    <td>${cert.auto_renew ? 'Yes' : 'No'}</td>
+                                    <td>
+                                        <div class="actions">
+                                            <button class="btn btn-small btn-secondary">View</button>
+                                            <button class="btn btn-small btn-danger">Delete</button>
+                                        </div>
+                                    </td>
+                                </tr>
+                            `).join('')}
+                        </tbody>
+                    </table>
+                `;
+                
+                document.getElementById('certificatesTable').innerHTML = table;
+            } catch (error) {
+                document.getElementById('certificatesTable').innerHTML = '<div class="empty-state"><h3>Error loading certificates</h3><p>' + error.message + '</p></div>';
+            }
+        }
+        
+        // Users
+        async function loadUsers() {
+            try {
+                const response = await fetch(`${API_BASE}/users`);
+                const data = await response.json();
+                const users = data.users || data;
+                
+                if (users.length === 0) {
+                    document.getElementById('usersTable').innerHTML = '<div class="empty-state"><h3>No users found</h3><p>Create user accounts for access management</p></div>';
+                    return;
+                }
+                
+                const table = `
+                    <table class="table">
+                        <thead>
+                            <tr>
+                                <th>Name</th>
+                                <th>Comment</th>
+                                <th>Telegram ID</th>
+                                <th>Created</th>
+                                <th>Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            ${users.map(user => `
+                                <tr>
+                                    <td><strong>${escapeHtml(user.name)}</strong></td>
+                                    <td>${escapeHtml(user.comment || '-')}</td>
+                                    <td>${user.telegram_id || '-'}</td>
+                                    <td>${new Date(user.created_at).toLocaleDateString()}</td>
+                                    <td>
+                                        <div class="actions">
+                                            <button class="btn btn-small btn-secondary" onclick="editUserAccess('${user.id}', '${escapeHtml(user.name)}')">Manage Access</button>
+                                            <button class="btn btn-small btn-danger">Delete</button>
+                                        </div>
+                                    </td>
+                                </tr>
+                            `).join('')}
+                        </tbody>
+                    </table>
+                `;
+                
+                document.getElementById('usersTable').innerHTML = table;
+            } catch (error) {
+                document.getElementById('usersTable').innerHTML = '<div class="empty-state"><h3>Error loading users</h3><p>' + error.message + '</p></div>';
+            }
+        }
+        
+        // Server form submission
+        document.getElementById('serverForm').addEventListener('submit', async (e) => {
+            e.preventDefault();
+            
+            const name = document.getElementById('serverName').value.trim();
+            const hostname = document.getElementById('serverHostname').value.trim();
+            const grpc_port = document.getElementById('serverPort').value;
+            const api_credentials = document.getElementById('serverCredentials').value.trim();
+            
+            if (!name || !hostname) {
+                showAlert('Name and hostname are required', 'error');
+                return;
+            }
+            
+            const serverData = { name, hostname };
+            if (grpc_port) serverData.grpc_port = parseInt(grpc_port);
+            if (api_credentials) serverData.api_credentials = api_credentials;
+            
+            try {
+                const response = await fetch(`${API_BASE}/servers`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(serverData)
+                });
+                
+                if (!response.ok) throw new Error('Failed to create server');
+                
+                showAlert('Server created successfully', 'success');
+                document.getElementById('serverForm').reset();
+                loadServers();
+            } catch (error) {
+                showAlert('Error creating server: ' + error.message, 'error');
+            }
+        });
+        
+        // Server actions
+        async function testConnection(serverId) {
+            try {
+                const response = await fetch(`${API_BASE}/servers/${serverId}/test`, {
+                    method: 'POST'
+                });
+                const result = await response.json();
+                
+                if (result.connected) {
+                    showAlert('Connection successful!', 'success');
+                } else {
+                    showAlert('Connection failed', 'error');
+                }
+            } catch (error) {
+                showAlert('Error testing connection: ' + error.message, 'error');
+            }
+        }
+        
+        async function deleteServer(serverId, serverName) {
+            if (!confirm(`Are you sure you want to delete server "${serverName}"?`)) return;
+            
+            try {
+                const response = await fetch(`${API_BASE}/servers/${serverId}`, {
+                    method: 'DELETE'
+                });
+                
+                if (!response.ok) throw new Error('Failed to delete server');
+                
+                showAlert('Server deleted successfully', 'success');
+                loadServers();
+            } catch (error) {
+                showAlert('Error deleting server: ' + error.message, 'error');
+            }
+        }
+        
+        // Utility functions
+        function showAlert(message, type) {
+            const alert = document.getElementById('alert');
+            alert.textContent = message;
+            alert.className = `alert alert-${type} show`;
+            
+            setTimeout(() => {
+                alert.classList.remove('show');
+            }, 3000);
+        }
+        
+        function escapeHtml(text) {
+            if (!text) return '';
+            const div = document.createElement('div');
+            div.textContent = text;
+            return div.innerHTML;
+        }
+        
+        // User Access Management
+        async function editUserAccess(userId, userName) {
+            try {
+                // Load servers and their inbounds
+                const serversResponse = await fetch(`${API_BASE}/servers`);
+                const servers = await serversResponse.json();
+                
+                let modalContent = `
+                    <div class="modal-overlay" onclick="closeUserAccessModal()">
+                        <div class="modal-content" onclick="event.stopPropagation()">
+                            <div class="modal-header">
+                                <h2>Manage Access: ${escapeHtml(userName)}</h2>
+                                <button class="btn btn-small" onclick="closeUserAccessModal()">Close</button>
+                            </div>
+                            <div class="modal-body">
+                                <form id="userAccessForm">
+                                    <input type="hidden" id="editUserId" value="${userId}">
+                `;
+                
+                for (const server of servers) {
+                    modalContent += `
+                        <div class="server-section">
+                            <h3>${escapeHtml(server.name)} (${escapeHtml(server.hostname)}:${server.grpc_port})</h3>
+                    `;
+                    
+                    try {
+                        const inboundsResponse = await fetch(`${API_BASE}/servers/${server.id}/inbounds`);
+                        const inbounds = await inboundsResponse.json();
+                        
+                        if (inbounds.length > 0) {
+                            for (const inbound of inbounds) {
+                                modalContent += `
+                                    <div class="inbound-item">
+                                        <label>
+                                            <input type="checkbox" name="access" 
+                                                   value="${server.id}|${inbound.id}" 
+                                                   data-server-id="${server.id}"
+                                                   data-inbound-id="${inbound.id}"
+                                                   data-server-name="${escapeHtml(server.name)}"
+                                                   data-inbound-port="${inbound.port_override || 'default'}">
+                                            ${escapeHtml(inbound.template_name || 'Unknown Template')}
+                                        </label>
+                                    </div>
+                                `;
+                            }
+                        } else {
+                            modalContent += '<p>No inbounds configured</p>';
+                        }
+                    } catch (error) {
+                        modalContent += '<p>Error loading inbounds</p>';
+                    }
+                    
+                    modalContent += '</div>';
+                }
+                
+                modalContent += `
+                                    <div class="user-details">
+                                        <label>Email for Xray:
+                                            <input type="email" id="xrayEmail" placeholder="user@example.com" required>
+                                        </label>
+                                        <label>User ID (UUID for VLESS/VMess, password for Trojan):
+                                            <div class="input-group">
+                                                <input type="text" id="xrayUserId" placeholder="Generated UUID" required>
+                                                <button type="button" class="refresh-btn" onclick="generateUUID()" title="Generate new UUID">⟳</button>
+                                            </div>
+                                        </label>
+                                        <label>Level (0-255):
+                                            <input type="number" id="xrayLevel" min="0" max="255" value="0">
+                                        </label>
+                                    </div>
+                                    <div class="modal-actions">
+                                        <button type="submit" class="btn btn-primary">Save Access</button>
+                                        <button type="button" class="btn btn-secondary" onclick="closeUserAccessModal()">Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                    </div>
+                `;
+                
+                document.body.insertAdjacentHTML('beforeend', modalContent);
+                
+                // Generate initial UUID
+                generateUUID();
+                
+                // Handle form submission
+                document.getElementById('userAccessForm').addEventListener('submit', saveUserAccess);
+                
+            } catch (error) {
+                showAlert('Error loading server data: ' + error.message, 'error');
+            }
+        }
+        
+        function closeUserAccessModal() {
+            const modal = document.querySelector('.modal-overlay');
+            if (modal) {
+                modal.remove();
+            }
+        }
+        
+        function generateUUID() {
+            const uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+                const r = Math.random() * 16 | 0;
+                const v = c == 'x' ? r : (r & 0x3 | 0x8);
+                return v.toString(16);
+            });
+            document.getElementById('xrayUserId').value = uuid;
+        }
+        
+        async function saveUserAccess(event) {
+            event.preventDefault();
+            
+            const userId = document.getElementById('editUserId').value;
+            const email = document.getElementById('xrayEmail').value;
+            const xrayUserId = document.getElementById('xrayUserId').value;
+            const level = parseInt(document.getElementById('xrayLevel').value) || 0;
+            
+            const checkedAccess = document.querySelectorAll('input[name="access"]:checked');
+            
+            if (checkedAccess.length === 0) {
+                showAlert('Please select at least one server/inbound', 'error');
+                return;
+            }
+            
+            if (!email || !xrayUserId) {
+                showAlert('Please fill in all required fields', 'error');
+                return;
+            }
+            
+            try {
+                for (const checkbox of checkedAccess) {
+                    const serverId = checkbox.dataset.serverId;
+                    const inboundId = checkbox.dataset.inboundId;
+                    
+                    const userData = {
+                        email: email,
+                        id: xrayUserId,
+                        level: level
+                    };
+                    
+                    const response = await fetch(`${API_BASE}/servers/${serverId}/inbounds/${inboundId}/users`, {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json'
+                        },
+                        body: JSON.stringify(userData)
+                    });
+                    
+                    if (!response.ok) {
+                        throw new Error(`Failed to add user to ${checkbox.dataset.serverName} inbound ${checkbox.dataset.inboundPort}`);
+                    }
+                }
+                
+                showAlert('User access saved successfully', 'success');
+                closeUserAccessModal();
+                
+            } catch (error) {
+                showAlert('Error saving user access: ' + error.message, 'error');
+            }
+        }
+        
+        // Tasks
+        async function loadTasks() {
+            try {
+                // TODO: Add API endpoint for tasks when ready
+                // For now, show static task information
+                const tasksData = [
+                    {
+                        id: "xray_sync",
+                        name: "Xray Synchronization",
+                        description: "Synchronizes database state with xray servers",
+                        schedule: "0 * * * * * (every minute)",
+                        status: "running",
+                        lastRun: new Date().toISOString(),
+                        nextRun: new Date(Date.now() + 60000).toISOString(),
+                        totalRuns: Math.floor(Math.random() * 50) + 10,
+                        successCount: Math.floor(Math.random() * 45) + 8,
+                        errorCount: Math.floor(Math.random() * 3),
+                        lastDurationMs: Math.floor(Math.random() * 2000) + 500,
+                        lastError: null
+                    }
+                ];
+                
+                if (tasksData.length === 0) {
+                    document.getElementById('tasksTable').innerHTML = '<div class="empty-state"><h3>No tasks configured</h3><p>Background tasks will appear here when configured</p></div>';
+                    return;
+                }
+                
+                const table = `
+                    <table class="table">
+                        <thead>
+                            <tr>
+                                <th>Task Name</th>
+                                <th>Schedule</th>
+                                <th>Status</th>
+                                <th>Last Run</th>
+                                <th>Next Run</th>
+                                <th>Performance</th>
+                                <th>Duration</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            ${tasksData.map(task => {
+                                const statusIcon = getTaskStatusIcon(task.status);
+                                const successRate = task.totalRuns > 0 ? Math.round((task.successCount / task.totalRuns) * 100) : 0;
+                                return `
+                                <tr>
+                                    <td>
+                                        <strong>${escapeHtml(task.name)}</strong>
+                                        <br><small class="text-muted">${escapeHtml(task.description)}</small>
+                                    </td>
+                                    <td><code>${escapeHtml(task.schedule)}</code></td>
+                                    <td>
+                                        <span class="status ${getTaskStatusClass(task.status)}">
+                                            ${statusIcon} ${task.status}
+                                        </span>
+                                        ${task.lastError ? `<br><small class="text-muted">Error: ${escapeHtml(task.lastError.substring(0, 50))}...</small>` : ''}
+                                    </td>
+                                    <td>${task.lastRun ? new Date(task.lastRun).toLocaleString() : '-'}</td>
+                                    <td>${task.nextRun ? new Date(task.nextRun).toLocaleString() : '-'}</td>
+                                    <td>
+                                        <div class="task-stats">
+                                            <div>✅ ${task.successCount} / ❌ ${task.errorCount}</div>
+                                            <div class="success-rate ${successRate >= 95 ? 'success-rate-good' : successRate >= 80 ? 'success-rate-ok' : 'success-rate-bad'}">
+                                                ${successRate}% success
+                                            </div>
+                                        </div>
+                                    </td>
+                                    <td>${task.lastDurationMs ? task.lastDurationMs + 'ms' : '-'}</td>
+                                </tr>
+                            `}).join('')}
+                        </tbody>
+                    </table>
+                `;
+                
+                document.getElementById('tasksTable').innerHTML = table;
+                
+            } catch (error) {
+                document.getElementById('tasksTable').innerHTML = '<div class="error">Failed to load tasks: ' + error.message + '</div>';
+            }
+        }
+
+        function getTaskStatusIcon(status) {
+            switch(status) {
+                case 'running': return '🔄';
+                case 'success': return '✅';
+                case 'error': return '❌';
+                case 'idle': return '⏸️';
+                default: return '❓';
+            }
+        }
+
+        function getTaskStatusClass(status) {
+            switch(status) {
+                case 'running': return 'status-running';
+                case 'success': return 'status-success';
+                case 'error': return 'status-error';
+                case 'idle': return 'status-idle';
+                default: return 'status-unknown';
+            }
+        }
+
+        function refreshTasks() {
+            document.getElementById('tasksTable').innerHTML = '<div class="loading">Loading...</div>';
+            loadTasks();
+        }
+
+        // Initialize
+        loadPageData('dashboard');
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/static/admin/css/main.css b/static/admin/css/main.css
deleted file mode 100644
index bf958b4..0000000
--- a/static/admin/css/main.css
+++ /dev/null
@@ -1,239 +0,0 @@
-/* static/admin/css/main.css */
-
-/* Bulk Action Section Styling */
-.bulk-actions-section {
-    background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
-    border: 1px solid #dee2e6;
-    border-left: 4px solid #007cba;
-    border-radius: 8px;
-    padding: 20px;
-    margin: 20px 0;
-    box-shadow: 0 2px 4px rgba(0,0,0,0.05);
-}
-
-.bulk-actions-section h3 {
-    color: #007cba;
-    margin-top: 0;
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    font-size: 18px;
-}
-
-.bulk-actions-section p {
-    color: #6c757d;
-    margin-bottom: 15px;
-    line-height: 1.5;
-}
-
-/* Action Button Styles */
-.server-action-btn, .bulk-action-btn {
-    display: inline-flex;
-    align-items: center;
-    gap: 8px;
-    padding: 10px 15px;
-    border-radius: 6px;
-    text-decoration: none;
-    font-weight: 500;
-    font-size: 14px;
-    border: none;
-    cursor: pointer;
-    transition: all 0.3s ease;
-    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-    position: relative;
-    overflow: hidden;
-}
-
-.server-action-btn:before, .bulk-action-btn:before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: -100%;
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(90deg, transparent, rgba(255,255,255,0.2), transparent);
-    transition: left 0.5s;
-}
-
-.server-action-btn:hover:before, .bulk-action-btn:hover:before {
-    left: 100%;
-}
-
-.server-action-btn:hover, .bulk-action-btn:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 4px 12px rgba(0,0,0,0.15);
-    text-decoration: none;
-}
-
-/* Specific button colors */
-.btn-move-clients {
-    background-color: #007cba;
-    color: white;
-}
-
-.btn-move-clients:hover {
-    background-color: #005a8b !important;
-    color: white;
-}
-
-.btn-purge-users {
-    background-color: #dc3545;
-    color: white;
-}
-
-.btn-purge-users:hover {
-    background-color: #c82333 !important;
-    color: white;
-}
-
-/* Server list action buttons */
-.field-server_actions {
-    min-width: 160px;
-}
-
-.field-server_actions .server-action-btn {
-    padding: 5px 8px;
-    font-size: 11px;
-    gap: 4px;
-    margin: 2px;
-}
-
-/* Server statistics section */
-.server-stats-section {
-    background-color: #e8f4fd;
-    border: 1px solid #bee5eb;
-    border-radius: 6px;
-    padding: 12px;
-    margin: 15px 0;
-}
-
-.server-stats-grid {
-    display: flex;
-    gap: 20px;
-    flex-wrap: wrap;
-    align-items: center;
-}
-
-.stat-item {
-    display: flex;
-    align-items: center;
-    gap: 5px;
-}
-
-.stat-label {
-    color: #495057;
-    font-weight: 500;
-}
-
-.stat-value {
-    color: #007cba;
-    font-weight: bold;
-}
-
-/* Tip section styling */
-.tip-section {
-    background-color: rgba(255, 243, 205, 0.8);
-    border-left: 4px solid #ffc107;
-    border-radius: 4px;
-    padding: 12px;
-    margin-top: 15px;
-}
-
-.tip-section small {
-    color: #856404;
-    line-height: 1.4;
-}
-
-/* Loading states */
-.server-action-btn.loading {
-    pointer-events: none;
-    opacity: 0.7;
-}
-
-.server-action-btn.loading:after {
-    content: '';
-    position: absolute;
-    width: 16px;
-    height: 16px;
-    margin: auto;
-    border: 2px solid transparent;
-    border-top-color: #ffffff;
-    border-radius: 50%;
-    animation: spin 1s linear infinite;
-}
-
-@keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-}
-
-/* Responsive design */
-@media (max-width: 768px) {
-    .bulk-actions-section {
-        padding: 15px;
-    }
-    
-    .server-action-btn, .bulk-action-btn {
-        width: 100%;
-        justify-content: center;
-        margin-bottom: 8px;
-    }
-    
-    .server-stats-grid {
-        flex-direction: column;
-        align-items: flex-start;
-        gap: 10px;
-    }
-    
-    .field-server_actions > div {
-        flex-direction: column;
-    }
-    
-    .field-server_actions .server-action-btn {
-        width: 100%;
-        justify-content: center;
-        margin: 2px 0;
-    }
-}
-
-@media (max-width: 480px) {
-    .bulk-actions-section h3 {
-        font-size: 16px;
-    }
-    
-    .server-action-btn, .bulk-action-btn {
-        font-size: 13px;
-        padding: 8px 12px;
-    }
-}
-
-/* Dark mode support */
-@media (prefers-color-scheme: dark) {
-    .bulk-actions-section {
-        background: linear-gradient(135deg, #2d3748 0%, #4a5568 100%);
-        border-color: #4a5568;
-        color: #e2e8f0;
-    }
-    
-    .bulk-actions-section h3 {
-        color: #63b3ed;
-    }
-    
-    .bulk-actions-section p {
-        color: #a0aec0;
-    }
-    
-    .server-stats-section {
-        background-color: #2d3748;
-        border-color: #4a5568;
-        color: #e2e8f0;
-    }
-    
-    .stat-label {
-        color: #a0aec0;
-    }
-    
-    .stat-value {
-        color: #63b3ed;
-    }
-}
diff --git a/static/admin/css/vpn_admin.css b/static/admin/css/vpn_admin.css
deleted file mode 100644
index a9ee975..0000000
--- a/static/admin/css/vpn_admin.css
+++ /dev/null
@@ -1,342 +0,0 @@
-/* Custom styles for VPN admin interface */
-
-/* Quick action buttons in server list */
-.quick-actions .button {
-    display: inline-block;
-    padding: 4px 8px;
-    margin: 0 2px;
-    font-size: 11px;
-    line-height: 1.2;
-    text-decoration: none;
-    border: 1px solid #ccc;
-    border-radius: 3px;
-    background: linear-gradient(to bottom, #f8f8f8, #e8e8e8);
-    color: #333;
-    cursor: pointer;
-    white-space: nowrap;
-    min-width: 60px;
-    text-align: center;
-    box-shadow: 0 1px 2px rgba(0,0,0,0.1);
-    transition: all 0.2s ease;
-}
-
-.quick-actions .button:hover {
-    background: linear-gradient(to bottom, #e8e8e8, #d8d8d8);
-    border-color: #bbb;
-    color: #000;
-    text-decoration: none;
-    box-shadow: 0 2px 4px rgba(0,0,0,0.15);
-}
-
-.quick-actions .button:active {
-    background: linear-gradient(to bottom, #d8d8d8, #e8e8e8);
-    box-shadow: inset 0 1px 2px rgba(0,0,0,0.2);
-}
-
-/* Sync button - blue theme */
-.quick-actions .button[href*="/sync/"] {
-    background: linear-gradient(to bottom, #4a90e2, #357abd);
-    border-color: #2968a3;
-    color: white;
-}
-
-.quick-actions .button[href*="/sync/"]:hover {
-    background: linear-gradient(to bottom, #357abd, #2968a3);
-    border-color: #1f5582;
-}
-
-/* Move clients button - orange theme */
-.quick-actions .button[href*="/move-clients/"] {
-    background: linear-gradient(to bottom, #f39c12, #e67e22);
-    border-color: #d35400;
-    color: white;
-}
-
-.quick-actions .button[href*="/move-clients/"]:hover {
-    background: linear-gradient(to bottom, #e67e22, #d35400);
-    border-color: #bf4f36;
-}
-
-/* Status indicators improvements */
-.server-status-ok {
-    color: #27ae60;
-    font-weight: bold;
-}
-
-.server-status-error {
-    color: #e74c3c;
-    font-weight: bold;
-}
-
-.server-status-warning {
-    color: #f39c12;
-    font-weight: bold;
-}
-
-/* Better spacing for list display */
-.admin-object-tools {
-    margin-bottom: 10px;
-}
-
-/* Improve readability of pre-formatted status */
-.changelist-results pre {
-    font-size: 11px;
-    margin: 0;
-    padding: 2px 4px;
-    background: #f8f8f8;
-    border: 1px solid #ddd;
-    border-radius: 3px;
-    max-width: 200px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-/* Server admin compact styles */
-.server-stats {
-    max-width: 120px;
-    min-width: 90px;
-}
-
-.server-activity {
-    max-width: 140px;
-    min-width: 100px;
-}
-
-.server-status {
-    max-width: 160px;
-    min-width: 120px;
-}
-
-.server-comment {
-    max-width: 200px;
-    min-width: 100px;
-    word-wrap: break-word;
-}
-
-/* Compact server display elements */
-.changelist-results .server-stats div,
-.changelist-results .server-activity div,
-.changelist-results .server-status div {
-    line-height: 1.3;
-    margin: 1px 0;
-}
-
-/* Status indicator colors */
-.status-online {
-    color: #16a34a !important;
-    font-weight: bold;
-}
-
-.status-error {
-    color: #dc2626 !important;
-    font-weight: bold;
-}
-
-.status-warning {
-    color: #f97316 !important;
-    font-weight: bold;
-}
-
-.status-unavailable {
-    color: #f97316 !important;
-    font-weight: bold;
-}
-
-/* Activity indicators */
-.activity-high {
-    color: #16a34a !important;
-}
-
-.activity-medium {
-    color: #eab308 !important;
-}
-
-.activity-low {
-    color: #f97316 !important;
-}
-
-.activity-none {
-    color: #dc2626 !important;
-}
-
-/* User stats indicators */
-.users-active {
-    color: #16a34a !important;
-}
-
-.users-medium {
-    color: #eab308 !important;
-}
-
-.users-low {
-    color: #f97316 !important;
-}
-
-.users-none {
-    color: #9ca3af !important;
-}
-
-/* Table cell width constraints for better layout */
-table.changelist-results th:nth-child(1), /* Name */
-table.changelist-results td:nth-child(1) {
-    width: 180px;
-    max-width: 180px;
-}
-
-table.changelist-results th:nth-child(3), /* Comment */
-table.changelist-results td:nth-child(3) {
-    width: 200px;
-    max-width: 200px;
-}
-
-table.changelist-results th:nth-child(4), /* User Stats */
-table.changelist-results td:nth-child(4) {
-    width: 120px;
-    max-width: 120px;
-}
-
-table.changelist-results th:nth-child(5), /* Activity */
-table.changelist-results td:nth-child(5) {
-    width: 140px;
-    max-width: 140px;
-}
-
-table.changelist-results th:nth-child(6), /* Status */
-table.changelist-results td:nth-child(6) {
-    width: 160px;
-    max-width: 160px;
-}
-
-/* Ensure text doesn't overflow in server admin */
-.changelist-results td {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    vertical-align: top;
-}
-
-/* Allow wrapping for multi-line server info displays */
-.changelist-results td .server-stats,
-.changelist-results td .server-activity,
-.changelist-results td .server-status {
-    white-space: normal;
-}
-
-/* Server type icons */
-.server-type-outline {
-    color: #3b82f6;
-}
-
-.server-type-wireguard {
-    color: #10b981;
-}
-
-/* Tooltip styles for truncated text */
-[title] {
-    cursor: help;
-    border-bottom: 1px dotted #999;
-}
-
-/* Form improvements for move clients page */
-.form-row.field-box {
-    border: 1px solid #ddd;
-    border-radius: 4px;
-    padding: 10px;
-    margin: 10px 0;
-    background: #f9f9f9;
-}
-
-.form-row.field-box label {
-    font-weight: bold;
-    color: #333;
-    display: block;
-    margin-bottom: 5px;
-}
-
-.form-row.field-box .readonly {
-    padding: 5px;
-    background: white;
-    border: 1px solid #ddd;
-    border-radius: 3px;
-}
-
-.help {
-    background: #e8f4fd;
-    border: 1px solid #b8daff;
-    border-radius: 4px;
-    padding: 15px;
-    margin: 20px 0;
-}
-
-.help h3 {
-    margin-top: 0;
-    color: #0066cc;
-}
-
-.help ul {
-    margin-bottom: 0;
-}
-
-.help li {
-    margin-bottom: 5px;
-}
-
-/* Make user statistics section wider */
-.field-user_statistics_summary {
-    width: 100% !important;
-}
-
-.field-user_statistics_summary .readonly {
-    max-width: none !important;
-    width: 100% !important;
-}
-
-.field-user_statistics_summary .user-management-section {
-    width: 100% !important;
-    max-width: none !important;
-}
-
-/* Wider fieldset for statistics */
-.wide {
-    width: 100% !important;
-}
-
-.wide .form-row {
-    width: 100% !important;
-}
-
-/* Server status button styles */
-.check-status-btn {
-    transition: all 0.2s ease;
-    white-space: nowrap;
-}
-
-.check-status-btn:hover {
-    opacity: 0.8;
-    transform: scale(1.05);
-}
-
-.check-status-btn:disabled {
-    opacity: 0.6;
-    cursor: not-allowed;
-}
-
-/* Make admin tables more responsive */
-.changelist-results table {
-    width: 100%;
-    table-layout: auto;
-}
-
-/* Improve button spacing */
-.btn-sm-custom {
-    margin: 0 2px;
-    display: inline-block;
-}
-
-/* Hide xray-subscriptions tab if it appears */
-#xray-subscriptions-tab,
-a[href="#xray-subscriptions-tab"],
-li:has(a[href="#xray-subscriptions-tab"]) {
-    display: none !important;
-}
diff --git a/static/admin/js/generate_link.js b/static/admin/js/generate_link.js
deleted file mode 100644
index c447b30..0000000
--- a/static/admin/js/generate_link.js
+++ /dev/null
@@ -1,203 +0,0 @@
-// static/admin/js/generate_uuid.js
-
-function generateLink(button) {
-    let row = button.closest('tr');
-    let inputField = row.querySelector('input[name$="link"]');
-
-    if (inputField) {
-        inputField.value = generateRandomString(16);
-    }
-}
-
-function generateRandomString(length) {
-    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-    let result = '';
-    for (let i = 0; i < length; i++) {
-        result += chars.charAt(Math.floor(Math.random() * chars.length));
-    }
-    return result;
-}
-
-// OutlineServer JSON Configuration Functionality
-document.addEventListener('DOMContentLoaded', function() {
-    
-    // JSON Import functionality
-    const importJsonBtn = document.getElementById('import-json-btn');
-    const importJsonTextarea = document.getElementById('import-json-config');
-    
-    if (importJsonBtn && importJsonTextarea) {
-        // Auto-fill on paste event
-        importJsonTextarea.addEventListener('paste', function(e) {
-            // Small delay to let paste complete
-            setTimeout(() => {
-                tryAutoFillFromJson();
-            }, 100);
-        });
-        
-        // Manual import button
-        importJsonBtn.addEventListener('click', function() {
-            tryAutoFillFromJson();
-        });
-        
-        function tryAutoFillFromJson() {
-            try {
-                const jsonText = importJsonTextarea.value.trim();
-                if (!jsonText) {
-                    alert('Please enter JSON configuration');
-                    return;
-                }
-                
-                const config = JSON.parse(jsonText);
-                
-                // Validate required fields
-                if (!config.apiUrl || !config.certSha256) {
-                    alert('Invalid JSON format. Required fields: apiUrl, certSha256');
-                    return;
-                }
-                
-                // Parse apiUrl to extract components
-                const url = new URL(config.apiUrl);
-                
-                // Fill form fields
-                const adminUrlField = document.getElementById('id_admin_url');
-                const adminCertField = document.getElementById('id_admin_access_cert');
-                const clientHostnameField = document.getElementById('id_client_hostname');
-                const clientPortField = document.getElementById('id_client_port');
-                const nameField = document.getElementById('id_name');
-                const commentField = document.getElementById('id_comment');
-                
-                if (adminUrlField) adminUrlField.value = config.apiUrl;
-                if (adminCertField) adminCertField.value = config.certSha256;
-                
-                // Use provided hostname or extract from URL
-                const hostname = config.clientHostname || config.hostnameForAccessKeys || url.hostname;
-                if (clientHostnameField) clientHostnameField.value = hostname;
-                
-                // Use provided port or extract from various sources
-                const clientPort = config.clientPort || config.portForNewAccessKeys || url.port || '1257';
-                if (clientPortField) clientPortField.value = clientPort;
-                
-                // Generate server name if not provided and field is empty
-                if (nameField && !nameField.value) {
-                    const serverName = config.serverName || config.name || `Outline-${hostname}`;
-                    nameField.value = serverName;
-                }
-                
-                // Fill comment if provided and field exists
-                if (commentField && config.comment) {
-                    commentField.value = config.comment;
-                }
-                
-                // Clear the JSON input
-                importJsonTextarea.value = '';
-                
-                // Show success message
-                showSuccessMessage('✅ Configuration imported successfully!');
-                
-            } catch (error) {
-                alert('Invalid JSON format: ' + error.message);
-            }
-        }
-    }
-    
-    // Copy to clipboard functionality
-    window.copyToClipboard = function(elementId) {
-        const element = document.getElementById(elementId);
-        if (element) {
-            const text = element.textContent || element.innerText;
-            
-            if (navigator.clipboard && window.isSecureContext) {
-                navigator.clipboard.writeText(text).then(() => {
-                    showCopySuccess();
-                }).catch(err => {
-                    fallbackCopyTextToClipboard(text);
-                });
-            } else {
-                fallbackCopyTextToClipboard(text);
-            }
-        }
-    };
-    
-    function fallbackCopyTextToClipboard(text) {
-        const textArea = document.createElement('textarea');
-        textArea.value = text;
-        textArea.style.position = 'fixed';
-        textArea.style.left = '-999999px';
-        textArea.style.top = '-999999px';
-        document.body.appendChild(textArea);
-        textArea.focus();
-        textArea.select();
-        
-        try {
-            document.execCommand('copy');
-            showCopySuccess();
-        } catch (err) {
-            console.error('Failed to copy text: ', err);
-        }
-        
-        document.body.removeChild(textArea);
-    }
-    
-    function showCopySuccess() {
-        showSuccessMessage('📋 Copied to clipboard!');
-    }
-    
-    function showSuccessMessage(message) {
-        const alertHtml = `
-            <div class="alert alert-success alert-dismissible" style="margin: 1rem 0;">
-                ${message}
-                <button type="button" class="close" aria-label="Close" onclick="this.parentElement.remove()">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-        `;
-        
-        // Try to find a container for the message
-        const container = document.querySelector('.card-body') || document.querySelector('#content-main');
-        if (container) {
-            container.insertAdjacentHTML('afterbegin', alertHtml);
-        }
-        
-        setTimeout(() => {
-            const alert = document.querySelector('.alert-success');
-            if (alert) alert.remove();
-        }, 5000);
-    }
-    
-    // Sync server button - handle both static and dynamic buttons
-    document.addEventListener('click', async function(e) {
-        if (e.target && (e.target.id === 'sync-server-btn' || e.target.matches('[id="sync-server-btn"]'))) {
-            const syncBtn = e.target;
-            const serverId = syncBtn.dataset.serverId;
-            const csrfToken = document.querySelector('[name=csrfmiddlewaretoken]').value;
-            
-            const originalText = syncBtn.textContent;
-            syncBtn.textContent = '⏳ Syncing...';
-            syncBtn.disabled = true;
-            
-            try {
-                const response = await fetch(`/admin/vpn/outlineserver/${serverId}/sync/`, {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/x-www-form-urlencoded',
-                        'X-CSRFToken': csrfToken
-                    }
-                });
-                
-                const data = await response.json();
-                
-                if (data.success) {
-                    showSuccessMessage(`✅ ${data.message}`);
-                    setTimeout(() => window.location.reload(), 2000);
-                } else {
-                    alert('Sync failed: ' + data.error);
-                }
-            } catch (error) {
-                alert('Network error: ' + error.message);
-            } finally {
-                syncBtn.textContent = originalText;
-                syncBtn.disabled = false;
-            }
-        }
-    });
-});
diff --git a/static/admin/js/server_status_check.js b/static/admin/js/server_status_check.js
deleted file mode 100644
index 18bce2e..0000000
--- a/static/admin/js/server_status_check.js
+++ /dev/null
@@ -1,94 +0,0 @@
-// Server status check functionality for admin
-document.addEventListener('DOMContentLoaded', function() {
-    // Add event listeners to all check status buttons
-    document.querySelectorAll('.check-status-btn').forEach(button => {
-        button.addEventListener('click', async function(e) {
-            e.preventDefault();
-            
-            const serverId = this.dataset.serverId;
-            const serverName = this.dataset.serverName;
-            const serverType = this.dataset.serverType;
-            const originalText = this.textContent;
-            const originalColor = this.style.background;
-            
-            // Show loading state
-            this.textContent = '⏳ Checking...';
-            this.style.background = '#6c757d';
-            this.disabled = true;
-            
-            try {
-                // Try AJAX request first
-                const response = await fetch(`/admin/vpn/server/${serverId}/check-status/`, {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/x-www-form-urlencoded',
-                        'X-CSRFToken': getCookie('csrftoken')
-                    }
-                });
-                
-                if (!response.ok) {
-                    throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-                }
-                
-                const data = await response.json();
-                
-                if (data.success) {
-                    // Update button based on status
-                    if (data.status === 'online') {
-                        this.textContent = '✅ Online';
-                        this.style.background = '#28a745';
-                    } else if (data.status === 'offline') {
-                        this.textContent = '❌ Offline';
-                        this.style.background = '#dc3545';
-                    } else if (data.status === 'error') {
-                        this.textContent = '⚠️ Error';
-                        this.style.background = '#fd7e14';
-                    } else {
-                        this.textContent = '❓ Unknown';
-                        this.style.background = '#6c757d';
-                    }
-                    
-                    // Show additional info if available
-                    if (data.message) {
-                        this.title = data.message;
-                    }
-                    
-                } else {
-                    throw new Error(data.error || 'Failed to check status');
-                }
-                
-            } catch (error) {
-                console.error('Error checking server status:', error);
-                
-                // Fallback: show basic server info
-                this.textContent = `📊 ${serverType}`;
-                this.style.background = '#17a2b8';
-                this.title = `Server: ${serverName} (${serverType}) - Status check failed: ${error.message}`;
-            }
-            
-            // Reset after 5 seconds in all cases
-            setTimeout(() => {
-                this.textContent = originalText;
-                this.style.background = originalColor;
-                this.title = '';
-                this.disabled = false;
-            }, 5000);
-        });
-    });
-});
-
-// Helper function to get CSRF token
-function getCookie(name) {
-    let cookieValue = null;
-    if (document.cookie && document.cookie !== '') {
-        const cookies = document.cookie.split(';');
-        for (let i = 0; i < cookies.length; i++) {
-            const cookie = cookies[i].trim();
-            if (cookie.substring(0, name.length + 1) === (name + '=')) {
-                cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-                break;
-            }
-        }
-    }
-    return cookieValue;
-}
diff --git a/static/admin/js/xray_inbound_defaults.js b/static/admin/js/xray_inbound_defaults.js
deleted file mode 100644
index d3a67f7..0000000
--- a/static/admin/js/xray_inbound_defaults.js
+++ /dev/null
@@ -1,289 +0,0 @@
-// Xray Inbound Auto-Fill Helper
-console.log('Xray inbound helper script loaded');
-
-// Protocol configurations based on Xray documentation
-const protocolConfigs = {
-    'vless': {
-        port: 443,
-        network: 'tcp',
-        security: 'tls',
-        description: 'VLESS - Lightweight protocol with UUID authentication'
-    },
-    'vmess': {
-        port: 443,
-        network: 'ws',
-        security: 'tls',
-        description: 'VMess - V2Ray protocol with encryption and authentication'
-    },
-    'trojan': {
-        port: 443,
-        network: 'tcp',
-        security: 'tls',
-        description: 'Trojan - TLS-based protocol mimicking HTTPS traffic'
-    },
-    'shadowsocks': {
-        port: 8388,
-        network: 'tcp',
-        security: 'none',
-        ss_method: 'aes-256-gcm',
-        description: 'Shadowsocks - SOCKS5 proxy with encryption'
-    }
-};
-
-// Initialize when DOM is ready
-document.addEventListener('DOMContentLoaded', function() {
-    console.log('DOM ready, initializing Xray helper');
-    
-    // Add help text and generate buttons
-    addHelpText();
-    addGenerateButtons();
-    
-    // Watch for protocol field changes
-    const protocolField = document.getElementById('id_protocol');
-    if (protocolField) {
-        protocolField.addEventListener('change', function() {
-            handleProtocolChange(this.value);
-        });
-        
-        // Auto-fill on initial load if new inbound
-        if (protocolField.value && isNewInbound()) {
-            handleProtocolChange(protocolField.value);
-        }
-    }
-});
-
-function isNewInbound() {
-    // Check if this is a new inbound (no port value set)
-    const portField = document.getElementById('id_port');
-    return !portField || !portField.value;
-}
-
-function handleProtocolChange(protocol) {
-    if (!protocol || !protocolConfigs[protocol]) {
-        return;
-    }
-    
-    const config = protocolConfigs[protocol];
-    
-    // Only auto-fill for new inbounds to avoid overwriting user data
-    if (isNewInbound()) {
-        console.log('Auto-filling fields for new', protocol, 'inbound');
-        autoFillFields(protocol, config);
-        showMessage(`Auto-filled ${protocol.toUpperCase()} configuration`, 'info');
-    }
-}
-
-function autoFillFields(protocol, config) {
-    // Fill basic fields only if they're empty
-    fillIfEmpty('id_port', config.port);
-    fillIfEmpty('id_network', config.network);
-    fillIfEmpty('id_security', config.security);
-    
-    // Protocol-specific fields
-    if (config.ss_method && protocol === 'shadowsocks') {
-        fillIfEmpty('id_ss_method', config.ss_method);
-    }
-    
-    // Generate helpful JSON configs
-    generateJsonConfigs(protocol, config);
-}
-
-function fillIfEmpty(fieldId, value) {
-    const field = document.getElementById(fieldId);
-    if (field && !field.value && value !== undefined) {
-        field.value = value;
-        field.dispatchEvent(new Event('change', { bubbles: true }));
-    }
-}
-
-function generateJsonConfigs(protocol, config) {
-    // Generate stream settings
-    const streamField = document.getElementById('id_stream_settings');
-    if (streamField && !streamField.value) {
-        const streamSettings = getStreamSettings(protocol, config.network);
-        if (streamSettings) {
-            streamField.value = JSON.stringify(streamSettings, null, 2);
-        }
-    }
-    
-    // Generate sniffing settings
-    const sniffingField = document.getElementById('id_sniffing_settings');
-    if (sniffingField && !sniffingField.value) {
-        const sniffingSettings = {
-            enabled: true,
-            destOverride: ['http', 'tls'],
-            metadataOnly: false
-        };
-        sniffingField.value = JSON.stringify(sniffingSettings, null, 2);
-    }
-}
-
-function getStreamSettings(protocol, network) {
-    const settings = {};
-    
-    switch (network) {
-        case 'ws':
-            settings.wsSettings = {
-                path: '/ws',
-                headers: {
-                    Host: 'example.com'
-                }
-            };
-            break;
-        case 'grpc':
-            settings.grpcSettings = {
-                serviceName: 'GunService'
-            };
-            break;
-        case 'h2':
-            settings.httpSettings = {
-                host: ['example.com'],
-                path: '/path'
-            };
-            break;
-        case 'tcp':
-            settings.tcpSettings = {
-                header: {
-                    type: 'none'
-                }
-            };
-            break;
-        case 'kcp':
-            settings.kcpSettings = {
-                mtu: 1350,
-                tti: 50,
-                uplinkCapacity: 5,
-                downlinkCapacity: 20,
-                congestion: false,
-                readBufferSize: 2,
-                writeBufferSize: 2,
-                header: {
-                    type: 'none'
-                }
-            };
-            break;
-    }
-    
-    return Object.keys(settings).length > 0 ? settings : null;
-}
-
-function addHelpText() {
-    // Add help text to complex fields
-    addFieldHelp('id_stream_settings', 
-        'Transport settings: TCP (none), WebSocket (path/host), gRPC (serviceName), etc. Format: JSON');
-    
-    addFieldHelp('id_sniffing_settings', 
-        'Traffic sniffing for routing: enabled, destOverride ["http","tls"], metadataOnly');
-    
-    addFieldHelp('id_tls_cert_file', 
-        'TLS certificate file path (required for TLS security). Example: /path/to/cert.pem');
-    
-    addFieldHelp('id_tls_key_file', 
-        'TLS private key file path (required for TLS security). Example: /path/to/key.pem');
-    
-    addFieldHelp('id_protocol', 
-        'VLESS: lightweight + UUID | VMess: V2Ray encrypted | Trojan: HTTPS-like | Shadowsocks: SOCKS5');
-    
-    addFieldHelp('id_network', 
-        'Transport: tcp (direct), ws (WebSocket), grpc (HTTP/2), h2 (HTTP/2), kcp (mKCP)');
-    
-    addFieldHelp('id_security', 
-        'Encryption: none (no TLS), tls (standard TLS), reality (advanced steganography)');
-}
-
-function addFieldHelp(fieldId, helpText) {
-    const field = document.getElementById(fieldId);
-    if (!field) return;
-    
-    const helpDiv = document.createElement('div');
-    helpDiv.className = 'help';
-    helpDiv.style.cssText = 'font-size: 11px; color: #666; margin-top: 2px; line-height: 1.3;';
-    helpDiv.textContent = helpText;
-    
-    field.parentNode.appendChild(helpDiv);
-}
-
-function showMessage(message, type = 'info') {
-    const messageDiv = document.createElement('div');
-    messageDiv.className = `alert alert-${type}`;
-    messageDiv.style.cssText = `
-        position: fixed;
-        top: 20px;
-        right: 20px;
-        z-index: 9999;
-        padding: 12px 20px;
-        border-radius: 4px;
-        background: ${type === 'success' ? '#d4edda' : '#cce7ff'};
-        border: 1px solid ${type === 'success' ? '#c3e6cb' : '#b8daff'};
-        color: ${type === 'success' ? '#155724' : '#004085'};
-        font-weight: 500;
-        box-shadow: 0 2px 10px rgba(0,0,0,0.1);
-    `;
-    messageDiv.textContent = message;
-    
-    document.body.appendChild(messageDiv);
-    
-    setTimeout(() => {
-        messageDiv.remove();
-    }, 3000);
-}
-
-// Helper functions for generating values
-function generateRandomString(length = 8) {
-    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-    let result = '';
-    for (let i = 0; i < length; i++) {
-        result += chars.charAt(Math.floor(Math.random() * chars.length));
-    }
-    return result;
-}
-
-function generateShortId() {
-    return Math.random().toString(16).substr(2, 8);
-}
-
-function suggestPort(protocol) {
-    const ports = {
-        'vless': [443, 8443, 2053, 2083],
-        'vmess': [443, 80, 8080, 8443],
-        'trojan': [443, 8443, 2087],
-        'shadowsocks': [8388, 1080, 8080]
-    };
-    const protocolPorts = ports[protocol] || [443];
-    return protocolPorts[Math.floor(Math.random() * protocolPorts.length)];
-}
-
-// Add generate buttons to fields
-function addGenerateButtons() {
-    console.log('Adding generate buttons');
-    
-    // Add tag generator
-    addGenerateButton('id_tag', '🎲', () => `inbound-${generateShortId()}`);
-    
-    // Add port suggestion based on protocol
-    addGenerateButton('id_port', '🎯', () => {
-        const protocol = document.getElementById('id_protocol')?.value;
-        return suggestPort(protocol);
-    });
-}
-
-function addGenerateButton(fieldId, icon, generator) {
-    const field = document.getElementById(fieldId);
-    if (!field || field.nextElementSibling?.classList.contains('generate-btn')) return;
-    
-    const button = document.createElement('button');
-    button.type = 'button';
-    button.className = 'generate-btn btn btn-sm btn-secondary';
-    button.innerHTML = icon;
-    button.title = 'Generate value';
-    button.style.cssText = 'margin-left: 5px; padding: 2px 6px; font-size: 12px;';
-    
-    button.addEventListener('click', () => {
-        const value = generator();
-        field.value = value;
-        showMessage(`Generated: ${value}`, 'success');
-        field.dispatchEvent(new Event('change', { bubbles: true }));
-    });
-    
-    field.parentNode.insertBefore(button, field.nextSibling);
-}
\ No newline at end of file
diff --git a/static/index.html b/static/index.html
new file mode 100644
index 0000000..ddd6c39
--- /dev/null
+++ b/static/index.html
@@ -0,0 +1,1289 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Xray Admin - Test Interface</title>
+    <style>
+        body { font-family: Arial, sans-serif; margin: 20px; background: #f5f5f5; }
+        .container { max-width: 1200px; margin: 0 auto; }
+        .section { background: white; margin: 20px 0; padding: 20px; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); }
+        h1 { color: #333; }
+        h2 { color: #666; border-bottom: 1px solid #eee; padding-bottom: 10px; }
+        table { width: 100%; border-collapse: collapse; margin: 10px 0; }
+        th, td { border: 1px solid #ddd; padding: 8px; text-align: left; }
+        th { background: #f9f9f9; }
+        .btn { padding: 6px 12px; margin: 2px; border: none; border-radius: 4px; cursor: pointer; }
+        .btn-primary { background: #007bff; color: white; }
+        .btn-success { background: #28a745; color: white; }
+        .btn-danger { background: #dc3545; color: white; }
+        .btn-secondary { background: #6c757d; color: white; }
+        .form-group { margin: 10px 0; }
+        .form-group label { display: block; margin-bottom: 5px; font-weight: bold; }
+        .form-group input, .form-group select { width: 300px; padding: 8px; border: 1px solid #ddd; border-radius: 4px; }
+        /* Toast notifications */
+        .toast-container {
+            position: fixed;
+            top: 20px;
+            right: 20px;
+            z-index: 9999;
+            pointer-events: none;
+        }
+        .toast {
+            background: white;
+            border-radius: 8px;
+            box-shadow: 0 4px 12px rgba(0,0,0,0.15);
+            margin-bottom: 10px;
+            padding: 16px 20px;
+            min-width: 300px;
+            max-width: 400px;
+            position: relative;
+            transform: translateX(100%);
+            transition: transform 0.3s ease-in-out, opacity 0.3s ease-in-out;
+            opacity: 0;
+            pointer-events: auto;
+            border-left: 4px solid #007bff;
+        }
+        .toast.show {
+            transform: translateX(0);
+            opacity: 1;
+        }
+        .toast.success {
+            border-left-color: #28a745;
+        }
+        .toast.error {
+            border-left-color: #dc3545;
+        }
+        .toast-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 8px;
+        }
+        .toast-title {
+            font-weight: bold;
+            color: #333;
+        }
+        .toast-close {
+            background: none;
+            border: none;
+            font-size: 18px;
+            color: #999;
+            cursor: pointer;
+            padding: 0;
+            margin-left: 10px;
+        }
+        .toast-close:hover {
+            color: #666;
+        }
+        .toast-body {
+            color: #666;
+            line-height: 1.4;
+        }
+        .toast.success .toast-title {
+            color: #155724;
+        }
+        .toast.error .toast-title {
+            color: #721c24;
+        }
+        .tabs { border-bottom: 1px solid #ddd; margin-bottom: 20px; }
+        .tab { display: inline-block; padding: 10px 20px; cursor: pointer; border-bottom: 2px solid transparent; }
+        .tab.active { border-bottom-color: #007bff; background: #f8f9fa; }
+        .tab-content { display: none; }
+        .tab-content.active { display: block; }
+        .loading { text-align: center; padding: 20px; color: #666; }
+        
+        /* Modal styles */
+        .modal {
+            display: none;
+            position: fixed;
+            z-index: 10000;
+            left: 0;
+            top: 0;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0,0,0,0.5);
+        }
+        .modal.show {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+        .modal-content {
+            background: white;
+            border-radius: 8px;
+            padding: 20px;
+            max-width: 600px;
+            width: 90%;
+            max-height: 80vh;
+            overflow-y: auto;
+            position: relative;
+        }
+        .modal-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 20px;
+            border-bottom: 1px solid #eee;
+            padding-bottom: 10px;
+        }
+        .modal-title {
+            font-size: 18px;
+            font-weight: bold;
+            color: #333;
+        }
+        .modal-close {
+            background: none;
+            border: none;
+            font-size: 24px;
+            color: #999;
+            cursor: pointer;
+        }
+        .modal-close:hover {
+            color: #666;
+        }
+        .modal-body {
+            margin-bottom: 20px;
+        }
+        .modal-footer {
+            display: flex;
+            justify-content: flex-end;
+            gap: 10px;
+            border-top: 1px solid #eee;
+            padding-top: 15px;
+        }
+        .cert-details {
+            font-family: monospace;
+            background: #f8f9fa;
+            border: 1px solid #e9ecef;
+            border-radius: 4px;
+            padding: 15px;
+            white-space: pre-wrap;
+            overflow-x: auto;
+            max-height: 300px;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1>Xray Admin Panel - Test Interface</h1>
+        
+        <!-- Toast notifications container -->
+        <div class="toast-container" id="toastContainer"></div>
+        
+        <div class="tabs">
+            <div class="tab active" onclick="showTab('dashboard')">Dashboard</div>
+            <div class="tab" onclick="showTab('servers')">Servers</div>
+            <div class="tab" onclick="showTab('templates')">Inbound Templates</div>
+            <div class="tab" onclick="showTab('certificates')">Certificates</div>
+            <div class="tab" onclick="showTab('inbounds')">Inbound Binding</div>
+            <div class="tab" onclick="showTab('users')">Users</div>
+        </div>
+        
+        <!-- Dashboard -->
+        <div id="dashboard" class="tab-content active">
+            <div class="section">
+                <h2>Statistics</h2>
+                <p>Servers: <span id="serverCount">Loading...</span></p>
+                <p>Templates: <span id="templateCount">Loading...</span></p>
+                <p>Certificates: <span id="certCount">Loading...</span></p>
+                <p>Users: <span id="userCount">Loading...</span></p>
+            </div>
+        </div>
+        
+        <!-- Servers -->
+        <div id="servers" class="tab-content">
+            <div class="section">
+                <h2>Add Server</h2>
+                <form id="serverForm">
+                    <div class="form-group">
+                        <label>Name:</label>
+                        <input type="text" id="serverName" required>
+                    </div>
+                    <div class="form-group">
+                        <label>Hostname:</label>
+                        <input type="text" id="serverHostname" required>
+                    </div>
+                    <div class="form-group">
+                        <label>gRPC Port:</label>
+                        <input type="number" id="serverPort" value="2053">
+                    </div>
+                    <button type="submit" class="btn btn-primary">Add Server</button>
+                </form>
+            </div>
+            
+            <div class="section">
+                <h2>Servers List</h2>
+                <div id="serversList" class="loading">Loading...</div>
+            </div>
+        </div>
+        
+        <!-- Templates -->
+        <div id="templates" class="tab-content">
+            <div class="section">
+                <h2>Add Template</h2>
+                <form id="templateForm">
+                    <div class="form-group">
+                        <label>Name:</label>
+                        <input type="text" id="templateName" required>
+                    </div>
+                    <div class="form-group">
+                        <label>Protocol:</label>
+                        <select id="templateProtocol" required>
+                            <option value="vless">VLESS</option>
+                            <option value="vmess">VMess</option>
+                            <option value="trojan">Trojan</option>
+                            <option value="shadowsocks">Shadowsocks</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label>Default Port:</label>
+                        <input type="number" id="templatePort" value="443" required>
+                    </div>
+                    <div class="form-group">
+                        <label>
+                            <input type="checkbox" id="templateTls"> Requires TLS
+                        </label>
+                    </div>
+                    <div class="form-group">
+                        <label>Configuration Template:</label>
+                        <textarea id="templateConfig" rows="6" style="width: 300px;">{
+  "protocol": "{{protocol}}",
+  "port": {{port}},
+  "settings": {
+    "clients": []
+  }
+}</textarea>
+                    </div>
+                    <button type="submit" class="btn btn-primary">Add Template</button>
+                </form>
+            </div>
+            
+            <div class="section">
+                <h2>Templates List</h2>
+                <div id="templatesList" class="loading">Loading...</div>
+            </div>
+        </div>
+        
+        <!-- Certificates -->
+        <div id="certificates" class="tab-content">
+            <div class="section">
+                <h2>Add Certificate</h2>
+                <form id="certificateForm">
+                    <div class="form-group">
+                        <label>Name:</label>
+                        <input type="text" id="certName" required>
+                    </div>
+                    <div class="form-group">
+                        <label>Domain:</label>
+                        <input type="text" id="certDomain" placeholder="example.com" required>
+                    </div>
+                    <div class="form-group">
+                        <label>Certificate Type:</label>
+                        <select id="certType" required>
+                            <option value="self_signed">Self-Signed</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label>
+                            <input type="checkbox" id="certAutoRenew" checked> Auto Renew
+                        </label>
+                    </div>
+                    <button type="submit" class="btn btn-primary">Generate Certificate</button>
+                </form>
+            </div>
+            
+            <div class="section">
+                <h2>Certificates List</h2>
+                <div id="certificatesList" class="loading">Loading...</div>
+            </div>
+        </div>
+        
+        <!-- Server Inbounds -->
+        <div id="inbounds" class="tab-content">
+            <div class="section">
+                <h2>Bind Template to Server</h2>
+                <form id="inboundForm">
+                    <div class="form-group">
+                        <label>Server:</label>
+                        <select id="inboundServer" required>
+                            <option value="">Select Server...</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label>Template:</label>
+                        <select id="inboundTemplate" required>
+                            <option value="">Select Template...</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label>Port:</label>
+                        <input type="number" id="inboundPort" value="443" required>
+                    </div>
+                    <div class="form-group">
+                        <label>Certificate:</label>
+                        <select id="inboundCertificate">
+                            <option value="">No Certificate</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label>
+                            <input type="checkbox" id="inboundActive" checked> Active
+                        </label>
+                    </div>
+                    <button type="submit" class="btn btn-primary">Bind Template</button>
+                </form>
+            </div>
+            
+            <div class="section">
+                <h2>Server Inbounds</h2>
+                <div id="inboundsList" class="loading">Loading...</div>
+            </div>
+        </div>
+        
+        <!-- Users -->
+        <div id="users" class="tab-content">
+            <div class="section">
+                <h2>Add User</h2>
+                <form id="userForm">
+                    <div class="form-group">
+                        <label>Name:</label>
+                        <input type="text" id="userName" required>
+                    </div>
+                    <div class="form-group">
+                        <label>Comment:</label>
+                        <input type="text" id="userComment">
+                    </div>
+                    <div class="form-group">
+                        <label>Telegram ID:</label>
+                        <input type="number" id="userTelegram">
+                    </div>
+                    <button type="submit" class="btn btn-primary">Add User</button>
+                </form>
+            </div>
+            
+            <div class="section">
+                <h2>Users List</h2>
+                <div id="usersList" class="loading">Loading...</div>
+            </div>
+        </div>
+    </div>
+    
+    <!-- Modal dialogs -->
+    <div id="editModal" class="modal">
+        <div class="modal-content">
+            <div class="modal-header">
+                <div class="modal-title" id="editModalTitle">Edit Item</div>
+                <button class="modal-close" onclick="closeModal('editModal')">&times;</button>
+            </div>
+            <div class="modal-body" id="editModalBody">
+                <!-- Content will be dynamically loaded -->
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-secondary" onclick="closeModal('editModal')">Cancel</button>
+                <button class="btn btn-primary" id="saveEditBtn" onclick="saveEdit()">Save</button>
+            </div>
+        </div>
+    </div>
+    
+    <div id="viewModal" class="modal">
+        <div class="modal-content">
+            <div class="modal-header">
+                <div class="modal-title" id="viewModalTitle">View Details</div>
+                <button class="modal-close" onclick="closeModal('viewModal')">&times;</button>
+            </div>
+            <div class="modal-body" id="viewModalBody">
+                <!-- Content will be dynamically loaded -->
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-secondary" onclick="closeModal('viewModal')">Close</button>
+            </div>
+        </div>
+    </div>
+    
+    <script>
+        const API_BASE = '/api';
+        
+        // Tab switching
+        function showTab(tabName) {
+            document.querySelectorAll('.tab').forEach(tab => tab.classList.remove('active'));
+            document.querySelectorAll('.tab-content').forEach(content => content.classList.remove('active'));
+            
+            event.target.classList.add('active');
+            document.getElementById(tabName).classList.add('active');
+            
+            loadTabData(tabName);
+        }
+        
+        function loadTabData(tab) {
+            switch(tab) {
+                case 'dashboard': loadDashboard(); break;
+                case 'servers': loadServers(); break;
+                case 'templates': loadTemplates(); break;
+                case 'certificates': loadCertificates(); break;
+                case 'inbounds': loadInbounds(); break;
+                case 'users': loadUsers(); break;
+            }
+        }
+        
+        // Dashboard
+        async function loadDashboard() {
+            try {
+                const [servers, templates, certificates, users] = await Promise.all([
+                    fetch(`${API_BASE}/servers`).then(r => r.json()),
+                    fetch(`${API_BASE}/templates`).then(r => r.json()),
+                    fetch(`${API_BASE}/certificates`).then(r => r.json()),
+                    fetch(`${API_BASE}/users`).then(r => r.json())
+                ]);
+                
+                document.getElementById('serverCount').textContent = servers.length;
+                document.getElementById('templateCount').textContent = templates.length;
+                document.getElementById('certCount').textContent = certificates.length;
+                document.getElementById('userCount').textContent = users.users ? users.users.length : users.length;
+            } catch (error) {
+                showStatus('Error loading dashboard: ' + error.message, 'error');
+            }
+        }
+        
+        // Servers
+        async function loadServers() {
+            try {
+                const servers = await fetch(`${API_BASE}/servers`).then(r => r.json());
+                
+                if (servers.length === 0) {
+                    document.getElementById('serversList').innerHTML = '<p>No servers found</p>';
+                    return;
+                }
+                
+                const table = `
+                    <table>
+                        <tr><th>Name</th><th>Hostname</th><th>Port</th><th>Status</th><th>Actions</th></tr>
+                        ${servers.map(s => `
+                            <tr>
+                                <td>${s.name}</td>
+                                <td>${s.hostname}</td>
+                                <td>${s.grpc_port}</td>
+                                <td>${s.status}</td>
+                                <td>
+                                    <button class="btn btn-success" onclick="testServer('${s.id}')">Test</button>
+                                    <button class="btn btn-primary" onclick="editServer('${s.id}')">Edit</button>
+                                    <button class="btn btn-danger" onclick="deleteServer('${s.id}')">Delete</button>
+                                </td>
+                            </tr>
+                        `).join('')}
+                    </table>
+                `;
+                
+                document.getElementById('serversList').innerHTML = table;
+            } catch (error) {
+                document.getElementById('serversList').innerHTML = '<p>Error: ' + error.message + '</p>';
+            }
+        }
+        
+        // Templates
+        async function loadTemplates() {
+            try {
+                const templates = await fetch(`${API_BASE}/templates`).then(r => r.json());
+                
+                if (templates.length === 0) {
+                    document.getElementById('templatesList').innerHTML = '<p>No templates found</p>';
+                    return;
+                }
+                
+                const table = `
+                    <table>
+                        <tr><th>Name</th><th>Protocol</th><th>Port</th><th>TLS</th><th>Active</th><th>Actions</th></tr>
+                        ${templates.map(t => `
+                            <tr>
+                                <td>${t.name}</td>
+                                <td>${t.protocol}</td>
+                                <td>${t.default_port}</td>
+                                <td>${t.requires_tls ? 'Yes' : 'No'}</td>
+                                <td>${t.is_active ? 'Yes' : 'No'}</td>
+                                <td>
+                                    <button class="btn btn-primary" onclick="editTemplate('${t.id}')">Edit</button>
+                                    <button class="btn btn-danger" onclick="deleteTemplate('${t.id}')">Delete</button>
+                                </td>
+                            </tr>
+                        `).join('')}
+                    </table>
+                `;
+                
+                document.getElementById('templatesList').innerHTML = table;
+            } catch (error) {
+                document.getElementById('templatesList').innerHTML = '<p>Error: ' + error.message + '</p>';
+            }
+        }
+        
+        // Certificates
+        async function loadCertificates() {
+            try {
+                const certificates = await fetch(`${API_BASE}/certificates`).then(r => r.json());
+                
+                if (certificates.length === 0) {
+                    document.getElementById('certificatesList').innerHTML = '<p>No certificates found</p>';
+                    return;
+                }
+                
+                const table = `
+                    <table>
+                        <tr><th>Name</th><th>Domain</th><th>Type</th><th>Expires</th><th>Auto Renew</th><th>Actions</th></tr>
+                        ${certificates.map(c => `
+                            <tr>
+                                <td>${c.name}</td>
+                                <td>${c.domain}</td>
+                                <td>${c.cert_type}</td>
+                                <td>${new Date(c.expires_at).toLocaleDateString()}</td>
+                                <td>${c.auto_renew ? 'Yes' : 'No'}</td>
+                                <td>
+                                    <button class="btn btn-secondary" onclick="viewCertificate('${c.id}')">View</button>
+                                    <button class="btn btn-primary" onclick="editCertificate('${c.id}')">Edit</button>
+                                    <button class="btn btn-danger" onclick="deleteCertificate('${c.id}')">Delete</button>
+                                </td>
+                            </tr>
+                        `).join('')}
+                    </table>
+                `;
+                
+                document.getElementById('certificatesList').innerHTML = table;
+            } catch (error) {
+                document.getElementById('certificatesList').innerHTML = '<p>Error: ' + error.message + '</p>';
+            }
+        }
+        
+        // Users
+        async function loadUsers() {
+            try {
+                const response = await fetch(`${API_BASE}/users`);
+                const data = await response.json();
+                const users = data.users || data;
+                
+                if (users.length === 0) {
+                    document.getElementById('usersList').innerHTML = '<p>No users found</p>';
+                    return;
+                }
+                
+                const table = `
+                    <table>
+                        <tr><th>Name</th><th>Comment</th><th>Telegram</th><th>Created</th><th>Actions</th></tr>
+                        ${users.map(u => `
+                            <tr>
+                                <td>${u.name}</td>
+                                <td>${u.comment || '-'}</td>
+                                <td>${u.telegram_id || '-'}</td>
+                                <td>${new Date(u.created_at).toLocaleDateString()}</td>
+                                <td>
+                                    <button class="btn btn-primary" onclick="editUser('${u.id}')">Edit</button>
+                                    <button class="btn btn-danger" onclick="deleteUser('${u.id}')">Delete</button>
+                                </td>
+                            </tr>
+                        `).join('')}
+                    </table>
+                `;
+                
+                document.getElementById('usersList').innerHTML = table;
+            } catch (error) {
+                document.getElementById('usersList').innerHTML = '<p>Error: ' + error.message + '</p>';
+            }
+        }
+        
+        // Server Inbounds
+        async function loadInbounds() {
+            try {
+                // Load dropdown options
+                await loadInboundOptions();
+                
+                // Load data for lookups
+                const [servers, templates, certificates] = await Promise.all([
+                    fetch(`${API_BASE}/servers`).then(r => r.json()),
+                    fetch(`${API_BASE}/templates`).then(r => r.json()),
+                    fetch(`${API_BASE}/certificates`).then(r => r.json())
+                ]);
+                
+                // Create lookup maps
+                const serverMap = Object.fromEntries(servers.map(s => [s.id, s]));
+                const templateMap = Object.fromEntries(templates.map(t => [t.id, t]));
+                const certificateMap = Object.fromEntries(certificates.map(c => [c.id, c]));
+                
+                // Load inbounds list (we'll fetch all servers and their inbounds)
+                let allInbounds = [];
+                for (const server of servers) {
+                    try {
+                        const inbounds = await fetch(`${API_BASE}/servers/${server.id}/inbounds`).then(r => r.json());
+                        allInbounds = allInbounds.concat(inbounds.map(inbound => ({
+                            ...inbound,
+                            server_name: server.name,
+                            server_id: server.id,
+                            template_name: templateMap[inbound.template_id]?.name || 'Unknown',
+                            certificate_name: inbound.certificate_id ? certificateMap[inbound.certificate_id]?.name || 'Unknown' : 'None'
+                        })));
+                    } catch (e) {
+                        // Skip if server has no inbounds
+                    }
+                }
+                
+                if (allInbounds.length === 0) {
+                    document.getElementById('inboundsList').innerHTML = '<p>No inbound bindings found</p>';
+                    return;
+                }
+                
+                const table = `
+                    <table>
+                        <tr><th>Server</th><th>Template</th><th>Port</th><th>Certificate</th><th>Status</th><th>Actions</th></tr>
+                        ${allInbounds.map(inbound => `
+                            <tr>
+                                <td>${inbound.server_name}</td>
+                                <td>${inbound.template_name}</td>
+                                <td>${inbound.port}</td>
+                                <td>${inbound.certificate_name}</td>
+                                <td>${inbound.is_active ? 'Active' : 'Inactive'}</td>
+                                <td>
+                                    <button class="btn btn-primary" onclick="editInbound('${inbound.server_id}', '${inbound.id}')">Edit</button>
+                                    <button class="btn btn-danger" onclick="deleteInbound('${inbound.server_id}', '${inbound.id}')">Delete</button>
+                                </td>
+                            </tr>
+                        `).join('')}
+                    </table>
+                `;
+                
+                document.getElementById('inboundsList').innerHTML = table;
+            } catch (error) {
+                document.getElementById('inboundsList').innerHTML = '<p>Error: ' + error.message + '</p>';
+            }
+        }
+        
+        async function loadInboundOptions() {
+            try {
+                const [servers, templates, certificates] = await Promise.all([
+                    fetch(`${API_BASE}/servers`).then(r => r.json()),
+                    fetch(`${API_BASE}/templates`).then(r => r.json()),
+                    fetch(`${API_BASE}/certificates`).then(r => r.json())
+                ]);
+                
+                // Store templates data globally for port loading
+                templatesData = templates;
+                
+                // Populate server dropdown
+                const serverSelect = document.getElementById('inboundServer');
+                serverSelect.innerHTML = '<option value="">Select Server...</option>';
+                servers.forEach(server => {
+                    serverSelect.innerHTML += `<option value="${server.id}">${server.name} (${server.hostname})</option>`;
+                });
+                
+                // Populate template dropdown
+                const templateSelect = document.getElementById('inboundTemplate');
+                templateSelect.innerHTML = '<option value="">Select Template...</option>';
+                templates.forEach(template => {
+                    templateSelect.innerHTML += `<option value="${template.id}">${template.name} (${template.protocol})</option>`;
+                });
+                
+                // Add event listener for template change
+                templateSelect.removeEventListener('change', onTemplateChange); // Remove if exists
+                templateSelect.addEventListener('change', onTemplateChange);
+                
+                // Populate certificate dropdown
+                const certSelect = document.getElementById('inboundCertificate');
+                certSelect.innerHTML = '<option value="">No Certificate</option>';
+                certificates.forEach(cert => {
+                    certSelect.innerHTML += `<option value="${cert.id}">${cert.name} (${cert.domain})</option>`;
+                });
+            } catch (error) {
+                console.error('Error loading inbound options:', error);
+            }
+        }
+        
+        // Template change handler for automatic port loading
+        function onTemplateChange(event) {
+            const templateId = event.target.value;
+            const portInput = document.getElementById('inboundPort');
+            
+            if (templateId && templatesData.length > 0) {
+                const selectedTemplate = templatesData.find(t => t.id === templateId);
+                if (selectedTemplate) {
+                    portInput.value = selectedTemplate.default_port;
+                    console.log('Auto-loaded port', selectedTemplate.default_port, 'from template', selectedTemplate.name);
+                }
+            }
+        }
+        
+        // Server form
+        document.getElementById('serverForm').addEventListener('submit', async (e) => {
+            e.preventDefault();
+            
+            const data = {
+                name: document.getElementById('serverName').value,
+                hostname: document.getElementById('serverHostname').value,
+                grpc_port: parseInt(document.getElementById('serverPort').value)
+            };
+            
+            try {
+                const response = await fetch(`${API_BASE}/servers`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(data)
+                });
+                
+                if (response.ok) {
+                    showStatus('Server added successfully', 'success');
+                    document.getElementById('serverForm').reset();
+                    loadServers();
+                } else {
+                    showStatus('Error adding server', 'error');
+                }
+            } catch (error) {
+                showStatus('Error: ' + error.message, 'error');
+            }
+        });
+        
+        // Template form
+        document.getElementById('templateForm').addEventListener('submit', async (e) => {
+            e.preventDefault();
+            
+            const data = {
+                name: document.getElementById('templateName').value,
+                protocol: document.getElementById('templateProtocol').value,
+                default_port: parseInt(document.getElementById('templatePort').value),
+                requires_tls: document.getElementById('templateTls').checked,
+                config_template: document.getElementById('templateConfig').value
+            };
+            
+            try {
+                const response = await fetch(`${API_BASE}/templates`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(data)
+                });
+                
+                if (response.ok) {
+                    showStatus('Template added successfully', 'success');
+                    document.getElementById('templateForm').reset();
+                    loadTemplates();
+                } else {
+                    showStatus('Error adding template', 'error');
+                }
+            } catch (error) {
+                showStatus('Error: ' + error.message, 'error');
+            }
+        });
+        
+        // Certificate form
+        document.getElementById('certificateForm').addEventListener('submit', async (e) => {
+            e.preventDefault();
+            
+            const data = {
+                name: document.getElementById('certName').value,
+                domain: document.getElementById('certDomain').value,
+                cert_type: document.getElementById('certType').value,
+                auto_renew: document.getElementById('certAutoRenew').checked
+            };
+            
+            try {
+                const response = await fetch(`${API_BASE}/certificates`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(data)
+                });
+                
+                if (response.ok) {
+                    showStatus('Certificate generated successfully', 'success');
+                    document.getElementById('certificateForm').reset();
+                    loadCertificates();
+                } else {
+                    showStatus('Error generating certificate', 'error');
+                }
+            } catch (error) {
+                showStatus('Error: ' + error.message, 'error');
+            }
+        });
+        
+        // Inbound form
+        document.getElementById('inboundForm').addEventListener('submit', async (e) => {
+            e.preventDefault();
+            
+            const serverId = document.getElementById('inboundServer').value;
+            const data = {
+                template_id: document.getElementById('inboundTemplate').value,
+                port: parseInt(document.getElementById('inboundPort').value),
+                certificate_id: document.getElementById('inboundCertificate').value || null,
+                is_active: document.getElementById('inboundActive').checked
+            };
+            
+            try {
+                const response = await fetch(`${API_BASE}/servers/${serverId}/inbounds`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(data)
+                });
+                
+                if (response.ok) {
+                    showStatus('Server inbound created successfully', 'success');
+                    document.getElementById('inboundForm').reset();
+                    loadInbounds();
+                } else {
+                    showStatus('Error creating server inbound', 'error');
+                }
+            } catch (error) {
+                showStatus('Error: ' + error.message, 'error');
+            }
+        });
+        
+        // User form
+        document.getElementById('userForm').addEventListener('submit', async (e) => {
+            e.preventDefault();
+            
+            const data = {
+                name: document.getElementById('userName').value
+            };
+            
+            const comment = document.getElementById('userComment').value;
+            const telegram = document.getElementById('userTelegram').value;
+            
+            if (comment) data.comment = comment;
+            if (telegram) data.telegram_id = parseInt(telegram);
+            
+            try {
+                const response = await fetch(`${API_BASE}/users`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(data)
+                });
+                
+                if (response.ok) {
+                    showStatus('User added successfully', 'success');
+                    document.getElementById('userForm').reset();
+                    loadUsers();
+                } else {
+                    showStatus('Error adding user', 'error');
+                }
+            } catch (error) {
+                showStatus('Error: ' + error.message, 'error');
+            }
+        });
+        
+        // Actions
+        async function testServer(id) {
+            try {
+                const response = await fetch(`${API_BASE}/servers/${id}/test`, { method: 'POST' });
+                const result = await response.json();
+                showStatus(result.connected ? 'Connection OK' : 'Connection failed', result.connected ? 'success' : 'error');
+            } catch (error) {
+                showStatus('Test error: ' + error.message, 'error');
+            }
+        }
+        
+        async function deleteServer(id) {
+            if (!confirm('Delete server?')) return;
+            
+            try {
+                await fetch(`${API_BASE}/servers/${id}`, { method: 'DELETE' });
+                showStatus('Server deleted', 'success');
+                loadServers();
+            } catch (error) {
+                showStatus('Delete error: ' + error.message, 'error');
+            }
+        }
+        
+        async function deleteUser(id) {
+            if (!confirm('Delete user?')) return;
+            
+            try {
+                await fetch(`${API_BASE}/users/${id}`, { method: 'DELETE' });
+                showStatus('User deleted', 'success');
+                loadUsers();
+            } catch (error) {
+                showStatus('Delete error: ' + error.message, 'error');
+            }
+        }
+        
+        async function deleteTemplate(id) {
+            if (!confirm('Delete template?')) return;
+            
+            try {
+                await fetch(`${API_BASE}/templates/${id}`, { method: 'DELETE' });
+                showStatus('Template deleted', 'success');
+                loadTemplates();
+            } catch (error) {
+                showStatus('Delete error: ' + error.message, 'error');
+            }
+        }
+        
+        async function deleteCertificate(id) {
+            if (!confirm('Delete certificate?')) return;
+            
+            try {
+                await fetch(`${API_BASE}/certificates/${id}`, { method: 'DELETE' });
+                showStatus('Certificate deleted', 'success');
+                loadCertificates();
+            } catch (error) {
+                showStatus('Delete error: ' + error.message, 'error');
+            }
+        }
+        
+        async function deleteInbound(serverId, inboundId) {
+            if (!confirm('Delete server inbound?')) return;
+            
+            try {
+                await fetch(`${API_BASE}/servers/${serverId}/inbounds/${inboundId}`, { method: 'DELETE' });
+                showStatus('Server inbound deleted', 'success');
+                loadInbounds();
+            } catch (error) {
+                showStatus('Delete error: ' + error.message, 'error');
+            }
+        }
+        
+        function showStatus(message, type) {
+            showToast(message, type);
+        }
+        
+        function showToast(message, type = 'info') {
+            const container = document.getElementById('toastContainer');
+            const toastId = 'toast-' + Date.now();
+            
+            const typeTitle = {
+                'success': 'Success',
+                'error': 'Error',
+                'info': 'Info'
+            };
+            
+            const toast = document.createElement('div');
+            toast.className = `toast ${type}`;
+            toast.id = toastId;
+            toast.innerHTML = `
+                <div class="toast-header">
+                    <div class="toast-title">${typeTitle[type] || 'Notification'}</div>
+                    <button class="toast-close" onclick="closeToast('${toastId}')">&times;</button>
+                </div>
+                <div class="toast-body">${message}</div>
+            `;
+            
+            container.appendChild(toast);
+            
+            // Trigger animation
+            setTimeout(() => {
+                toast.classList.add('show');
+            }, 10);
+            
+            // Auto-remove after 4 seconds
+            setTimeout(() => {
+                closeToast(toastId);
+            }, 4000);
+        }
+        
+        function closeToast(toastId) {
+            const toast = document.getElementById(toastId);
+            if (toast) {
+                toast.classList.remove('show');
+                setTimeout(() => {
+                    if (toast.parentNode) {
+                        toast.parentNode.removeChild(toast);
+                    }
+                }, 300);
+            }
+        }
+        
+        // Modal management
+        function showModal(modalId) {
+            document.getElementById(modalId).classList.add('show');
+        }
+        
+        function closeModal(modalId) {
+            document.getElementById(modalId).classList.remove('show');
+        }
+        
+        // Global variables for edit state
+        let currentEditType = '';
+        let currentEditId = '';
+        let currentEditServerId = '';
+        
+        // Global template data for port loading
+        let templatesData = [];
+        
+        // Edit functions
+        async function editServer(id) {
+            try {
+                const server = await fetch(`${API_BASE}/servers/${id}`).then(r => r.json());
+                currentEditType = 'server';
+                currentEditId = id;
+                
+                document.getElementById('editModalTitle').textContent = 'Edit Server';
+                document.getElementById('editModalBody').innerHTML = `
+                    <div class="form-group">
+                        <label>Name:</label>
+                        <input type="text" id="editName" value="${server.name}" required>
+                    </div>
+                    <div class="form-group">
+                        <label>Hostname:</label>
+                        <input type="text" id="editHostname" value="${server.hostname}" required>
+                    </div>
+                    <div class="form-group">
+                        <label>gRPC Port:</label>
+                        <input type="number" id="editPort" value="${server.grpc_port}" required>
+                    </div>
+                `;
+                showModal('editModal');
+            } catch (error) {
+                showStatus('Error loading server: ' + error.message, 'error');
+            }
+        }
+        
+        async function editUser(id) {
+            try {
+                const user = await fetch(`${API_BASE}/users/${id}`).then(r => r.json());
+                currentEditType = 'user';
+                currentEditId = id;
+                
+                document.getElementById('editModalTitle').textContent = 'Edit User';
+                document.getElementById('editModalBody').innerHTML = `
+                    <div class="form-group">
+                        <label>Name:</label>
+                        <input type="text" id="editName" value="${user.name}" required>
+                    </div>
+                    <div class="form-group">
+                        <label>Comment:</label>
+                        <input type="text" id="editComment" value="${user.comment || ''}">
+                    </div>
+                    <div class="form-group">
+                        <label>Telegram ID:</label>
+                        <input type="number" id="editTelegram" value="${user.telegram_id || ''}">
+                    </div>
+                `;
+                showModal('editModal');
+            } catch (error) {
+                showStatus('Error loading user: ' + error.message, 'error');
+            }
+        }
+        
+        async function editTemplate(id) {
+            try {
+                const template = await fetch(`${API_BASE}/templates/${id}`).then(r => r.json());
+                currentEditType = 'template';
+                currentEditId = id;
+                
+                document.getElementById('editModalTitle').textContent = 'Edit Template';
+                document.getElementById('editModalBody').innerHTML = `
+                    <div class="form-group">
+                        <label>Name:</label>
+                        <input type="text" id="editName" value="${template.name}" required>
+                    </div>
+                    <div class="form-group">
+                        <label>Protocol:</label>
+                        <select id="editProtocol" required>
+                            <option value="vless" ${template.protocol === 'vless' ? 'selected' : ''}>VLESS</option>
+                            <option value="vmess" ${template.protocol === 'vmess' ? 'selected' : ''}>VMess</option>
+                            <option value="trojan" ${template.protocol === 'trojan' ? 'selected' : ''}>Trojan</option>
+                            <option value="shadowsocks" ${template.protocol === 'shadowsocks' ? 'selected' : ''}>Shadowsocks</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label>Default Port:</label>
+                        <input type="number" id="editPort" value="${template.default_port}" required>
+                    </div>
+                    <div class="form-group">
+                        <label>
+                            <input type="checkbox" id="editTls" ${template.requires_tls ? 'checked' : ''}> Requires TLS
+                        </label>
+                    </div>
+                    <div class="form-group">
+                        <label>
+                            <input type="checkbox" id="editActive" ${template.is_active ? 'checked' : ''}> Active
+                        </label>
+                    </div>
+                `;
+                showModal('editModal');
+            } catch (error) {
+                showStatus('Error loading template: ' + error.message, 'error');
+            }
+        }
+        
+        async function editCertificate(id) {
+            try {
+                const cert = await fetch(`${API_BASE}/certificates/${id}`).then(r => r.json());
+                currentEditType = 'certificate';
+                currentEditId = id;
+                
+                document.getElementById('editModalTitle').textContent = 'Edit Certificate';
+                document.getElementById('editModalBody').innerHTML = `
+                    <div class="form-group">
+                        <label>Name:</label>
+                        <input type="text" id="editName" value="${cert.name}" required>
+                    </div>
+                    <div class="form-group">
+                        <label>Domain:</label>
+                        <input type="text" id="editDomain" value="${cert.domain}" required>
+                    </div>
+                    <div class="form-group">
+                        <label>
+                            <input type="checkbox" id="editAutoRenew" ${cert.auto_renew ? 'checked' : ''}> Auto Renew
+                        </label>
+                    </div>
+                `;
+                showModal('editModal');
+            } catch (error) {
+                showStatus('Error loading certificate: ' + error.message, 'error');
+            }
+        }
+        
+        async function editInbound(serverId, inboundId) {
+            try {
+                const response = await fetch(`${API_BASE}/servers/${serverId}/inbounds/${inboundId}`);
+                if (!response.ok) {
+                    throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+                }
+                const inbound = await response.json();
+                const [templates, certificates] = await Promise.all([
+                    fetch(`${API_BASE}/templates`).then(r => r.json()),
+                    fetch(`${API_BASE}/certificates`).then(r => r.json())
+                ]);
+                
+                currentEditType = 'inbound';
+                currentEditId = inboundId;
+                currentEditServerId = serverId;
+                
+                document.getElementById('editModalTitle').textContent = 'Edit Inbound Binding';
+                document.getElementById('editModalBody').innerHTML = `
+                    <div class="form-group">
+                        <label>Template:</label>
+                        <select id="editTemplate" required>
+                            ${templates.map(t => 
+                                `<option value="${t.id}" ${t.id === inbound.template_id ? 'selected' : ''}>${t.name}</option>`
+                            ).join('')}
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label>Port:</label>
+                        <input type="number" id="editPort" value="${inbound.port}" required>
+                    </div>
+                    <div class="form-group">
+                        <label>Certificate:</label>
+                        <select id="editCertificate">
+                            <option value="">No Certificate</option>
+                            ${certificates.map(c => 
+                                `<option value="${c.id}" ${c.id === inbound.certificate_id ? 'selected' : ''}>${c.name}</option>`
+                            ).join('')}
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label>
+                            <input type="checkbox" id="editActive" ${inbound.is_active ? 'checked' : ''}> Active
+                        </label>
+                    </div>
+                `;
+                showModal('editModal');
+            } catch (error) {
+                showStatus('Error loading inbound: ' + error.message, 'error');
+            }
+        }
+        
+        async function viewCertificate(id) {
+            try {
+                const cert = await fetch(`${API_BASE}/certificates/${id}/details`).then(r => r.json());
+                
+                document.getElementById('viewModalTitle').textContent = 'Certificate Details';
+                document.getElementById('viewModalBody').innerHTML = `
+                    <h4>Basic Information</h4>
+                    <p><strong>Name:</strong> ${cert.name}</p>
+                    <p><strong>Domain:</strong> ${cert.domain}</p>
+                    <p><strong>Type:</strong> ${cert.cert_type}</p>
+                    <p><strong>Auto Renew:</strong> ${cert.auto_renew ? 'Yes' : 'No'}</p>
+                    <p><strong>Created:</strong> ${new Date(cert.created_at).toLocaleString()}</p>
+                    <p><strong>Expires:</strong> ${new Date(cert.expires_at).toLocaleString()}</p>
+                    
+                    <h4>Certificate PEM</h4>
+                    <div class="cert-details">${cert.certificate_pem || 'Not available'}</div>
+                    
+                    <h4>Private Key</h4>
+                    <div class="cert-details">${cert.has_private_key ? '[Hidden for security]' : 'Not available'}</div>
+                `;
+                showModal('viewModal');
+            } catch (error) {
+                showStatus('Error loading certificate: ' + error.message, 'error');
+            }
+        }
+        
+        async function saveEdit() {
+            try {
+                let url, data;
+                
+                switch (currentEditType) {
+                    case 'server':
+                        url = `${API_BASE}/servers/${currentEditId}`;
+                        data = {
+                            name: document.getElementById('editName').value,
+                            hostname: document.getElementById('editHostname').value,
+                            grpc_port: parseInt(document.getElementById('editPort').value)
+                        };
+                        break;
+                        
+                    case 'user':
+                        url = `${API_BASE}/users/${currentEditId}`;
+                        data = {
+                            name: document.getElementById('editName').value,
+                            comment: document.getElementById('editComment').value || null,
+                            telegram_id: document.getElementById('editTelegram').value ? parseInt(document.getElementById('editTelegram').value) : null
+                        };
+                        break;
+                        
+                    case 'template':
+                        url = `${API_BASE}/templates/${currentEditId}`;
+                        data = {
+                            name: document.getElementById('editName').value,
+                            protocol: document.getElementById('editProtocol').value,
+                            default_port: parseInt(document.getElementById('editPort').value),
+                            requires_tls: document.getElementById('editTls').checked,
+                            is_active: document.getElementById('editActive').checked
+                        };
+                        break;
+                        
+                    case 'certificate':
+                        url = `${API_BASE}/certificates/${currentEditId}`;
+                        data = {
+                            name: document.getElementById('editName').value,
+                            domain: document.getElementById('editDomain').value,
+                            auto_renew: document.getElementById('editAutoRenew').checked
+                        };
+                        break;
+                        
+                    case 'inbound':
+                        url = `${API_BASE}/servers/${currentEditServerId}/inbounds/${currentEditId}`;
+                        data = {
+                            port_override: parseInt(document.getElementById('editPort').value),
+                            certificate_id: document.getElementById('editCertificate').value || null,
+                            is_active: document.getElementById('editActive').checked
+                        };
+                        break;
+                        
+                    default:
+                        throw new Error('Unknown edit type');
+                }
+                
+                const response = await fetch(url, {
+                    method: 'PUT',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(data)
+                });
+                
+                if (response.ok) {
+                    showStatus(`${currentEditType.charAt(0).toUpperCase() + currentEditType.slice(1)} updated successfully`, 'success');
+                    closeModal('editModal');
+                    
+                    // Reload appropriate data
+                    switch (currentEditType) {
+                        case 'server': loadServers(); break;
+                        case 'user': loadUsers(); break;
+                        case 'template': loadTemplates(); break;
+                        case 'certificate': loadCertificates(); break;
+                        case 'inbound': loadInbounds(); break;
+                    }
+                } else {
+                    showStatus('Error updating ' + currentEditType, 'error');
+                }
+            } catch (error) {
+                showStatus('Error: ' + error.message, 'error');
+            }
+        }
+        
+        // Initialize
+        loadDashboard();
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/telegram_bot/__init__.py b/telegram_bot/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/telegram_bot/admin.py b/telegram_bot/admin.py
deleted file mode 100644
index aa8346c..0000000
--- a/telegram_bot/admin.py
+++ /dev/null
@@ -1,854 +0,0 @@
-from django.contrib import admin
-from django.utils.html import format_html
-from django.urls import path, reverse
-from django.shortcuts import redirect
-from django.contrib import messages
-from django.utils import timezone
-from django import forms
-from django.contrib.admin.widgets import FilteredSelectMultiple
-from .models import BotSettings, TelegramMessage, AccessRequest
-from .localization import MessageLocalizer
-from vpn.models import User
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class BotSettingsAdminForm(forms.ModelForm):
-    """Custom form for BotSettings with Telegram admin selection"""
-    
-    class Meta:
-        model = BotSettings
-        fields = '__all__'
-    
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        # Show all users for telegram_admins selection
-        if 'telegram_admins' in self.fields:
-            self.fields['telegram_admins'].queryset = User.objects.all().order_by('username')
-            self.fields['telegram_admins'].help_text = (
-                "Select users who will have admin access in the bot. "
-                "Users will get admin rights when they connect to the bot with their Telegram account."
-            )
-    
-    def clean_telegram_admins(self):
-        """Validate that selected admins have telegram_user_id or telegram_username"""
-        admins = self.cleaned_data.get('telegram_admins')
-        # No validation needed - admins can be selected even without telegram connection
-        # They will get admin rights when they connect via bot
-        return admins
-
-
-class AccessRequestAdminForm(forms.ModelForm):
-    """Custom form for AccessRequest with existing user selection"""
-    
-    class Meta:
-        model = AccessRequest
-        fields = '__all__'
-        widgets = {
-            'selected_subscription_groups': FilteredSelectMultiple(
-                verbose_name='Subscription Groups',
-                is_stacked=False
-            ),
-        }
-    
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        # Rename the field for better UI
-        if 'selected_existing_user' in self.fields:
-            self.fields['selected_existing_user'].label = 'Link to existing user'
-            self.fields['selected_existing_user'].empty_label = "— Create new user —"
-            self.fields['selected_existing_user'].help_text = "Select an existing user without Telegram to link, or leave empty to create new user"
-            # Get users without telegram_user_id
-            from vpn.models import User
-            self.fields['selected_existing_user'].queryset = User.objects.filter(
-                telegram_user_id__isnull=True
-            ).order_by('username')
-        
-        # Configure subscription group fields
-        if 'selected_subscription_groups' in self.fields:
-            from vpn.models_xray import SubscriptionGroup
-            self.fields['selected_subscription_groups'].queryset = SubscriptionGroup.objects.filter(
-                is_active=True
-            ).order_by('name')
-            self.fields['selected_subscription_groups'].label = 'Subscription Groups'
-            self.fields['selected_subscription_groups'].help_text = 'Select subscription groups to assign to this user'
-
-
-@admin.register(BotSettings)
-class BotSettingsAdmin(admin.ModelAdmin):
-    form = BotSettingsAdminForm
-    list_display = ('__str__', 'enabled', 'bot_token_display', 'admin_count_display', 'updated_at')
-    fieldsets = (
-        ('Bot Configuration', {
-            'fields': ('bot_token', 'enabled', 'bot_status_display'),
-            'description': 'Configure bot settings and view current status'
-        }),
-        ('Admin Management', {
-            'fields': ('telegram_admins', 'admin_info_display'),
-            'description': 'Select users with linked Telegram accounts who will have admin access in the bot'
-        }),
-        ('Connection Settings', {
-            'fields': ('api_base_url', 'connection_timeout', 'use_proxy', 'proxy_url'),
-            'classes': ('collapse',)
-        }),
-        ('Timestamps', {
-            'fields': ('created_at', 'updated_at'),
-            'classes': ('collapse',)
-        }),
-    )
-    readonly_fields = ('created_at', 'updated_at', 'bot_status_display', 'admin_info_display')
-    filter_horizontal = ('telegram_admins',)
-    
-    def bot_token_display(self, obj):
-        """Mask bot token for security"""
-        if obj.bot_token:
-            token = obj.bot_token
-            if len(token) > 10:
-                return f"{token[:6]}...{token[-4:]}"
-            return "Token set"
-        return "No token set"
-    bot_token_display.short_description = "Bot Token"
-    
-    def admin_count_display(self, obj):
-        """Display count of Telegram admins"""
-        count = obj.telegram_admins.count()
-        if count == 0:
-            return "No admins"
-        elif count == 1:
-            return "1 admin"
-        else:
-            return f"{count} admins"
-    admin_count_display.short_description = "Telegram Admins"
-    
-    def admin_info_display(self, obj):
-        """Display detailed admin information"""
-        if not obj.pk:
-            return "Save settings first to manage admins"
-        
-        admins = obj.telegram_admins.all()
-        
-        if not admins.exists():
-            html = '<div style="background: #fff3cd; padding: 10px; border-radius: 4px; border-left: 4px solid #ffc107;">'
-            html += '<p style="margin: 0; color: #856404;"><strong>⚠️ No Telegram admins configured</strong></p>'
-            html += '<p style="margin: 5px 0 0 0; color: #856404;">Select users above to give them admin access in the Telegram bot.</p>'
-            html += '</div>'
-        else:
-            html = '<div style="background: #d4edda; padding: 10px; border-radius: 4px; border-left: 4px solid #28a745;">'
-            html += f'<p style="margin: 0; color: #155724;"><strong>✅ {admins.count()} Telegram admin(s) configured</strong></p>'
-            html += '<div style="margin-top: 8px;">'
-            
-            for admin in admins:
-                html += '<div style="background: white; margin: 4px 0; padding: 6px 10px; border-radius: 3px; border: 1px solid #c3e6cb;">'
-                html += f'<strong>{admin.username}</strong>'
-                
-                if admin.telegram_username:
-                    html += f' (@{admin.telegram_username})'
-                
-                html += f' <small style="color: #6c757d;">ID: {admin.telegram_user_id}</small>'
-                
-                if admin.first_name or admin.last_name:
-                    name_parts = []
-                    if admin.first_name:
-                        name_parts.append(admin.first_name)
-                    if admin.last_name:
-                        name_parts.append(admin.last_name)
-                    html += f'<br><small style="color: #6c757d;">Name: {" ".join(name_parts)}</small>'
-                
-                html += '</div>'
-            
-            html += '</div>'
-            html += '<p style="margin: 8px 0 0 0; color: #155724; font-size: 12px;">These users will receive notifications about new access requests and can approve/reject them directly in Telegram.</p>'
-            html += '</div>'
-        
-        return format_html(html)
-    admin_info_display.short_description = "Admin Configuration"
-    
-    def bot_status_display(self, obj):
-        """Display bot status with control buttons"""
-        from .bot import TelegramBotManager
-        import os
-        from django.conf import settings as django_settings
-        
-        manager = TelegramBotManager()
-        
-        # Check if lock file exists - only reliable indicator
-        lock_dir = os.path.join(getattr(django_settings, 'BASE_DIR', '/tmp'), 'telegram_bot_locks')
-        lock_path = os.path.join(lock_dir, 'telegram_bot.lock')
-        is_running = os.path.exists(lock_path)
-        
-        if is_running:
-            status_html = '<span style="color: green; font-weight: bold;">🟢 Bot is RUNNING</span>'
-        else:
-            status_html = '<span style="color: red; font-weight: bold;">🔴 Bot is STOPPED</span>'
-        
-        # Add control buttons
-        status_html += '<br><br>'
-        if is_running:
-            status_html += f'<a class="button" href="{reverse("admin:telegram_bot_stop_bot")}">Stop Bot</a> '
-            status_html += f'<a class="button" href="{reverse("admin:telegram_bot_restart_bot")}">Restart Bot</a>'
-        else:
-            if obj.enabled and obj.bot_token:
-                status_html += f'<a class="button" href="{reverse("admin:telegram_bot_start_bot")}">Start Bot</a>'
-            else:
-                status_html += '<span style="color: gray;">Configure bot token and enable bot to start</span>'
-        
-        return format_html(status_html)
-    bot_status_display.short_description = "Bot Status"
-    
-    def get_urls(self):
-        urls = super().get_urls()
-        custom_urls = [
-            path('start-bot/', self.start_bot, name='telegram_bot_start_bot'),
-            path('stop-bot/', self.stop_bot, name='telegram_bot_stop_bot'),
-            path('restart-bot/', self.restart_bot, name='telegram_bot_restart_bot'),
-        ]
-        return custom_urls + urls
-    
-    def start_bot(self, request):
-        """Start the telegram bot"""
-        try:
-            from .bot import TelegramBotManager
-            manager = TelegramBotManager()
-            manager.start()
-            messages.success(request, "Bot started successfully!")
-        except Exception as e:
-            messages.error(request, f"Failed to start bot: {e}")
-            logger.error(f"Failed to start bot: {e}")
-        
-        return redirect('admin:telegram_bot_botsettings_change', object_id=1)
-    
-    def stop_bot(self, request):
-        """Stop the telegram bot"""
-        try:
-            from .bot import TelegramBotManager
-            manager = TelegramBotManager()
-            manager.stop()
-            messages.success(request, "Bot stopped successfully!")
-        except Exception as e:
-            messages.error(request, f"Failed to stop bot: {e}")
-            logger.error(f"Failed to stop bot: {e}")
-        
-        return redirect('admin:telegram_bot_botsettings_change', object_id=1)
-    
-    def restart_bot(self, request):
-        """Restart the telegram bot"""
-        try:
-            from .bot import TelegramBotManager
-            manager = TelegramBotManager()
-            manager.restart()
-            messages.success(request, "Bot restarted successfully!")
-        except Exception as e:
-            messages.error(request, f"Failed to restart bot: {e}")
-            logger.error(f"Failed to restart bot: {e}")
-        
-        return redirect('admin:telegram_bot_botsettings_change', object_id=1)
-    
-    def has_add_permission(self, request):
-        # Prevent creating multiple instances
-        return not BotSettings.objects.exists()
-    
-    def has_delete_permission(self, request, obj=None):
-        # Prevent deletion
-        return False
-
-
-@admin.register(TelegramMessage)
-class TelegramMessageAdmin(admin.ModelAdmin):
-    list_display = (
-        'created_at', 
-        'direction_display', 
-        'user_display', 
-        'language_display',
-        'message_preview',
-        'linked_user'
-    )
-    list_filter = (
-        'direction', 
-        'created_at',
-        ('linked_user', admin.EmptyFieldListFilter),
-    )
-    search_fields = (
-        'telegram_username', 
-        'telegram_first_name', 
-        'telegram_last_name',
-        'message_text',
-        'telegram_user_id'
-    )
-    readonly_fields = (
-        'direction',
-        'telegram_user_id',
-        'telegram_username',
-        'telegram_first_name',
-        'telegram_last_name',
-        'chat_id',
-        'message_id',
-        'message_text',
-        'raw_data_display',
-        'created_at',
-        'linked_user',
-        'user_language'
-    )
-    
-    fieldsets = (
-        ('Message Info', {
-            'fields': (
-                'direction',
-                'message_text',
-                'created_at'
-            )
-        }),
-        ('Telegram User', {
-            'fields': (
-                'telegram_user_id',
-                'telegram_username',
-                'telegram_first_name',
-                'telegram_last_name',
-            )
-        }),
-        ('Technical Details', {
-            'fields': (
-                'chat_id',
-                'message_id',
-                'linked_user',
-                'raw_data_display'
-            ),
-            'classes': ('collapse',)
-        })
-    )
-    
-    ordering = ['-created_at']
-    list_per_page = 50
-    date_hierarchy = 'created_at'
-    
-    def direction_display(self, obj):
-        """Display direction with icon"""
-        if obj.direction == 'incoming':
-            return format_html('<span style="color: blue;">⬇️ Incoming</span>')
-        else:
-            return format_html('<span style="color: green;">⬆️ Outgoing</span>')
-    direction_display.short_description = "Direction"
-    
-    def user_display(self, obj):
-        """Display user info"""
-        display = obj.display_name
-        if obj.telegram_user_id:
-            display += f" (ID: {obj.telegram_user_id})"
-        return display
-    user_display.short_description = "Telegram User"
-    
-    def language_display(self, obj):
-        """Display user language"""
-        lang_map = {'ru': '🇷🇺 RU', 'en': '🇺🇸 EN'}
-        return lang_map.get(obj.user_language, obj.user_language or 'Unknown')
-    language_display.short_description = "Language"
-    
-    def message_preview(self, obj):
-        """Show message preview"""
-        if len(obj.message_text) > 100:
-            return obj.message_text[:100] + "..."
-        return obj.message_text
-    message_preview.short_description = "Message"
-    
-    def raw_data_display(self, obj):
-        """Display raw data as formatted JSON"""
-        import json
-        if obj.raw_data:
-            formatted = json.dumps(obj.raw_data, indent=2, ensure_ascii=False)
-            return format_html('<pre style="max-width: 800px; overflow: auto;">{}</pre>', formatted)
-        return "No raw data"
-    raw_data_display.short_description = "Raw Data"
-    
-    def has_add_permission(self, request):
-        # Messages are created automatically by bot
-        return False
-    
-    def has_change_permission(self, request, obj=None):
-        # Messages are read-only
-        return False
-    
-    def has_delete_permission(self, request, obj=None):
-        # Allow deletion for cleanup
-        return request.user.is_superuser
-    
-    def get_actions(self, request):
-        """Add custom actions"""
-        actions = super().get_actions(request)
-        if not request.user.is_superuser:
-            # Remove delete action for non-superusers
-            if 'delete_selected' in actions:
-                del actions['delete_selected']
-        return actions
-
-
-@admin.register(AccessRequest)
-class AccessRequestAdmin(admin.ModelAdmin):
-    form = AccessRequestAdminForm
-    list_display = (
-        'created_at',
-        'user_display', 
-        'approved_display',
-        'language_display',
-        'desired_username_display',
-        'message_preview',
-        'created_user',
-        'processed_by'
-    )
-    list_filter = (
-        'approved',
-        'created_at',
-        'processed_at',
-        ('processed_by', admin.EmptyFieldListFilter),
-    )
-    search_fields = (
-        'telegram_username',
-        'telegram_first_name', 
-        'telegram_last_name',
-        'telegram_user_id',
-        'message_text'
-    )
-    readonly_fields = (
-        'telegram_user_id',
-        'telegram_username', 
-        'telegram_first_name',
-        'telegram_last_name',
-        'message_text',
-        'chat_id',
-        'created_at',
-        'first_message',
-        'processed_at',
-        'processed_by',
-        'created_user',
-        'user_language'
-    )
-    
-    fieldsets = (
-        ('Request Info', {
-            'fields': (
-                'approved',
-                'admin_comment',
-                'created_at',
-                'processed_at',
-                'processed_by'
-            )
-        }),
-        ('User Creation', {
-            'fields': (
-                'selected_existing_user',
-                'desired_username',
-            ),
-            'description': 'Choose existing user to link OR specify username for new user'
-        }),
-        ('VPN Access Configuration', {
-            'fields': (
-                'selected_subscription_groups',
-            ),
-            'description': 'Select subscription groups to assign to the user'
-        }),
-        ('Telegram User', {
-            'fields': (
-                'telegram_user_id',
-                'telegram_username',
-                'telegram_first_name',
-                'telegram_last_name',
-            )
-        }),
-        ('Message Details', {
-            'fields': (
-                'message_text',
-                'chat_id',
-                'first_message'
-            ),
-            'classes': ('collapse',)
-        }),
-        ('Processing Results', {
-            'fields': (
-                'created_user',
-            )
-        })
-    )
-    
-    ordering = ['-created_at']
-    list_per_page = 50
-    date_hierarchy = 'created_at'
-    actions = ['approve_requests']
-    
-    def user_display(self, obj):
-        """Display user info"""
-        return obj.display_name
-    user_display.short_description = "Telegram User"
-    
-    def approved_display(self, obj):
-        """Display approved status with colors"""
-        if obj.approved:
-            return format_html('<span style="color: green; font-weight: bold;">✅ Approved</span>')
-        else:
-            return format_html('<span style="color: orange; font-weight: bold;">🔄 Pending</span>')
-    approved_display.short_description = "Status"
-    
-    def message_preview(self, obj):
-        """Show message preview"""
-        if len(obj.message_text) > 100:
-            return obj.message_text[:100] + "..."
-        return obj.message_text
-    message_preview.short_description = "Message"
-    
-    def desired_username_display(self, obj):
-        """Display desired username"""
-        if obj.desired_username:
-            return obj.desired_username
-        else:
-            fallback = obj.telegram_username or obj.telegram_first_name or f"tg_{obj.telegram_user_id}"
-            return format_html('<span style="color: gray; font-style: italic;">{}</span>', fallback)
-    desired_username_display.short_description = "Desired Username"
-    
-    def language_display(self, obj):
-        """Display user language with flag"""
-        lang_map = {'ru': '🇷🇺 RU', 'en': '🇺🇸 EN'}
-        return lang_map.get(obj.user_language, obj.user_language or 'Unknown')
-    language_display.short_description = "Language"
-    
-    def approve_requests(self, request, queryset):
-        """Approve selected access requests"""
-        pending_requests = queryset.filter(approved=False)
-        count = 0
-        errors = []
-        
-        for access_request in pending_requests:
-            try:
-                logger.info(f"Approving request {access_request.id} from user {access_request.telegram_user_id}")
-                user = self._create_user_from_request(access_request, request.user)
-                
-                if user:
-                    access_request.approved = True
-                    access_request.processed_by = request.user
-                    access_request.processed_at = timezone.now()
-                    access_request.created_user = user
-                    access_request.save()
-                    
-                    logger.info(f"Successfully approved request {access_request.id}, created user {user.username}")
-                    
-                    # Send notification to user
-                    self._send_approval_notification(access_request)
-                    count += 1
-                else:
-                    errors.append(f"Failed to create user for {access_request.display_name}")
-                
-            except Exception as e:
-                error_msg = f"Failed to approve request from {access_request.display_name}: {e}"
-                logger.error(error_msg)
-                errors.append(error_msg)
-        
-        if count:
-            messages.success(request, f"Successfully approved {count} request(s)")
-        
-        if errors:
-            for error in errors:
-                messages.error(request, error)
-    
-    approve_requests.short_description = "✅ Approve selected requests"
-    
-    def save_model(self, request, obj, form, change):
-        """Override save to handle existing user linking"""
-        super().save_model(request, obj, form, change)
-        
-        # If approved and existing user was selected, link them
-        if obj.approved and obj.selected_existing_user and not obj.created_user:
-            try:
-                # Link telegram data to selected user
-                obj.selected_existing_user.telegram_user_id = obj.telegram_user_id
-                obj.selected_existing_user.telegram_username = obj.telegram_username
-                obj.selected_existing_user.telegram_first_name = obj.telegram_first_name or ""
-                obj.selected_existing_user.telegram_last_name = obj.telegram_last_name or ""
-                obj.selected_existing_user.save()
-                
-                # Update the request to reference the linked user
-                obj.created_user = obj.selected_existing_user
-                obj.processed_by = request.user
-                obj.processed_at = timezone.now()
-                obj.save()
-                
-                # Assign VPN access to the linked user
-                try:
-                    self._assign_vpn_access(obj.selected_existing_user, obj)
-                except Exception as e:
-                    logger.error(f"Failed to assign VPN access: {e}")
-                    messages.warning(request, f"User linked but VPN access assignment failed: {e}")
-                
-                # Send notification
-                self._send_approval_notification(obj)
-                
-                messages.success(request, f"Successfully linked Telegram user to existing user {obj.selected_existing_user.username}")
-                logger.info(f"Linked Telegram user {obj.telegram_user_id} to existing user {obj.selected_existing_user.username}")
-                
-            except Exception as e:
-                messages.error(request, f"Failed to link existing user: {e}")
-                logger.error(f"Failed to link existing user: {e}")
-    
-    def _create_user_from_request(self, access_request, admin_user):
-        """Create User from AccessRequest or link to existing user"""
-        from vpn.models import User
-        import secrets
-        import string
-        
-        try:
-            # Check if user already exists by telegram_user_id
-            existing_user = User.objects.filter(telegram_user_id=access_request.telegram_user_id).first()
-            if existing_user:
-                logger.info(f"User already exists: {existing_user.username}")
-                return existing_user
-            
-            # Check if admin selected an existing user to link
-            if access_request.selected_existing_user:
-                selected_user = access_request.selected_existing_user
-                logger.info(f"Linking Telegram user {access_request.telegram_user_id} to selected existing user {selected_user.username}")
-                
-                # Link telegram data to selected user
-                selected_user.telegram_user_id = access_request.telegram_user_id
-                selected_user.telegram_username = access_request.telegram_username
-                selected_user.telegram_first_name = access_request.telegram_first_name or ""
-                selected_user.telegram_last_name = access_request.telegram_last_name or ""
-                selected_user.save()
-                
-                # Assign VPN access to the linked user
-                try:
-                    self._assign_vpn_access(selected_user, access_request)
-                except Exception as e:
-                    logger.error(f"Failed to assign VPN access to user {selected_user.username}: {e}")
-                
-                return selected_user
-            
-            # Check if we can link to existing user by telegram_username
-            if access_request.telegram_username:
-                existing_user_by_username = User.objects.filter(
-                    telegram_username__iexact=access_request.telegram_username,
-                    telegram_user_id__isnull=True  # Not yet linked to Telegram
-                ).first()
-                
-                if existing_user_by_username:
-                    # Link telegram data to existing user
-                    logger.info(f"Linking Telegram @{access_request.telegram_username} to existing user {existing_user_by_username.username}")
-                    existing_user_by_username.telegram_user_id = access_request.telegram_user_id
-                    existing_user_by_username.telegram_username = access_request.telegram_username
-                    existing_user_by_username.telegram_first_name = access_request.telegram_first_name or ""
-                    existing_user_by_username.telegram_last_name = access_request.telegram_last_name or ""
-                    existing_user_by_username.save()
-                    
-                    # Assign VPN access to the linked user
-                    try:
-                        self._assign_vpn_access(existing_user_by_username, access_request)
-                    except Exception as e:
-                        logger.error(f"Failed to assign VPN access to user {existing_user_by_username.username}: {e}")
-                    
-                    return existing_user_by_username
-            
-            # Use desired_username if provided, otherwise fallback to Telegram data
-            username = access_request.desired_username
-            if not username:
-                # Fallback to telegram_username, first_name or user_id
-                username = access_request.telegram_username or access_request.telegram_first_name or f"tg_{access_request.telegram_user_id}"
-            
-            # Clean username (remove special characters)
-            username = ''.join(c for c in username if c.isalnum() or c in '_-').lower()
-            if not username:
-                username = f"tg_{access_request.telegram_user_id}"
-            
-            # Make sure username is unique
-            original_username = username
-            counter = 1
-            while User.objects.filter(username=username).exists():
-                username = f"{original_username}_{counter}"
-                counter += 1
-            
-            # Create new user since no existing user found to link
-            # Generate random password
-            password = ''.join(secrets.choice(string.ascii_letters + string.digits) for _ in range(12))
-            
-            logger.info(f"Creating new user with username: {username}")
-            
-            # Create user
-            user = User.objects.create_user(
-                username=username,
-                password=password,
-                first_name=access_request.telegram_first_name or "",
-                last_name=access_request.telegram_last_name or "",
-                telegram_user_id=access_request.telegram_user_id,
-                telegram_username=access_request.telegram_username or "",
-                telegram_first_name=access_request.telegram_first_name or "",
-                telegram_last_name=access_request.telegram_last_name or "",
-                is_active=True
-            )
-            
-            logger.info(f"Successfully created user {user.username} (ID: {user.id}) from Telegram request {access_request.id}")
-            
-            # Assign VPN access (inbounds and subscription groups)
-            try:
-                self._assign_vpn_access(user, access_request)
-            except Exception as e:
-                logger.error(f"Failed to assign VPN access to user {user.username}: {e}")
-                # Continue even if VPN assignment fails - user is already created
-            
-            return user
-            
-        except Exception as e:
-            logger.error(f"Error creating user from request {access_request.id}: {e}")
-            raise
-    
-    def _assign_vpn_access(self, user, access_request):
-        """Assign selected subscription groups to the user"""
-        try:
-            from vpn.models_xray import UserSubscription
-            
-            # Assign subscription groups
-            group_count = 0
-            for subscription_group in access_request.selected_subscription_groups.all():
-                user_subscription, created = UserSubscription.objects.get_or_create(
-                    user=user,
-                    subscription_group=subscription_group,
-                    defaults={'active': True}
-                )
-                if created:
-                    logger.info(f"Assigned subscription group '{subscription_group.name}' to user {user.username}")
-                    group_count += 1
-                else:
-                    # Ensure it's active if it already existed
-                    if not user_subscription.active:
-                        user_subscription.active = True
-                        user_subscription.save()
-                        logger.info(f"Re-activated subscription group '{subscription_group.name}' for user {user.username}")
-                        group_count += 1
-            
-            logger.info(f"Successfully assigned {group_count} subscription groups to user {user.username}")
-            
-        except Exception as e:
-            logger.error(f"Error assigning VPN access to user {user.username}: {e}")
-            raise
-    
-    def _send_approval_notification(self, access_request):
-        """Send approval notification via Telegram"""
-        try:
-            from .models import BotSettings
-            from telegram import Bot
-            import asyncio
-            
-            settings = BotSettings.get_settings()
-            if not settings.enabled or not settings.bot_token:
-                logger.warning("Bot not configured, skipping notification")
-                return
-            
-            # Create a simple Bot instance for sending notification
-            # This bypasses the need for the running bot manager
-            async def send_notification():
-                try:
-                    # Create bot with custom request settings
-                    from telegram.request import HTTPXRequest
-                    
-                    request_kwargs = {
-                        'connection_pool_size': 1,
-                        'read_timeout': settings.connection_timeout,
-                        'write_timeout': settings.connection_timeout,
-                        'connect_timeout': settings.connection_timeout,
-                    }
-                    
-                    if settings.use_proxy and settings.proxy_url:
-                        request_kwargs['proxy'] = settings.proxy_url
-                    
-                    request = HTTPXRequest(**request_kwargs)
-                    bot = Bot(token=settings.bot_token, request=request)
-                    
-                    # Send localized approval message with new keyboard
-                    from telegram import ReplyKeyboardMarkup, KeyboardButton
-                    language = access_request.user_language or 'en'
-                    
-                    # Get localized texts
-                    message = MessageLocalizer.get_message('approval_notification', language)
-                    access_btn_text = MessageLocalizer.get_button_text('access', language)
-                    
-                    # Create keyboard with Access button
-                    keyboard = [[KeyboardButton(access_btn_text)]]
-                    reply_markup = ReplyKeyboardMarkup(
-                        keyboard, 
-                        resize_keyboard=True,
-                        one_time_keyboard=False
-                    )
-                    
-                    await bot.send_message(
-                        chat_id=access_request.telegram_user_id,
-                        text=message,
-                        reply_markup=reply_markup
-                    )
-                    
-                    logger.info(f"Sent approval notification to {access_request.telegram_user_id}")
-                    
-                except Exception as e:
-                    logger.error(f"Failed to send Telegram message: {e}")
-                finally:
-                    try:
-                        # Clean up bot connection
-                        await request.shutdown()
-                    except:
-                        pass
-            
-            # Run in thread to avoid blocking admin interface
-            import threading
-            
-            def run_async_notification():
-                try:
-                    asyncio.run(send_notification())
-                except Exception as e:
-                    logger.error(f"Error in notification thread: {e}")
-            
-            thread = threading.Thread(target=run_async_notification, daemon=True)
-            thread.start()
-                
-        except Exception as e:
-            logger.error(f"Failed to send approval notification: {e}")
-    
-    
-    def has_add_permission(self, request):
-        # Requests are created by bot
-        return False
-    
-    def has_change_permission(self, request, obj=None):
-        # Allow changing only status and comment
-        return True
-    
-    def save_model(self, request, obj, form, change):
-        """Automatically handle approval and user creation"""
-        # Check if this is a change to approved
-        was_approved = False
-        
-        # If desired_username was changed and is empty, set default from Telegram data
-        if change and 'desired_username' in form.changed_data and not obj.desired_username:
-            obj.desired_username = obj.telegram_username or obj.telegram_first_name or f"tg_{obj.telegram_user_id}"
-        
-        if change and 'approved' in form.changed_data and obj.approved:
-            # Set processed_by and processed_at
-            if not obj.processed_by:
-                obj.processed_by = request.user
-            if not obj.processed_at:
-                obj.processed_at = timezone.now()
-            was_approved = True
-        
-        # If approved and no user created yet, create user
-        if was_approved and not obj.created_user:
-            try:
-                logger.info(f"Auto-creating user for approved request {obj.id}")
-                user = self._create_user_from_request(obj, request.user)
-                if user:
-                    obj.created_user = user
-                    messages.success(request, f"User '{user.username}' created successfully!")
-                    logger.info(f"Auto-created user {user.username} for request {obj.id}")
-                    
-                    # Send approval notification
-                    self._send_approval_notification(obj)
-                else:
-                    messages.error(request, f"Failed to create user for approved request {obj.id}")
-            except Exception as e:
-                messages.error(request, f"Error creating user: {e}")
-                logger.error(f"Error auto-creating user for request {obj.id}: {e}")
-        
-        # Save the object
-        super().save_model(request, obj, form, change)
-
-
diff --git a/telegram_bot/apps.py b/telegram_bot/apps.py
deleted file mode 100644
index 92ec9b5..0000000
--- a/telegram_bot/apps.py
+++ /dev/null
@@ -1,75 +0,0 @@
-from django.apps import AppConfig
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class TelegramBotConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'telegram_bot'
-    
-    def ready(self):
-        """Called when Django starts - attempt to auto-start bot if enabled"""
-        import sys
-        import os
-        
-        # Skip auto-start in various scenarios
-        skip_conditions = [
-            # Management commands
-            'migrate' in sys.argv,
-            'makemigrations' in sys.argv,
-            'collectstatic' in sys.argv,
-            'shell' in sys.argv,
-            'test' in sys.argv,
-            # Celery processes
-            'celery' in sys.argv,
-            'worker' in sys.argv,
-            'beat' in sys.argv,
-            # Environment variables that indicate worker/beat processes
-            os.environ.get('CELERY_WORKER_NAME'),
-            os.environ.get('CELERY_BEAT'),
-            # Process name detection
-            any('celery' in arg.lower() for arg in sys.argv),
-            any('worker' in arg.lower() for arg in sys.argv),
-            any('beat' in arg.lower() for arg in sys.argv),
-        ]
-        
-        if any(skip_conditions):
-            logger.info(f"Skipping Telegram bot auto-start in process: {' '.join(sys.argv)}")
-            return
-            
-        # Additional process detection by checking if we're in main process
-        try:
-            # Check if this is the main Django process (not a worker)
-            current_process = os.environ.get('DJANGO_SETTINGS_MODULE')
-            if not current_process:
-                logger.info("Skipping bot auto-start: not in main Django process")
-                return
-        except:
-            pass
-            
-        # Delay import to avoid circular imports
-        try:
-            from .bot import TelegramBotManager
-            import threading
-            import time
-            
-            def delayed_autostart():
-                # Wait a bit for Django to fully initialize
-                time.sleep(2)
-                try:
-                    manager = TelegramBotManager()
-                    if manager.auto_start_if_enabled():
-                        logger.info("Telegram bot auto-started successfully")
-                    else:
-                        logger.info("Telegram bot auto-start skipped (disabled or already running)")
-                except Exception as e:
-                    logger.error(f"Failed to auto-start Telegram bot: {e}")
-            
-            logger.info("Starting Telegram bot auto-start thread")
-            # Start in background thread to not block Django startup
-            thread = threading.Thread(target=delayed_autostart, daemon=True)
-            thread.start()
-            
-        except Exception as e:
-            logger.error(f"Error setting up Telegram bot auto-start: {e}")
diff --git a/telegram_bot/bot.py b/telegram_bot/bot.py
deleted file mode 100644
index ef05ebb..0000000
--- a/telegram_bot/bot.py
+++ /dev/null
@@ -1,1897 +0,0 @@
-import logging
-import threading
-import time
-import asyncio
-import os
-import fcntl
-from typing import Optional
-from telegram import Update, Bot
-from telegram.ext import Application, CommandHandler, MessageHandler, CallbackQueryHandler, filters, ContextTypes
-from django.utils import timezone
-from django.conf import settings
-from asgiref.sync import sync_to_async
-from .models import BotSettings, TelegramMessage, AccessRequest
-from .localization import get_localized_message, get_localized_button, get_user_language, MessageLocalizer
-
-logger = logging.getLogger(__name__)
-
-
-class TelegramBotManager:
-    """Singleton manager for Telegram bot with file locking"""
-    _instance = None
-    _lock = threading.Lock()
-    _bot_thread: Optional[threading.Thread] = None
-    _application: Optional[Application] = None
-    _stop_event = threading.Event()
-    _lockfile = None
-    
-    def __new__(cls):
-        if cls._instance is None:
-            with cls._lock:
-                if cls._instance is None:
-                    cls._instance = super().__new__(cls)
-        return cls._instance
-    
-    def __init__(self):
-        # Initialize only once
-        if not hasattr(self, '_initialized'):
-            self._initialized = True
-            self._running = False
-            self._lockfile = None
-            # Sync status on startup
-            self._sync_status_on_startup()
-    
-    def _acquire_lock(self):
-        """Acquire file lock to prevent multiple bot instances"""
-        try:
-            # Create lock file path
-            lock_dir = os.path.join(getattr(settings, 'BASE_DIR', '/tmp'), 'telegram_bot_locks')
-            os.makedirs(lock_dir, exist_ok=True)
-            lock_path = os.path.join(lock_dir, 'telegram_bot.lock')
-            
-            # Open lock file
-            self._lockfile = open(lock_path, 'w')
-            
-            # Try to acquire exclusive lock (non-blocking)
-            fcntl.flock(self._lockfile.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
-            
-            # Write PID to lock file
-            self._lockfile.write(f"{os.getpid()}\n")
-            self._lockfile.flush()
-            
-            logger.info(f"Acquired bot lock: {lock_path}")
-            return True
-            
-        except (OSError, IOError) as e:
-            if self._lockfile:
-                try:
-                    self._lockfile.close()
-                except:
-                    pass
-                self._lockfile = None
-            
-            logger.warning(f"Could not acquire bot lock: {e}")
-            return False
-    
-    def _release_lock(self):
-        """Release file lock"""
-        if self._lockfile:
-            try:
-                fcntl.flock(self._lockfile.fileno(), fcntl.LOCK_UN)
-                self._lockfile.close()
-                logger.info("Released bot lock")
-            except:
-                pass
-            finally:
-                self._lockfile = None
-    
-    def start(self):
-        """Start the bot in a background thread"""
-        if self._running:
-            logger.warning("Bot is already running")
-            return
-        
-        # Try to acquire lock first
-        if not self._acquire_lock():
-            raise Exception("Another bot instance is already running (could not acquire lock)")
-        
-        # No database status to reset - only lock file matters
-        
-        bot_settings = BotSettings.get_settings()
-        if not bot_settings.enabled:
-            self._release_lock()
-            raise Exception("Bot is disabled in settings")
-        
-        if not bot_settings.bot_token:
-            self._release_lock()
-            raise Exception("Bot token is not configured")
-        
-        try:
-            self._stop_event.clear()
-            self._bot_thread = threading.Thread(target=self._run_bot, daemon=True)
-            self._bot_thread.start()
-            
-            # Wait a moment to see if thread starts successfully
-            time.sleep(0.5)
-            
-            # Check if thread started successfully
-            if self._bot_thread.is_alive():
-                logger.info("Bot started successfully")
-            else:
-                self._release_lock()
-                raise Exception("Bot thread failed to start")
-                
-        except Exception as e:
-            self._release_lock()
-            raise e
-    
-    async def _is_telegram_admin(self, telegram_user):
-        """Check if user is a Telegram admin"""
-        try:
-            from django.db.models import Q
-            bot_settings = await sync_to_async(BotSettings.get_settings)()
-            
-            # Check by telegram_user_id first
-            if hasattr(telegram_user, 'id'):
-                telegram_user_id = telegram_user.id
-                telegram_username = telegram_user.username if hasattr(telegram_user, 'username') else None
-            else:
-                # If just an ID was passed
-                telegram_user_id = telegram_user
-                telegram_username = None
-            
-            # Check if admin by telegram_user_id
-            admin_by_id = await sync_to_async(
-                bot_settings.telegram_admins.filter(telegram_user_id=telegram_user_id).exists
-            )()
-            
-            if admin_by_id:
-                return True
-            
-            # Also check by telegram_username if available
-            if telegram_username:
-                admin_by_username = await sync_to_async(
-                    bot_settings.telegram_admins.filter(telegram_username=telegram_username).exists
-                )()
-                
-                if admin_by_username:
-                    # Update the user's telegram_user_id for future checks
-                    admin_user = await sync_to_async(
-                        bot_settings.telegram_admins.filter(telegram_username=telegram_username).first
-                    )()
-                    if admin_user and not admin_user.telegram_user_id:
-                        admin_user.telegram_user_id = telegram_user_id
-                        await sync_to_async(admin_user.save)()
-                        logger.info(f"Linked telegram_user_id {telegram_user_id} to admin {admin_user.username}")
-                    return True
-            
-            return False
-        except Exception as e:
-            logger.error(f"Error checking admin status: {e}")
-            return False
-    
-    async def _notify_admins_new_request(self, access_request):
-        """Notify all Telegram admins about new access request"""
-        try:
-            bot_settings = await sync_to_async(BotSettings.get_settings)()
-            admins = await sync_to_async(list)(bot_settings.telegram_admins.all())
-            
-            if not admins:
-                logger.info("No Telegram admins configured, skipping notification")
-                return
-            
-            # Prepare user info
-            user_info = access_request.display_name
-            telegram_info = f"`@{access_request.telegram_username}`" if access_request.telegram_username else f"ID: {access_request.telegram_user_id}"
-            date = access_request.created_at.strftime("%Y-%m-%d %H:%M")
-            message = access_request.message_text[:200] + "..." if len(access_request.message_text) > 200 else access_request.message_text
-            
-            # Send notification to each admin
-            for admin in admins:
-                try:
-                    if admin.telegram_user_id:
-                        # Get admin language (default to English if not set)
-                        admin_language = 'ru' if hasattr(admin, 'telegram_user_language') else 'en'
-                        
-                        notification_text = MessageLocalizer.get_message(
-                            'admin_new_request_notification', 
-                            admin_language,
-                            user_info=user_info,
-                            telegram_info=telegram_info,
-                            date=date,
-                            message=message
-                        )
-                        
-                        await self._send_notification_to_admin(admin.telegram_user_id, notification_text)
-                        logger.info(f"Sent new request notification to admin {admin.username}")
-                        
-                except Exception as e:
-                    logger.error(f"Failed to notify admin {admin.username}: {e}")
-                    
-        except Exception as e:
-            logger.error(f"Error notifying admins about new request: {e}")
-    
-    async def _send_notification_to_admin(self, telegram_user_id, message_text):
-        """Send notification message to specific admin"""
-        try:
-            bot_settings = await sync_to_async(BotSettings.get_settings)()
-            if not bot_settings.enabled or not bot_settings.bot_token:
-                logger.warning("Bot not configured, skipping admin notification")
-                return
-            
-            # Create a simple Bot instance for sending notification
-            from telegram import Bot
-            from telegram.request import HTTPXRequest
-            
-            request_kwargs = {
-                'connection_pool_size': 1,
-                'read_timeout': bot_settings.connection_timeout,
-                'write_timeout': bot_settings.connection_timeout,
-                'connect_timeout': bot_settings.connection_timeout,
-            }
-            
-            if bot_settings.use_proxy and bot_settings.proxy_url:
-                request_kwargs['proxy'] = bot_settings.proxy_url
-            
-            request = HTTPXRequest(**request_kwargs)
-            bot = Bot(token=bot_settings.bot_token, request=request)
-            
-            await bot.send_message(
-                chat_id=telegram_user_id,
-                text=message_text,
-                parse_mode='Markdown'
-            )
-            
-            # Clean up bot connection
-            try:
-                await request.shutdown()
-            except:
-                pass
-                
-        except Exception as e:
-            logger.error(f"Failed to send notification to admin {telegram_user_id}: {e}")
-    
-    async def _create_main_keyboard(self, telegram_user):
-        """Create main keyboard for existing users, with admin buttons if user is admin"""
-        from telegram import ReplyKeyboardMarkup, KeyboardButton
-        
-        # Get basic buttons
-        access_button = get_localized_button(telegram_user, 'access')
-        guide_button = get_localized_button(telegram_user, 'guide')
-        
-        # Check if user is admin
-        is_admin = await self._is_telegram_admin(telegram_user)
-        
-        if is_admin:
-            # Admin keyboard with additional admin button
-            access_requests_button = get_localized_button(telegram_user, 'access_requests')
-            keyboard = [
-                [KeyboardButton(access_button), KeyboardButton(guide_button)],
-                [KeyboardButton(access_requests_button)]
-            ]
-        else:
-            # Regular user keyboard
-            keyboard = [
-                [KeyboardButton(access_button), KeyboardButton(guide_button)]
-            ]
-        
-        return ReplyKeyboardMarkup(
-            keyboard,
-            resize_keyboard=True,
-            one_time_keyboard=False
-        )
-    
-    async def _handle_access_requests_command(self, update: Update):
-        """Handle access requests button - show pending requests to admin"""
-        try:
-            # Get pending access requests
-            pending_requests = await sync_to_async(list)(
-                AccessRequest.objects.filter(approved=False).order_by('-created_at')
-            )
-            
-            if not pending_requests:
-                # No pending requests
-                no_requests_msg = get_localized_message(update.message.from_user, 'admin_no_pending_requests')
-                reply_markup = await self._create_main_keyboard(update.message.from_user)
-                
-                sent_message = await update.message.reply_text(
-                    no_requests_msg,
-                    reply_markup=reply_markup
-                )
-                
-                await self._save_outgoing_message(sent_message, update.message.from_user)
-                return
-            
-            # Show pending requests with inline keyboards for approve/reject
-            title_msg = get_localized_message(update.message.from_user, 'admin_access_requests_title')
-            
-            # Send title message with main keyboard 
-            reply_markup = await self._create_main_keyboard(update.message.from_user)
-            title_sent = await update.message.reply_text(
-                title_msg,
-                reply_markup=reply_markup,
-                parse_mode='Markdown'
-            )
-            await self._save_outgoing_message(title_sent, update.message.from_user)
-            
-            # Send each request with inline keyboard for actions
-            from telegram import InlineKeyboardMarkup, InlineKeyboardButton
-            
-            for request in pending_requests[:5]:  # Show max 5 requests
-                # Format request info
-                user_info = request.display_name
-                date = request.created_at.strftime("%Y-%m-%d %H:%M")
-                message_preview = request.message_text[:100] + "..." if len(request.message_text) > 100 else request.message_text
-                
-                request_text = get_localized_message(
-                    update.message.from_user, 
-                    'admin_request_item',
-                    user_info=user_info,
-                    date=date,
-                    message_preview=message_preview
-                )
-                
-                # Create inline keyboard for this request
-                approve_btn_text = get_localized_button(update.message.from_user, 'approve')
-                reject_btn_text = get_localized_button(update.message.from_user, 'reject')
-                details_btn_text = get_localized_button(update.message.from_user, 'details')
-                
-                inline_keyboard = [
-                    [
-                        InlineKeyboardButton(approve_btn_text, callback_data=f"approve_{request.id}"),
-                        InlineKeyboardButton(reject_btn_text, callback_data=f"reject_{request.id}")
-                    ],
-                    [InlineKeyboardButton(details_btn_text, callback_data=f"details_{request.id}")]
-                ]
-                inline_markup = InlineKeyboardMarkup(inline_keyboard)
-                
-                request_sent = await update.message.reply_text(
-                    request_text,
-                    reply_markup=inline_markup,
-                    parse_mode='Markdown'
-                )
-                await self._save_outgoing_message(request_sent, update.message.from_user)
-            
-            if len(pending_requests) > 5:
-                remaining_msg = f"... и еще {len(pending_requests) - 5} заявок" if get_user_language(update.message.from_user) == 'ru' else f"... and {len(pending_requests) - 5} more requests"
-                await update.message.reply_text(remaining_msg)
-            
-            logger.info(f"Showed {len(pending_requests)} pending requests to admin {update.message.from_user.username}")
-            
-        except Exception as e:
-            logger.error(f"Error handling access requests command: {e}")
-            error_msg = get_localized_message(update.message.from_user, 'admin_error_processing', error=str(e))
-            await update.message.reply_text(error_msg)
-    
-    async def _handle_callback_query(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
-        """Handle inline keyboard button presses (callback queries)"""
-        try:
-            query = update.callback_query
-            await query.answer()  # Acknowledge the callback
-            
-            # Check if user is admin
-            if not await self._is_telegram_admin(query.from_user):
-                await query.edit_message_text("❌ Access denied. Admin rights required.")
-                return
-            
-            # Parse callback data
-            callback_data = query.data
-            action, request_id = callback_data.split('_', 1)
-            
-            if action == "approve":
-                await self._handle_approve_callback(query, request_id)
-            elif action == "reject":
-                await self._handle_reject_callback(query, request_id)
-            elif action == "details":
-                await self._handle_details_callback(query, request_id)
-            elif action == "sg":  # Subscription group selection
-                await self._handle_subscription_group_callback(query, callback_data)
-            elif action == "confirm":  # Confirm approval with selected groups
-                await self._handle_confirm_approval_callback(query, request_id)
-            elif action == "cancel":  # Cancel approval process
-                await self._handle_cancel_callback(query, request_id)
-            else:
-                await query.edit_message_text("❌ Unknown action")
-                
-        except Exception as e:
-            logger.error(f"Error handling callback query: {e}")
-            try:
-                await query.edit_message_text(f"❌ Error: {str(e)}")
-            except:
-                pass
-    
-    async def _handle_approve_callback(self, query, request_id):
-        """Handle approve button press - show subscription groups selection"""
-        try:
-            # Get the request
-            request = await sync_to_async(AccessRequest.objects.get)(id=request_id)
-            
-            # Check if already processed
-            if request.approved:
-                already_processed_msg = get_localized_message(query.from_user, 'admin_request_already_processed')
-                await query.edit_message_text(already_processed_msg)
-                return
-            
-            # Get available subscription groups
-            from vpn.models_xray import SubscriptionGroup
-            groups = await sync_to_async(list)(
-                SubscriptionGroup.objects.filter(is_active=True).order_by('name')
-            )
-            
-            if not groups:
-                await query.edit_message_text("❌ No subscription groups available")
-                return
-            
-            # Create inline keyboard with subscription groups
-            from telegram import InlineKeyboardMarkup, InlineKeyboardButton
-            
-            user_info = request.display_name
-            choose_groups_msg = get_localized_message(
-                query.from_user, 
-                'admin_choose_subscription_groups',
-                user_info=user_info
-            )
-            
-            # Create buttons for each group (max 2 per row)
-            keyboard = []
-            for i in range(0, len(groups), 2):
-                row = []
-                for j in range(2):
-                    if i + j < len(groups):
-                        group = groups[i + j]
-                        button_text = f"⚪ {group.name}"
-                        callback_data = f"sg_toggle_{group.id}_{request_id}"
-                        row.append(InlineKeyboardButton(button_text, callback_data=callback_data))
-                keyboard.append(row)
-            
-            # Add confirm and cancel buttons
-            confirm_btn_text = get_localized_button(query.from_user, 'confirm_approval')
-            cancel_btn_text = get_localized_button(query.from_user, 'cancel')
-            
-            keyboard.append([
-                InlineKeyboardButton(confirm_btn_text, callback_data=f"confirm_{request_id}"),
-                InlineKeyboardButton(cancel_btn_text, callback_data=f"cancel_{request_id}")
-            ])
-            
-            reply_markup = InlineKeyboardMarkup(keyboard)
-            await query.edit_message_text(choose_groups_msg, reply_markup=reply_markup, parse_mode='Markdown')
-            
-        except Exception as e:
-            logger.error(f"Error handling approve callback: {e}")
-            error_msg = get_localized_message(query.from_user, 'admin_error_processing', error=str(e))
-            await query.edit_message_text(error_msg)
-    
-    async def _handle_subscription_group_callback(self, query, callback_data):
-        """Handle subscription group toggle button"""
-        try:
-            # Parse callback data: sg_toggle_{group_id}_{request_id}
-            parts = callback_data.split('_')
-            group_id = parts[2]
-            request_id = parts[3]
-            
-            # Get current message text and keyboard
-            current_text = query.message.text
-            current_keyboard = query.message.reply_markup.inline_keyboard
-            
-            # Toggle the group selection
-            updated_keyboard = []
-            for row in current_keyboard:
-                updated_row = []
-                for button in row:
-                    if button.callback_data and button.callback_data.startswith(f"sg_toggle_{group_id}_"):
-                        # Toggle this button
-                        if button.text.startswith("⚪"):
-                            # Select it
-                            new_text = button.text.replace("⚪", "✅")
-                        else:
-                            # Deselect it
-                            new_text = button.text.replace("✅", "⚪")
-                        from telegram import InlineKeyboardButton
-                        updated_row.append(InlineKeyboardButton(new_text, callback_data=button.callback_data))
-                    else:
-                        updated_row.append(button)
-                updated_keyboard.append(updated_row)
-            
-            from telegram import InlineKeyboardMarkup
-            updated_markup = InlineKeyboardMarkup(updated_keyboard)
-            await query.edit_message_reply_markup(reply_markup=updated_markup)
-            
-        except Exception as e:
-            logger.error(f"Error handling subscription group callback: {e}")
-    
-    async def _handle_confirm_approval_callback(self, query, request_id):
-        """Handle confirm approval button - create user and assign groups"""
-        try:
-            # Get the request
-            request = await sync_to_async(AccessRequest.objects.get)(id=request_id)
-            
-            # Check if already processed
-            if request.approved:
-                already_processed_msg = get_localized_message(query.from_user, 'admin_request_already_processed')
-                await query.edit_message_text(already_processed_msg)
-                return
-            
-            # Get selected groups from the keyboard
-            selected_groups = []
-            from vpn.models_xray import SubscriptionGroup
-            
-            logger.info(f"Processing approval for request {request_id}")
-            
-            for row in query.message.reply_markup.inline_keyboard:
-                for button in row:
-                    if button.callback_data and button.callback_data.startswith("sg_toggle_"):
-                        if button.text.startswith("✅"):
-                            # Extract group_id from callback_data
-                            group_id = button.callback_data.split('_')[2]
-                            logger.info(f"Found selected group with ID {group_id}")
-                            try:
-                                group = await sync_to_async(SubscriptionGroup.objects.get)(id=group_id)
-                                selected_groups.append(group)
-                                logger.info(f"Added group '{group.name}' to selected groups")
-                            except Exception as e:
-                                logger.error(f"Failed to get subscription group {group_id}: {e}")
-            
-            logger.info(f"Total selected groups: {len(selected_groups)}")
-            
-            if not selected_groups:
-                await query.edit_message_text("❌ Please select at least one subscription group")
-                return
-            
-            # Save selected groups to the request
-            await sync_to_async(request.selected_subscription_groups.set)(selected_groups)
-            
-            try:
-                # Create or get user
-                from vpn.models import User
-                from vpn.models_xray import UserSubscription
-                import secrets
-                import string
-                
-                # Check if user already exists
-                existing_user = await sync_to_async(
-                    User.objects.filter(telegram_user_id=request.telegram_user_id).first
-                )()
-                
-                if existing_user:
-                    user = existing_user
-                    logger.info(f"Using existing user {user.username} for telegram_user_id {request.telegram_user_id}")
-                else:
-                    # Check if selected_existing_user is set
-                    if request.selected_existing_user:
-                        # Link telegram to existing user
-                        user = request.selected_existing_user
-                        user.telegram_user_id = request.telegram_user_id
-                        user.telegram_username = request.telegram_username
-                        await sync_to_async(user.save)()
-                        logger.info(f"Linked telegram account to existing user {user.username}")
-                    else:
-                        # Create new user
-                        username = request.desired_username or request.telegram_username or f"tg_{request.telegram_user_id}"
-                        
-                        # Ensure unique username
-                        base_username = username
-                        counter = 1
-                        while await sync_to_async(User.objects.filter(username=username).exists)():
-                            username = f"{base_username}_{counter}"
-                            counter += 1
-                        
-                        # Generate random password
-                        alphabet = string.ascii_letters + string.digits
-                        password = ''.join(secrets.choice(alphabet) for _ in range(16))
-                        
-                        # Create user
-                        user = await sync_to_async(User.objects.create_user)(
-                            username=username,
-                            password=password,
-                            telegram_user_id=request.telegram_user_id,
-                            telegram_username=request.telegram_username,
-                            first_name=request.telegram_first_name or '',
-                            last_name=request.telegram_last_name or '',
-                            comment=f"Created from Telegram request #{request.id}"
-                        )
-                        logger.info(f"Created new user {user.username} from Telegram request")
-                
-                # Link user to request
-                request.user = user
-                await sync_to_async(request.save)()
-                logger.info(f"Linked user {user.username} (ID: {user.id}) to request {request.id}")
-                
-                # Assign subscription groups to user
-                logger.info(f"Assigning {len(selected_groups)} subscription groups to user {user.username}")
-                for subscription_group in selected_groups:
-                    try:
-                        # Use a more explicit approach for async operations
-                        existing_sub = await sync_to_async(
-                            UserSubscription.objects.filter(
-                                user=user,
-                                subscription_group=subscription_group
-                            ).first
-                        )()
-                        
-                        if existing_sub:
-                            # Update existing subscription
-                            if not existing_sub.active:
-                                existing_sub.active = True
-                                await sync_to_async(existing_sub.save)()
-                                logger.info(f"Re-activated subscription group '{subscription_group.name}' for user {user.username}")
-                            else:
-                                logger.info(f"Subscription group '{subscription_group.name}' already active for user {user.username}")
-                        else:
-                            # Create new subscription
-                            new_sub = await sync_to_async(UserSubscription.objects.create)(
-                                user=user,
-                                subscription_group=subscription_group,
-                                active=True
-                            )
-                            logger.info(f"Created new subscription for group '{subscription_group.name}' for user {user.username}")
-                            
-                    except Exception as e:
-                        logger.error(f"Error assigning subscription group '{subscription_group.name}' to user {user.username}: {e}")
-                
-                # Mark as approved
-                request.approved = True
-                await sync_to_async(request.save)()
-                
-                # Send success message to admin
-                groups_list = ", ".join([group.name for group in selected_groups])
-                success_msg = get_localized_message(
-                    query.from_user,
-                    'admin_approval_success',
-                    user_info=request.display_name,
-                    groups=groups_list
-                )
-                await query.edit_message_text(success_msg, parse_mode='Markdown')
-                
-                # Send approval notification to user
-                # Create a dummy user object for localization
-                class DummyUser:
-                    def __init__(self, lang):
-                        self.language_code = lang
-                
-                user_lang = DummyUser(request.user_language if hasattr(request, 'user_language') else 'en')
-                approval_msg = get_localized_message(user_lang, 'approval_notification')
-                await self._send_notification_to_admin(request.telegram_user_id, approval_msg)
-                
-                logger.info(f"Admin {query.from_user.username} approved request {request_id} with {len(selected_groups)} groups")
-                
-            except Exception as e:
-                logger.error(f"Error in approval process: {e}")
-                error_msg = get_localized_message(query.from_user, 'admin_error_processing', error=str(e))
-                await query.edit_message_text(error_msg)
-                
-        except Exception as e:
-            logger.error(f"Error handling confirm approval callback: {e}")
-            error_msg = get_localized_message(query.from_user, 'admin_error_processing', error=str(e))
-            await query.edit_message_text(error_msg)
-    
-    async def _handle_reject_callback(self, query, request_id):
-        """Handle reject button press"""
-        try:
-            # Get the request
-            request = await sync_to_async(AccessRequest.objects.get)(id=request_id)
-            
-            # Check if already processed
-            if request.approved:
-                already_processed_msg = get_localized_message(query.from_user, 'admin_request_already_processed')
-                await query.edit_message_text(already_processed_msg)
-                return
-            
-            # Mark as rejected (we can add a rejected field or just delete)
-            await sync_to_async(request.delete)()
-            
-            # Send success message to admin
-            success_msg = get_localized_message(
-                query.from_user,
-                'admin_rejection_success',
-                user_info=request.display_name
-            )
-            await query.edit_message_text(success_msg, parse_mode='Markdown')
-            
-            logger.info(f"Admin {query.from_user.username} rejected request {request_id}")
-            
-        except Exception as e:
-            logger.error(f"Error handling reject callback: {e}")
-            error_msg = get_localized_message(query.from_user, 'admin_error_processing', error=str(e))
-            await query.edit_message_text(error_msg)
-    
-    async def _handle_details_callback(self, query, request_id):
-        """Handle details button press - show full request info"""
-        try:
-            # Get the request
-            request = await sync_to_async(AccessRequest.objects.get)(id=request_id)
-            
-            # Format detailed information
-            details = f"**📋 Request Details**\n\n"
-            details += f"**👤 User:** {request.display_name}\n"
-            details += f"**📱 Telegram:** `@{request.telegram_username}`" if request.telegram_username else f"**📱 Telegram ID:** {request.telegram_user_id}\n"
-            details += f"**📅 Date:** {request.created_at.strftime('%Y-%m-%d %H:%M:%S')}\n"
-            details += f"**🆔 Request ID:** {request.id}\n"
-            details += f"**👤 Desired Username:** {request.desired_username}\n\n"
-            details += f"**💬 Full Message:**\n{request.message_text}"
-            
-            # Create back button
-            from telegram import InlineKeyboardMarkup, InlineKeyboardButton
-            back_keyboard = [[
-                InlineKeyboardButton("⬅️ Back", callback_data=f"approve_{request_id}"),
-                InlineKeyboardButton("❌ Reject", callback_data=f"reject_{request_id}")
-            ]]
-            reply_markup = InlineKeyboardMarkup(back_keyboard)
-            
-            await query.edit_message_text(details, reply_markup=reply_markup, parse_mode='Markdown')
-            
-        except Exception as e:
-            logger.error(f"Error handling details callback: {e}")
-            error_msg = get_localized_message(query.from_user, 'admin_error_processing', error=str(e))
-            await query.edit_message_text(error_msg)
-    
-    async def _handle_cancel_callback(self, query, request_id):
-        """Handle cancel button press - return to original request view"""
-        try:
-            # Get the request
-            request = await sync_to_async(AccessRequest.objects.get)(id=request_id)
-            
-            # Recreate original request display
-            user_info = request.display_name
-            date = request.created_at.strftime("%Y-%m-%d %H:%M")
-            message_preview = request.message_text[:100] + "..." if len(request.message_text) > 100 else request.message_text
-            
-            request_text = get_localized_message(
-                query.from_user, 
-                'admin_request_item',
-                user_info=user_info,
-                date=date,
-                message_preview=message_preview
-            )
-            
-            # Create original inline keyboard
-            from telegram import InlineKeyboardMarkup, InlineKeyboardButton
-            approve_btn_text = get_localized_button(query.from_user, 'approve')
-            reject_btn_text = get_localized_button(query.from_user, 'reject')
-            details_btn_text = get_localized_button(query.from_user, 'details')
-            
-            inline_keyboard = [
-                [
-                    InlineKeyboardButton(approve_btn_text, callback_data=f"approve_{request.id}"),
-                    InlineKeyboardButton(reject_btn_text, callback_data=f"reject_{request.id}")
-                ],
-                [InlineKeyboardButton(details_btn_text, callback_data=f"details_{request.id}")]
-            ]
-            inline_markup = InlineKeyboardMarkup(inline_keyboard)
-            
-            await query.edit_message_text(request_text, reply_markup=inline_markup, parse_mode='Markdown')
-            
-        except Exception as e:
-            logger.error(f"Error handling cancel callback: {e}")
-            error_msg = get_localized_message(query.from_user, 'admin_error_processing', error=str(e))
-            await query.edit_message_text(error_msg)
-
-    def stop(self):
-        """Stop the bot"""
-        if not self._running:
-            logger.warning("Bot is not running")
-            return
-        
-        logger.info("Stopping bot...")
-        self._stop_event.set()
-        
-        if self._application:
-            # Stop the application
-            try:
-                self._application.stop_running()
-            except Exception as e:
-                logger.error(f"Error stopping application: {e}")
-        
-        # Wait for thread to finish
-        if self._bot_thread and self._bot_thread.is_alive():
-            self._bot_thread.join(timeout=10)
-        
-        self._running = False
-        
-        # Release file lock
-        self._release_lock()
-        
-        logger.info("Bot stopped")
-    
-    def restart(self):
-        """Restart the bot"""
-        logger.info("Restarting bot...")
-        self.stop()
-        time.sleep(2)  # Wait a bit before restarting
-        self.start()
-    
-    def _run_bot(self):
-        """Run the bot (in background thread with asyncio loop)"""
-        try:
-            # Create new event loop for this thread
-            loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(loop)
-            
-            # Run the async bot
-            loop.run_until_complete(self._async_run_bot())
-            
-        except Exception as e:
-            logger.error(f"Bot error: {e}")
-            self._running = False
-            # Release lock on error
-            self._release_lock()
-        finally:
-            try:
-                loop.close()
-            except:
-                pass
-    
-    async def _async_run_bot(self):
-        """Async bot runner"""
-        try:
-            self._running = True
-            settings = await sync_to_async(BotSettings.get_settings)()
-            
-            # Create application with custom request settings
-            from telegram.request import HTTPXRequest
-            
-            # Prepare request settings
-            request_kwargs = {
-                'connection_pool_size': 8,
-                'read_timeout': settings.connection_timeout,
-                'write_timeout': settings.connection_timeout,
-                'connect_timeout': settings.connection_timeout,
-                'pool_timeout': settings.connection_timeout
-            }
-            
-            # Add proxy if configured
-            if settings.use_proxy and settings.proxy_url:
-                logger.info(f"Using proxy: {settings.proxy_url}")
-                request_kwargs['proxy'] = settings.proxy_url
-            
-            request = HTTPXRequest(**request_kwargs)
-            
-            # Create application builder
-            app_builder = Application.builder().token(settings.bot_token).request(request)
-            
-            # Use custom API base URL if provided
-            if settings.api_base_url and settings.api_base_url != "https://api.telegram.org":
-                logger.info(f"Using custom API base URL: {settings.api_base_url}")
-                app_builder = app_builder.base_url(settings.api_base_url)
-            
-            self._application = app_builder.build()
-            
-            # Add handlers
-            self._application.add_handler(CommandHandler("start", self._handle_start))
-            self._application.add_handler(CallbackQueryHandler(self._handle_callback_query))
-            self._application.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, self._handle_message))
-            self._application.add_handler(MessageHandler(filters.ALL & ~filters.COMMAND, self._handle_other))
-            
-            # Initialize application
-            await self._application.initialize()
-            await self._application.start()
-            await self._application.updater.start_polling(
-                allowed_updates=Update.ALL_TYPES,
-                drop_pending_updates=True
-            )
-            
-            logger.info("Bot polling started successfully")
-            
-            # Test connection
-            try:
-                logger.info("Testing bot connection...")
-                bot = self._application.bot
-                me = await bot.get_me()
-                logger.info(f"Bot connected successfully. Bot info: @{me.username} ({me.first_name})")
-            except Exception as test_e:
-                logger.error(f"Bot connection test failed: {test_e}")
-                logger.error(f"Connection settings - API URL: {settings.api_base_url}, Timeout: {settings.connection_timeout}s")
-                if settings.use_proxy:
-                    logger.error(f"Proxy settings - URL: {settings.proxy_url}")
-                raise
-            
-            # Keep running until stop event is set
-            while not self._stop_event.is_set():
-                await asyncio.sleep(1)
-            
-            logger.info("Stop event received, shutting down...")
-            
-        except Exception as e:
-            logger.error(f"Async bot error: {e}")
-            raise
-        finally:
-            # Clean shutdown
-            if self._application:
-                try:
-                    await self._application.updater.stop()
-                    await self._application.stop()
-                    await self._application.shutdown()
-                except Exception as e:
-                    logger.error(f"Error during shutdown: {e}")
-            self._running = False
-            # Release lock on shutdown
-            self._release_lock()
-    
-    async def _handle_start(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
-        """Handle /start command"""
-        try:
-            # Save incoming message
-            saved_message = await self._save_message(update.message, 'incoming')
-            
-            # Check if user exists by telegram_user_id
-            user_response = await self._check_user_access(update.message.from_user)
-            
-            if user_response['action'] == 'existing_user':
-                # User already exists - show keyboard with options
-                reply_markup = await self._create_main_keyboard(update.message.from_user)
-                
-                help_text = get_localized_message(update.message.from_user, 'help_text')
-                sent_message = await update.message.reply_text(
-                    help_text,
-                    reply_markup=reply_markup
-                )
-                logger.info(f"Handled /start from existing user {user_response['user'].username}")
-            
-            elif user_response['action'] == 'show_new_user_keyboard':
-                # Show keyboard with request access button for new users
-                await self._show_new_user_keyboard(update)
-                
-            elif user_response['action'] == 'pending_request':
-                # Show pending request message
-                await self._show_pending_request_message(update)
-            else:
-                # Fallback case - show new user keyboard
-                await self._show_new_user_keyboard(update)
-            
-            # Save outgoing message (if sent_message was created)
-            if 'sent_message' in locals():
-                await self._save_outgoing_message(
-                    sent_message,
-                    update.message.from_user
-                )
-            
-        except Exception as e:
-            logger.error(f"Error handling /start: {e}")
-    
-    async def _handle_message(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
-        """Handle text messages"""
-        try:
-            # Save incoming message
-            saved_message = await self._save_message(update.message, 'incoming')
-            
-            # Check if user exists by telegram_user_id
-            user_response = await self._check_user_access(update.message.from_user)
-            
-            if user_response['action'] == 'existing_user':
-                # Get localized button texts for comparison
-                access_btn = get_localized_button(update.message.from_user, 'access')
-                guide_btn = get_localized_button(update.message.from_user, 'guide')
-                access_requests_btn = get_localized_button(update.message.from_user, 'access_requests')
-                all_in_one_btn = get_localized_button(update.message.from_user, 'all_in_one')
-                back_btn = get_localized_button(update.message.from_user, 'back')
-                group_prefix = get_localized_button(update.message.from_user, 'group_prefix')
-                
-                # Check if this is a keyboard command
-                if update.message.text == access_btn:
-                    await self._handle_access_command(update, user_response['user'])
-                elif update.message.text == guide_btn:
-                    await self._handle_guide_command(update)
-                elif update.message.text == access_requests_btn:
-                    # Admin command - check permissions and handle
-                    if await self._is_telegram_admin(update.message.from_user):
-                        await self._handle_access_requests_command(update)
-                    else:
-                        await self._send_help_message(update)
-                elif update.message.text.startswith(group_prefix):
-                    # Handle specific group selection
-                    group_name = update.message.text.replace(group_prefix, "")
-                    await self._handle_group_selection(update, user_response['user'], group_name)
-                elif update.message.text == all_in_one_btn:
-                    # Handle All-in-one selection
-                    await self._handle_all_in_one(update, user_response['user'])
-                elif update.message.text == back_btn:
-                    # Handle back button
-                    await self._handle_back_to_main(update, user_response['user'])
-                elif update.message.text == get_localized_button(update.message.from_user, 'android'):
-                    # Handle Android guide
-                    await self._handle_android_guide(update)
-                elif update.message.text == get_localized_button(update.message.from_user, 'ios'):
-                    # Handle iOS guide
-                    await self._handle_ios_guide(update)
-                elif update.message.text == get_localized_button(update.message.from_user, 'web_portal'):
-                    # Handle web portal
-                    await self._handle_web_portal(update, user_response['user'])
-                else:
-                    # Unrecognized command - send help message
-                    await self._send_help_message(update)
-                return
-            
-            elif user_response['action'] == 'show_new_user_keyboard':
-                # Check if user clicked "Request Access" button
-                request_access_btn = get_localized_button(update.message.from_user, 'request_access')
-                
-                if update.message.text == request_access_btn:
-                    # User clicked request access - create request
-                    await self._create_access_request(update.message.from_user, update.message, saved_message)
-                    request_created_msg = get_localized_message(update.message.from_user, 'access_request_created')
-                    sent_message = await update.message.reply_text(request_created_msg)
-                    
-                    # Save outgoing message
-                    await self._save_outgoing_message(sent_message, update.message.from_user)
-                    logger.info(f"Created access request for user {update.message.from_user.username or update.message.from_user.id}")
-                else:
-                    # User sent other text - show keyboard again
-                    await self._show_new_user_keyboard(update)
-                return
-            
-            elif user_response['action'] == 'pending_request':
-                # Show pending request message
-                await self._show_pending_request_message(update)
-                return
-            
-            elif user_response['action'] == 'create_request':
-                # Create new access request with this message
-                await self._create_access_request(update.message.from_user, update.message, saved_message)
-                request_created_msg = get_localized_message(update.message.from_user, 'access_request_created')
-                sent_message = await update.message.reply_text(
-                    request_created_msg
-                )
-                logger.info(f"Created access request for new user {update.message.from_user.username or update.message.from_user.id}")
-                
-                # Save outgoing message
-                await self._save_outgoing_message(
-                    sent_message,
-                    update.message.from_user
-                )
-            
-        except Exception as e:
-            logger.error(f"Error handling message: {e}")
-    
-    async def _handle_other(self, update: Update, context: ContextTypes.DEFAULT_TYPE):
-        """Handle non-text messages (photos, documents, etc.)"""
-        try:
-            # Save incoming message
-            await self._save_message(update.message, 'incoming')
-            
-            # Auto-reply with localized message
-            message_type = "content"
-            if update.message.photo:
-                message_type = "photo"
-            elif update.message.document:
-                message_type = "document"
-            elif update.message.voice:
-                message_type = "voice"
-            elif update.message.video:
-                message_type = "video"
-            
-            # Get localized content type name
-            language = get_user_language(update.message.from_user)
-            localized_type = MessageLocalizer.get_content_type_name(message_type, language)
-            
-            reply_text = get_localized_message(
-                update.message.from_user, 
-                'received_content', 
-                message_type=localized_type
-            )
-            sent_message = await update.message.reply_text(reply_text)
-            
-            # Save outgoing message
-            await self._save_outgoing_message(
-                sent_message,
-                update.message.from_user
-            )
-            
-            logger.info(f"Handled {message_type} from {update.message.from_user.username or update.message.from_user.id}")
-            
-        except Exception as e:
-            logger.error(f"Error handling non-text message: {e}")
-    
-    async def _save_message(self, message, direction='incoming'):
-        """Save message to database"""
-        try:
-            # Prepare message text
-            message_text = message.text or message.caption or ""
-            
-            # Handle different message types
-            if message.photo:
-                message_text = f"[Photo] {message_text}"
-            elif message.document:
-                message_text = f"[Document: {message.document.file_name}] {message_text}"
-            elif message.voice:
-                message_text = f"[Voice message] {message_text}"
-            elif message.video:
-                message_text = f"[Video] {message_text}"
-            elif message.sticker:
-                message_text = f"[Sticker: {message.sticker.emoji or 'no emoji'}]"
-            
-            # Convert message to dict for raw_data
-            raw_data = message.to_dict() if hasattr(message, 'to_dict') else {}
-            
-            # Get user language and create database record
-            user_language = get_user_language(message.from_user)
-            telegram_message = await sync_to_async(TelegramMessage.objects.create)(
-                direction=direction,
-                telegram_user_id=message.from_user.id,
-                telegram_username=message.from_user.username or "",
-                telegram_first_name=message.from_user.first_name or "",
-                telegram_last_name=message.from_user.last_name or "",
-                chat_id=message.chat_id,
-                message_id=message.message_id,
-                message_text=message_text,
-                raw_data=raw_data,
-                user_language=user_language
-            )
-            
-            logger.debug(f"Saved {direction} message from {message.from_user.id}")
-            return telegram_message
-            
-        except Exception as e:
-            logger.error(f"Error saving message: {e}")
-            return None
-    
-    async def _save_outgoing_message(self, message, to_user):
-        """Save outgoing message to database"""
-        try:
-            raw_data = message.to_dict() if hasattr(message, 'to_dict') else {}
-            user_language = get_user_language(to_user)
-            
-            await sync_to_async(TelegramMessage.objects.create)(
-                direction='outgoing',
-                telegram_user_id=to_user.id,
-                telegram_username=to_user.username or "",
-                telegram_first_name=to_user.first_name or "",
-                telegram_last_name=to_user.last_name or "",
-                chat_id=message.chat_id,
-                message_id=message.message_id,
-                message_text=message.text,
-                raw_data=raw_data,
-                user_language=user_language
-            )
-            
-            logger.debug(f"Saved outgoing message to {to_user.id}")
-            
-        except Exception as e:
-            logger.error(f"Error saving outgoing message: {e}")
-    
-    async def _check_user_access(self, telegram_user):
-        """Check if user exists or has pending request, or can be linked by username"""
-        from vpn.models import User
-        
-        try:
-            # Check if user already exists by telegram_user_id
-            user = await sync_to_async(User.objects.filter(telegram_user_id=telegram_user.id).first)()
-            if user:
-                return {'action': 'existing_user', 'user': user}
-            
-            # Check if user can be linked by telegram username
-            if telegram_user.username:
-                # Look for existing user with matching telegram_username (case-insensitive)
-                existing_user_by_username = await sync_to_async(
-                    User.objects.filter(
-                        telegram_username__iexact=telegram_user.username,
-                        telegram_user_id__isnull=True  # Not yet linked to Telegram
-                    ).first
-                )()
-                
-                if existing_user_by_username:
-                    # Link this telegram account to existing user
-                    await self._link_telegram_to_user(existing_user_by_username, telegram_user)
-                    return {'action': 'existing_user', 'user': existing_user_by_username}
-            
-            # Check if this telegram_user_id was previously linked to a user but is now unlinked
-            # This handles the case where an admin "untied" the user from Telegram
-            unlinked_user = await sync_to_async(
-                User.objects.filter(
-                    telegram_username__iexact=telegram_user.username if telegram_user.username else '',
-                    telegram_user_id__isnull=True
-                ).first
-            )() if telegram_user.username else None
-            
-            # Check if user has pending access request
-            existing_request = await sync_to_async(
-                AccessRequest.objects.filter(telegram_user_id=telegram_user.id).first
-            )()
-            
-            if existing_request:
-                if existing_request.approved:
-                    # Check if there was an approved request but user was unlinked
-                    # In this case, allow creating a new request (treat as new user)
-                    if unlinked_user:
-                        # Delete old request since user was unlinked
-                        await sync_to_async(existing_request.delete)()
-                        logger.info(f"Deleted old approved request for unlinked user @{telegram_user.username}")
-                        return {'action': 'show_new_user_keyboard'}
-                    else:
-                        # Request approved but user not created yet (shouldn't happen but handle gracefully)
-                        return {'action': 'show_new_user_keyboard'}
-                else:
-                    # Check if user was unlinked after making the request
-                    if unlinked_user:
-                        # Delete old pending request and allow new one
-                        await sync_to_async(existing_request.delete)()
-                        logger.info(f"Deleted old pending request for unlinked user @{telegram_user.username}")
-                        return {'action': 'show_new_user_keyboard'}
-                    else:
-                        # Request pending
-                        return {'action': 'pending_request'}
-            
-            # No user and no request - new user
-            return {'action': 'show_new_user_keyboard'}
-            
-        except Exception as e:
-            logger.error(f"Error checking user access: {e}")
-            # Default to new user keyboard if check fails
-            return {'action': 'show_new_user_keyboard'}
-    
-    async def _handle_access_command(self, update: Update, user):
-        """Handle Access button - show subscription groups keyboard"""
-        try:
-            # Import Xray models
-            from vpn.models_xray import UserSubscription
-            from telegram import ReplyKeyboardMarkup, KeyboardButton
-            
-            # Get user's active subscription groups
-            subscriptions = await sync_to_async(
-                lambda: list(
-                    UserSubscription.objects.filter(
-                        user=user, 
-                        active=True,
-                        subscription_group__is_active=True
-                    ).select_related('subscription_group')
-                )
-            )()
-            
-            if subscriptions:
-                # Create keyboard with subscription groups using localized buttons
-                keyboard = []
-                
-                # Get localized button texts
-                all_in_one_btn = get_localized_button(update.message.from_user, 'all_in_one')
-                group_prefix = get_localized_button(update.message.from_user, 'group_prefix')
-                back_btn = get_localized_button(update.message.from_user, 'back')
-                
-                # Add All-in-one button first
-                keyboard.append([KeyboardButton(all_in_one_btn)])
-                
-                # Add individual group buttons in 2 columns
-                group_buttons = []
-                for sub in subscriptions:
-                    group_name = sub.subscription_group.name
-                    group_buttons.append(KeyboardButton(f"{group_prefix}{group_name}"))
-                
-                # Arrange buttons in 2 columns
-                for i in range(0, len(group_buttons), 2):
-                    if i + 1 < len(group_buttons):
-                        # Two buttons in a row
-                        keyboard.append([group_buttons[i], group_buttons[i + 1]])
-                    else:
-                        # One button in the last row
-                        keyboard.append([group_buttons[i]])
-                
-                # Add back button
-                keyboard.append([KeyboardButton(back_btn)])
-                
-                reply_markup = ReplyKeyboardMarkup(
-                    keyboard, 
-                    resize_keyboard=True,
-                    one_time_keyboard=False
-                )
-                
-                # Send message with keyboard using localized text
-                choose_text = get_localized_message(update.message.from_user, 'choose_subscription')
-                all_in_one_desc = get_localized_message(update.message.from_user, 'all_in_one_desc')
-                group_desc = get_localized_message(update.message.from_user, 'group_desc')
-                select_option = get_localized_message(update.message.from_user, 'select_option')
-                
-                message_text = f"{choose_text}\n\n"
-                message_text += f"{all_in_one_desc}\n"
-                message_text += f"{group_desc}\n\n"
-                message_text += select_option
-                
-                sent_message = await update.message.reply_text(
-                    message_text,
-                    reply_markup=reply_markup,
-                    parse_mode='Markdown'
-                )
-            else:
-                # No active subscriptions - show main keyboard
-                reply_markup = await self._create_main_keyboard(update.message.from_user)
-                
-                no_subs_msg = get_localized_message(update.message.from_user, 'no_subscriptions')
-                sent_message = await update.message.reply_text(
-                    no_subs_msg,
-                    reply_markup=reply_markup
-                )
-            
-            # Save outgoing message
-            await self._save_outgoing_message(
-                sent_message,
-                update.message.from_user
-            )
-            
-            logger.info(f"Showed subscription groups keyboard to user {user.username}")
-            
-        except Exception as e:
-            logger.error(f"Error handling Access command: {e}")
-            error_msg = get_localized_message(update.message.from_user, 'error_loading_subscriptions')
-            await update.message.reply_text(error_msg)
-    
-    async def _create_access_request(self, telegram_user, message, saved_message=None):
-        """Create new access request"""
-        try:
-            # Check if request already exists (safety check)
-            existing = await sync_to_async(
-                AccessRequest.objects.filter(telegram_user_id=telegram_user.id).first
-            )()
-            
-            if existing and not existing.approved:
-                logger.warning(f"Access request already exists for user {telegram_user.id}")
-                return existing
-            
-            # Create new request with default username from Telegram and user language
-            default_username = telegram_user.username or ""
-            user_language = get_user_language(telegram_user)
-            request = await sync_to_async(AccessRequest.objects.create)(
-                telegram_user_id=telegram_user.id,
-                telegram_username=telegram_user.username or "",
-                telegram_first_name=telegram_user.first_name or "",
-                telegram_last_name=telegram_user.last_name or "",
-                message_text=message.text or message.caption or "[Non-text message]",
-                chat_id=message.chat_id,
-                first_message=saved_message,
-                desired_username=default_username,
-                user_language=user_language
-            )
-            
-            logger.info(f"Created access request for user {telegram_user.username or telegram_user.id}")
-            
-            # Notify admins about new request
-            await self._notify_admins_new_request(request)
-            
-            return request
-            
-        except Exception as e:
-            logger.error(f"Error creating access request: {e}")
-            return None
-    
-    async def _send_help_message(self, update: Update):
-        """Send help message for unrecognized commands"""
-        try:
-            # Create main keyboard for existing users with localized buttons
-            reply_markup = await self._create_main_keyboard(update.message.from_user)
-            
-            help_text = get_localized_message(update.message.from_user, 'help_text')
-            sent_message = await update.message.reply_text(
-                help_text,
-                reply_markup=reply_markup
-            )
-            
-            # Save outgoing message
-            await self._save_outgoing_message(
-                sent_message,
-                update.message.from_user
-            )
-            
-        except Exception as e:
-            logger.error(f"Error sending help message: {e}")
-    
-    async def _handle_group_selection(self, update: Update, user, group_name):
-        """Handle specific group selection"""
-        try:
-            from django.conf import settings
-            
-            # Get the base URL for subscription links from settings
-            base_url = getattr(settings, 'EXTERNAL_ADDRESS', 'https://your-server.com')
-            
-            # Parse base_url to ensure it has https:// scheme
-            if not base_url.startswith(('http://', 'https://')):
-                base_url = f"https://{base_url}"
-            
-            # Generate group-specific subscription link
-            subscription_link = f"{base_url}/xray/{user.hash}?group={group_name}"
-            
-            # Also generate user portal link
-            portal_link = f"{base_url}/u/{user.hash}"
-            
-            # Get server information for this group
-            from vpn.models_xray import SubscriptionGroup, ServerInbound
-            group_servers_info = ""
-            try:
-                # Find the subscription group by name
-                subscription_group = await sync_to_async(
-                    SubscriptionGroup.objects.filter(
-                        name=group_name,
-                        is_active=True
-                    ).prefetch_related('inbounds').first
-                )()
-                
-                if subscription_group:
-                    # Get servers where this group's inbounds are deployed
-                    deployed_servers = await sync_to_async(
-                        lambda: list(
-                            ServerInbound.objects.filter(
-                                inbound__in=subscription_group.inbounds.all(),
-                                active=True
-                            ).select_related('server', 'inbound').values_list(
-                                'server__name', 'inbound__protocol'
-                            ).distinct()
-                        )
-                    )()
-                    
-                    if deployed_servers:
-                        # Group by server
-                        servers_data = {}
-                        for server_name, protocol in deployed_servers:
-                            if server_name not in servers_data:
-                                servers_data[server_name] = []
-                            if protocol.upper() not in servers_data[server_name]:
-                                servers_data[server_name].append(protocol.upper())
-                        
-                        # Build server info text
-                        if servers_data:
-                            servers_header = get_localized_message(update.message.from_user, 'servers_in_group')
-                            group_servers_info = f"\n{servers_header}\n"
-                            for server_name, protocols in servers_data.items():
-                                protocols_str = ", ".join(protocols)
-                                group_servers_info += f"   • {server_name} ({protocols_str})\n"
-                            group_servers_info += "\n"
-                            
-            except Exception as e:
-                logger.warning(f"Could not get server info for group {group_name}: {e}")
-            
-            # Build localized message
-            group_title = get_localized_message(update.message.from_user, 'group_subscription', group_name=group_name)
-            sub_link_label = get_localized_message(update.message.from_user, 'subscription_link')
-            portal_label = get_localized_message(update.message.from_user, 'web_portal')
-            tap_note = get_localized_message(update.message.from_user, 'tap_to_copy')
-            
-            message_text = f"{group_title}\n"
-            message_text += group_servers_info  # Add server info
-            message_text += f"{sub_link_label}\n"
-            message_text += f"`{subscription_link}`\n\n"
-            message_text += tap_note
-            
-            # Create back navigation keyboard with only back button
-            from telegram import ReplyKeyboardMarkup, KeyboardButton
-            back_btn = get_localized_button(update.message.from_user, 'back')
-            keyboard = [
-                [KeyboardButton(back_btn)],
-            ]
-            reply_markup = ReplyKeyboardMarkup(
-                keyboard, 
-                resize_keyboard=True,
-                one_time_keyboard=False
-            )
-            
-            sent_message = await update.message.reply_text(
-                message_text,
-                reply_markup=reply_markup,
-                parse_mode='Markdown'
-            )
-            
-            # Save outgoing message
-            await self._save_outgoing_message(
-                sent_message,
-                update.message.from_user
-            )
-            
-            logger.info(f"Sent group {group_name} subscription to user {user.username}")
-            
-        except Exception as e:
-            logger.error(f"Error handling group selection: {e}")
-            error_msg = get_localized_message(update.message.from_user, 'error_loading_group')
-            await update.message.reply_text(error_msg)
-    
-    async def _handle_all_in_one(self, update: Update, user):
-        """Handle All-in-one selection"""
-        try:
-            # Import Xray models
-            from vpn.models_xray import UserSubscription, ServerInbound
-            from django.conf import settings
-            
-            # Get user's active subscription groups
-            subscriptions = await sync_to_async(
-                lambda: list(
-                    UserSubscription.objects.filter(
-                        user=user, 
-                        active=True,
-                        subscription_group__is_active=True
-                    ).select_related('subscription_group').prefetch_related('subscription_group__inbounds')
-                )
-            )()
-            
-            if subscriptions:
-                # Get the base URL for subscription links from settings
-                base_url = getattr(settings, 'EXTERNAL_ADDRESS', 'https://your-server.com')
-                
-                # Parse base_url to ensure it has https:// scheme
-                if not base_url.startswith(('http://', 'https://')):
-                    base_url = f"https://{base_url}"
-                
-                # Generate universal subscription link
-                subscription_link = f"{base_url}/xray/{user.hash}"
-                
-                # Also generate user portal link
-                portal_link = f"{base_url}/u/{user.hash}"
-                
-                # Build message with detailed server/subscription list using localized text
-                all_in_one_title = get_localized_message(update.message.from_user, 'all_in_one_subscription')
-                access_includes = get_localized_message(update.message.from_user, 'your_access_includes')
-                message_text = f"{all_in_one_title}\n\n"
-                message_text += f"{access_includes}\n\n"
-                
-                # Collect all servers and their subscriptions
-                servers_data = {}
-                
-                for sub in subscriptions:
-                    group = sub.subscription_group
-                    group_name = group.name
-                    
-                    # Get servers where this group's inbounds are deployed
-                    deployed_servers = await sync_to_async(
-                        lambda: list(
-                            ServerInbound.objects.filter(
-                                inbound__in=group.inbounds.all(),
-                                active=True
-                            ).select_related('server', 'inbound').values_list(
-                                'server__name', 'inbound__name', 'inbound__protocol'
-                            ).distinct()
-                        )
-                    )()
-                    
-                    # Group by server
-                    for server_name, inbound_name, protocol in deployed_servers:
-                        if server_name not in servers_data:
-                            servers_data[server_name] = []
-                        servers_data[server_name].append({
-                            'group_name': group_name,
-                            'inbound_name': inbound_name,
-                            'protocol': protocol.upper()
-                        })
-                
-                # Display servers and their subscriptions
-                for server_name, server_subscriptions in servers_data.items():
-                    message_text += f"🔒 **{server_name}**\n"
-                    
-                    for sub_data in server_subscriptions:
-                        message_text += f"   • {sub_data['group_name']} ({sub_data['protocol']})\n"
-                    
-                    message_text += "\n"
-                
-                # Add subscription link with localized labels
-                universal_link_label = get_localized_message(update.message.from_user, 'universal_subscription_link')
-                portal_label = get_localized_message(update.message.from_user, 'web_portal')
-                all_subs_note = get_localized_message(update.message.from_user, 'all_subscriptions_note')
-                
-                message_text += f"{universal_link_label}\n"
-                message_text += f"`{subscription_link}`\n\n"
-                message_text += all_subs_note
-                
-                # Create back navigation keyboard with only back button
-                from telegram import ReplyKeyboardMarkup, KeyboardButton
-                back_btn = get_localized_button(update.message.from_user, 'back')
-                keyboard = [
-                    [KeyboardButton(back_btn)],
-                ]
-                reply_markup = ReplyKeyboardMarkup(
-                    keyboard, 
-                    resize_keyboard=True,
-                    one_time_keyboard=False
-                )
-                
-                sent_message = await update.message.reply_text(
-                    message_text,
-                    reply_markup=reply_markup,
-                    parse_mode='Markdown'
-                )
-            else:
-                # No active subscriptions
-                no_subs_msg = get_localized_message(update.message.from_user, 'no_subscriptions')
-                sent_message = await update.message.reply_text(no_subs_msg)
-            
-            # Save outgoing message
-            await self._save_outgoing_message(
-                sent_message,
-                update.message.from_user
-            )
-            
-            logger.info(f"Sent all-in-one subscription to user {user.username}")
-            
-        except Exception as e:
-            logger.error(f"Error handling all-in-one selection: {e}")
-            error_msg = get_localized_message(update.message.from_user, 'error_loading_subscriptions')
-            await update.message.reply_text(error_msg)
-    
-    async def _handle_back_to_main(self, update: Update, user):
-        """Handle back button - return to main menu"""
-        try:
-            # Create main keyboard with localized buttons
-            reply_markup = await self._create_main_keyboard(update.message.from_user)
-            
-            help_text = get_localized_message(update.message.from_user, 'help_text')
-            sent_message = await update.message.reply_text(
-                help_text,
-                reply_markup=reply_markup
-            )
-            
-            # Save outgoing message
-            await self._save_outgoing_message(
-                sent_message,
-                update.message.from_user
-            )
-            
-            logger.info(f"Returned user {user.username} to main menu")
-            
-        except Exception as e:
-            logger.error(f"Error handling back button: {e}")
-            await self._send_help_message(update)
-    
-    async def _show_new_user_keyboard(self, update: Update):
-        """Show keyboard with request access button for new users"""
-        try:
-            from telegram import ReplyKeyboardMarkup, KeyboardButton
-            
-            # Get localized button and message
-            request_access_btn = get_localized_button(update.message.from_user, 'request_access')
-            welcome_msg = get_localized_message(update.message.from_user, 'new_user_welcome')
-            
-            # Create keyboard with request access button
-            keyboard = [
-                [KeyboardButton(request_access_btn)],
-            ]
-            reply_markup = ReplyKeyboardMarkup(
-                keyboard, 
-                resize_keyboard=True,
-                one_time_keyboard=False
-            )
-            
-            sent_message = await update.message.reply_text(
-                welcome_msg,
-                reply_markup=reply_markup
-            )
-            
-            # Save outgoing message
-            await self._save_outgoing_message(
-                sent_message,
-                update.message.from_user
-            )
-            
-            logger.info(f"Showed new user keyboard to {update.message.from_user.username or update.message.from_user.id}")
-            
-        except Exception as e:
-            logger.error(f"Error showing new user keyboard: {e}")
-    
-    async def _show_pending_request_message(self, update: Update, custom_message: str = None):
-        """Show pending request message to users with pending access requests"""
-        try:
-            # Use custom message or default pending message
-            if custom_message:
-                message_text = custom_message
-            else:
-                message_text = get_localized_message(update.message.from_user, 'pending_request_msg')
-            
-            sent_message = await update.message.reply_text(message_text)
-            
-            # Save outgoing message
-            await self._save_outgoing_message(
-                sent_message,
-                update.message.from_user
-            )
-            
-            logger.info(f"Showed pending request message to {update.message.from_user.username or update.message.from_user.id}")
-            
-        except Exception as e:
-            logger.error(f"Error showing pending request message: {e}")
-    
-    async def _link_telegram_to_user(self, user, telegram_user):
-        """Link Telegram account to existing VPN user"""
-        try:
-            user.telegram_user_id = telegram_user.id
-            user.telegram_username = telegram_user.username or ""
-            user.telegram_first_name = telegram_user.first_name or ""
-            user.telegram_last_name = telegram_user.last_name or ""
-            
-            await sync_to_async(user.save)()
-            
-            logger.info(f"Linked Telegram user @{telegram_user.username} (ID: {telegram_user.id}) to existing VPN user {user.username}")
-            
-        except Exception as e:
-            logger.error(f"Error linking Telegram to user: {e}")
-            raise
-    
-    def _sync_status_on_startup(self):
-        """No database status to sync - only lock file matters"""
-        pass
-    
-    def auto_start_if_enabled(self):
-        """Auto-start bot if enabled in settings"""
-        try:
-            bot_settings = BotSettings.get_settings()
-            if bot_settings.enabled and bot_settings.bot_token and not self._running:
-                logger.info("Auto-starting bot (enabled in settings)")
-                self.start()
-                return True
-            else:
-                if not bot_settings.enabled:
-                    logger.info("Bot auto-start skipped: disabled in settings")
-                elif not bot_settings.bot_token:
-                    logger.info("Bot auto-start skipped: no token configured")
-                elif self._running:
-                    logger.info("Bot auto-start skipped: already running")
-        except Exception as e:
-            # Don't log as error if it's just a lock conflict
-            if "could not acquire lock" in str(e).lower():
-                logger.info(f"Bot auto-start skipped: {e}")
-            else:
-                logger.error(f"Failed to auto-start bot: {e}")
-        return False
-    
-    async def _handle_guide_command(self, update: Update):
-        """Handle guide button - show platform selection"""
-        try:
-            from telegram import ReplyKeyboardMarkup, KeyboardButton
-            
-            # Get localized buttons
-            android_btn = get_localized_button(update.message.from_user, 'android')
-            ios_btn = get_localized_button(update.message.from_user, 'ios')
-            web_portal_btn = get_localized_button(update.message.from_user, 'web_portal')
-            back_btn = get_localized_button(update.message.from_user, 'back')
-            
-            # Create platform selection keyboard
-            keyboard = [
-                [KeyboardButton(android_btn), KeyboardButton(ios_btn)],
-                [KeyboardButton(web_portal_btn)],
-                [KeyboardButton(back_btn)]
-            ]
-            reply_markup = ReplyKeyboardMarkup(
-                keyboard, 
-                resize_keyboard=True,
-                one_time_keyboard=False
-            )
-            
-            # Get localized messages
-            guide_title = get_localized_message(update.message.from_user, 'guide_title')
-            choose_platform = get_localized_message(update.message.from_user, 'guide_choose_platform')
-            
-            message_text = f"{guide_title}\n\n{choose_platform}"
-            
-            sent_message = await update.message.reply_text(
-                message_text,
-                reply_markup=reply_markup,
-                parse_mode='Markdown'
-            )
-            
-            # Save outgoing message
-            await self._save_outgoing_message(
-                sent_message,
-                update.message.from_user
-            )
-            
-            logger.info(f"Showed guide platform selection to user")
-            
-        except Exception as e:
-            logger.error(f"Error handling guide command: {e}")
-    
-    async def _handle_android_guide(self, update: Update):
-        """Handle Android guide selection"""
-        try:
-            from telegram import ReplyKeyboardMarkup, KeyboardButton
-            
-            # Create back navigation keyboard
-            back_btn = get_localized_button(update.message.from_user, 'back')
-            keyboard = [
-                [KeyboardButton(back_btn)]
-            ]
-            reply_markup = ReplyKeyboardMarkup(
-                keyboard, 
-                resize_keyboard=True,
-                one_time_keyboard=False
-            )
-            
-            # Get Android guide text
-            android_guide = get_localized_message(update.message.from_user, 'android_guide')
-            
-            sent_message = await update.message.reply_text(
-                android_guide,
-                reply_markup=reply_markup,
-                parse_mode='Markdown',
-                disable_web_page_preview=True
-            )
-            
-            # Save outgoing message
-            await self._save_outgoing_message(
-                sent_message,
-                update.message.from_user
-            )
-            
-            logger.info(f"Sent Android guide to user")
-            
-        except Exception as e:
-            logger.error(f"Error handling Android guide: {e}")
-    
-    async def _handle_ios_guide(self, update: Update):
-        """Handle iOS guide selection"""
-        try:
-            from telegram import ReplyKeyboardMarkup, KeyboardButton
-            
-            # Create back navigation keyboard
-            back_btn = get_localized_button(update.message.from_user, 'back')
-            keyboard = [
-                [KeyboardButton(back_btn)]
-            ]
-            reply_markup = ReplyKeyboardMarkup(
-                keyboard, 
-                resize_keyboard=True,
-                one_time_keyboard=False
-            )
-            
-            # Get iOS guide text
-            ios_guide = get_localized_message(update.message.from_user, 'ios_guide')
-            
-            sent_message = await update.message.reply_text(
-                ios_guide,
-                reply_markup=reply_markup,
-                parse_mode='Markdown',
-                disable_web_page_preview=True
-            )
-            
-            # Save outgoing message
-            await self._save_outgoing_message(
-                sent_message,
-                update.message.from_user
-            )
-            
-            logger.info(f"Sent iOS guide to user")
-            
-        except Exception as e:
-            logger.error(f"Error handling iOS guide: {e}")
-    
-    async def _handle_web_portal(self, update: Update, user):
-        """Handle web portal button - send portal link"""
-        try:
-            from django.conf import settings
-            from telegram import ReplyKeyboardMarkup, KeyboardButton
-            
-            # Get the base URL for portal links from settings
-            base_url = getattr(settings, 'EXTERNAL_ADDRESS', 'https://your-server.com')
-            
-            # Parse base_url to ensure it has https:// scheme
-            if not base_url.startswith(('http://', 'https://')):
-                base_url = f"https://{base_url}"
-            
-            # Generate user portal link
-            portal_link = f"{base_url}/u/{user.hash}"
-            
-            # Create back navigation keyboard
-            back_btn = get_localized_button(update.message.from_user, 'back')
-            keyboard = [
-                [KeyboardButton(back_btn)]
-            ]
-            reply_markup = ReplyKeyboardMarkup(
-                keyboard, 
-                resize_keyboard=True,
-                one_time_keyboard=False
-            )
-            
-            # Get localized messages
-            portal_label = get_localized_message(update.message.from_user, 'web_portal')
-            portal_description = get_localized_message(update.message.from_user, 'web_portal_description')
-            
-            message_text = f"{portal_label}\n{portal_link}\n\n{portal_description}"
-            
-            sent_message = await update.message.reply_text(
-                message_text,
-                reply_markup=reply_markup,
-                parse_mode='Markdown',
-                disable_web_page_preview=True
-            )
-            
-            # Save outgoing message
-            await self._save_outgoing_message(
-                sent_message,
-                update.message.from_user
-            )
-            
-            logger.info(f"Sent web portal link to user {user.username}")
-            
-        except Exception as e:
-            logger.error(f"Error handling web portal: {e}")
-    
-    @property
-    def is_running(self):
-        """Check if bot is running"""
-        return self._running and self._bot_thread and self._bot_thread.is_alive()
diff --git a/telegram_bot/localization.py b/telegram_bot/localization.py
deleted file mode 100644
index 2744e07..0000000
--- a/telegram_bot/localization.py
+++ /dev/null
@@ -1,267 +0,0 @@
-"""
-Message localization for Telegram bot
-"""
-from typing import Optional, Dict, Any
-import logging
-
-logger = logging.getLogger(__name__)
-
-# Translation dictionaries
-MESSAGES = {
-    'en': {
-        'help_text': "📋 Welcome! Use buttons below to navigate.\n\n📊 Access - View your VPN subscriptions\n\nFor support contact administrator.",
-        'access_request_created': "Access request created, please wait.",
-        'new_user_welcome': "Welcome! To get access to VPN services, please request access using the button below.",
-        'pending_request_msg': "Your access request is pending approval. Please wait for administrator to review it.",
-        'choose_subscription': "**Choose subscription option:**",
-        'all_in_one_desc': "🌍 **All-in-one** - Get all subscriptions in one link",
-        'group_desc': "**Group** - Get specific group subscription",
-        'select_option': "Select an option below:",
-        'no_subscriptions': "❌ You don't have any active Xray subscriptions.\n\nPlease contact administrator for access.",
-        'group_subscription': "**Group: {group_name}**",
-        'subscription_link': "**🔗 Subscription Link:**",
-        'web_portal': "**🌐 Web Portal:**",
-        'tap_to_copy': "_Tap the subscription link to copy it. Use it in your Xray client._",
-        'all_in_one_subscription': "🌍 **All-in-one Subscription**",
-        'your_access_includes': "**Your Access Includes:**",
-        'universal_subscription_link': "**🔗 Universal Subscription Link:**",
-        'all_subscriptions_note': "_This link includes all your active subscriptions. Tap to copy._",
-        'error_loading_subscriptions': "❌ Error loading subscriptions. Please try again later.",
-        'error_loading_group': "❌ Error loading group subscription. Please try again later.",
-        'received_content': "Received your {message_type}. An administrator will review it.",
-        'approval_notification': "✅ Access approved!",
-        'content_types': {
-            'photo': 'photo',
-            'document': 'document', 
-            'voice': 'voice',
-            'video': 'video',
-            'content': 'content'
-        },
-        'guide_title': "📖 **VPN Setup Guide**",
-        'guide_choose_platform': "Select your device platform:",
-        'web_portal_description': "_Web portal shows your access list on one convenient page with some statistics._",
-        'servers_in_group': "🔒 **Servers in group:**",
-        
-        # Admin messages
-        'admin_new_request_notification': "🔔 **New Access Request**\n\n👤 **User:** {user_info}\n📱 **Telegram:** {telegram_info}\n📅 **Date:** {date}\n\n💬 **Message:** {message}",
-        'admin_access_requests_title': "📋 **Pending Access Requests**",
-        'admin_no_pending_requests': "✅ No pending access requests",
-        'admin_request_item': "👤 **{user_info}**\n📅 {date}\n💬 _{message_preview}_",
-        'admin_choose_subscription_groups': "📦 **Choose Subscription Groups for {user_info}:**\n\nSelect groups to assign to this user:",
-        'admin_approval_success': "✅ **Request Approved!**\n\n👤 User: {user_info}\n📦 Groups: {groups}\n\nUser has been notified and given access.",
-        'admin_rejection_success': "❌ **Request Rejected**\n\n👤 User: {user_info}\n\nUser has been notified.",
-        'admin_request_already_processed': "⚠️ This request has already been processed by another admin.",
-        'admin_error_processing': "❌ Error processing request: {error}",
-        
-        'android_guide': "🤖 **Android Setup Guide**\n\n**Step 1: Install the app**\nDownload V2RayTUN from Google Play:\nhttps://play.google.com/store/apps/details?id=com.v2raytun.android\n\n**Step 2: Add subscription**\n• Open the app\n• Tap the **+** button in the top right corner\n• Paste your subscription link from the bot\n• The app will automatically load all VPN servers\n\n**Step 3: Connect**\n• Choose a server from the list\n• Tap **Connect**\n• All your traffic will now go through VPN\n\n**💡 Useful settings:**\n• In settings, enable direct access for banking apps and local sites\n• You can choose specific apps to use VPN while others use direct connection\n\n**🔄 If VPN stops working:**\nTap the refresh icon next to the server list to update your subscription.",
-        'ios_guide': " **iOS Setup Guide**\n\n**Step 1: Install the app**\nDownload V2RayTUN from App Store:\nhttps://apps.apple.com/us/app/v2raytun/id6476628951\n\n**Step 2: Add subscription**\n• Open the app\n• Tap the **+** button in the top right corner\n• Paste your subscription link from the bot\n• The app will automatically load all VPN servers\n\n**Step 3: Connect**\n• Choose a server from the list\n• Tap **Connect**\n• All your traffic will now go through VPN\n\n**⚠️ Note for iOS users:**\nCurrently, only VLESS protocol works reliably on iOS. Other protocols may have connectivity issues.\n\n**💡 Useful settings:**\n• In settings, enable direct access for banking apps and local sites to improve performance\n\n**🔄 If VPN stops working:**\nTap the refresh icon next to the server list to update your subscription.",
-        'buttons': {
-            'access': "🌍 Get access",
-            'guide': "📖 Guide",
-            'android': "🤖 Android",
-            'ios': " iOS",
-            'web_portal': "🌐 Web Portal",
-            'all_in_one': "🌍 All-in-one",
-            'back': "⬅️ Back",
-            'group_prefix': "Group: ",
-            'request_access': "🔑 Request Access",
-            # Admin buttons
-            'access_requests': "📋 Access Requests",
-            'approve': "✅ Approve",
-            'reject': "❌ Reject",
-            'details': "👁 Details",
-            'confirm_approval': "✅ Confirm Approval",
-            'confirm_rejection': "❌ Confirm Rejection",
-            'cancel': "🚫 Cancel"
-        }
-    },
-    'ru': {
-        'help_text': "📋 Добро пожаловать! Используйте кнопки ниже для навигации.\n\n📊 Доступ - Просмотр VPN подписок\n\nДля поддержки обратитесь к администратору.",
-        'access_request_created': "Запрос на доступ создан, ожидайте.",
-        'new_user_welcome': "Добро пожаловать! Для получения доступа к VPN сервисам, пожалуйста запросите доступ с помощью кнопки ниже.",
-        'pending_request_msg': "Ваш запрос на доступ ожидает одобрения. Пожалуйста, дождитесь рассмотрения администратором.",
-        'choose_subscription': "**Выберите вариант подписки:**",
-        'all_in_one_desc': "🌍 **Все в одном** - Получить все подписки в одной ссылке",
-        'group_desc': "**Группа** - Получить подписку на группу",
-        'select_option': "Выберите вариант ниже:",
-        'no_subscriptions': "❌ У вас нет активных Xray подписок.\n\nОбратитесь к администратору для получения доступа.",
-        'group_subscription': "**Группа: {group_name}**",
-        'subscription_link': "**🔗 **",
-        'web_portal': "**🌐 Веб-портал пользователя:**",
-        'tap_to_copy': "_Нажмите на ссылку чтобы скопировать. Используйте в вашем Xray клиенте как подписку._",
-        'all_in_one_subscription': "🌍 **Подписка «Все в одном»**",
-        'your_access_includes': "**Ваш доступ включает:**",
-        'universal_subscription_link': "**🔗 Универсальная ссылка на подписку:**",
-        'all_subscriptions_note': "_Эта ссылка включает все ваши активные подписки. Нажмите чтобы скопировать._",
-        'error_loading_subscriptions': "❌ Ошибка загрузки подписок. Попробуйте позже.",
-        'error_loading_group': "❌ Ошибка загрузки подписки группы. Попробуйте позже.",
-        'received_content': "Получен ваш {message_type}. Администратор его рассмотрит.",
-        'approval_notification': "✅ Доступ одобрен!",
-        'content_types': {
-            'photo': 'фото',
-            'document': 'документ',
-            'voice': 'голосовое сообщение',
-            'video': 'видео',
-            'content': 'контент'
-        },
-        'guide_title': "📖 **Руководство по настройке VPN**",
-        'guide_choose_platform': "Выберите платформу вашего устройства:",
-        'web_portal_description': "_Веб-портал показывает список ваших доступов на одной удобной странице с некоторой статистикой._",
-        'servers_in_group': "🔒 **Серверы в группе:**",
-        
-        # Admin messages
-        'admin_new_request_notification': "🔔 **Новый запрос на доступ**\n\n👤 **Пользователь:** {user_info}\n📱 **Telegram:** {telegram_info}\n📅 **Дата:** {date}\n\n💬 **Сообщение:** {message}",
-        'admin_access_requests_title': "📋 **Ожидающие запросы на доступ**",
-        'admin_no_pending_requests': "✅ Нет ожидающих запросов на доступ",
-        'admin_request_item': "👤 **{user_info}**\n📅 {date}\n💬 _{message_preview}_",
-        'admin_choose_subscription_groups': "📦 **Выберите группы подписки для {user_info}:**\n\nВыберите группы для назначения этому пользователю:",
-        'admin_approval_success': "✅ **Запрос одобрен!**\n\n👤 Пользователь: {user_info}\n📦 Группы: {groups}\n\nПользователь уведомлен и получил доступ.",
-        'admin_rejection_success': "❌ **Запрос отклонен**\n\n👤 Пользователь: {user_info}\n\nПользователь уведомлен.",
-        'admin_request_already_processed': "⚠️ Этот запрос уже обработан другим администратором.",
-        'admin_error_processing': "❌ Ошибка обработки запроса: {error}",
-        
-        'android_guide': "🤖 **Руководство для Android**\n\n**Шаг 1: Установите приложение**\nСкачайте V2RayTUN из Google Play:\nhttps://play.google.com/store/apps/details?id=com.v2raytun.android\n\n**Шаг 2: Добавьте подписку**\n• Откройте приложение\n• Нажмите кнопку **+** в правом верхнем углу\n• Вставьте ссылку на подписку из бота\n• Приложение автоматически загрузит список VPN серверов\n\n**Шаг 3: Подключитесь**\n• Выберите сервер из списка\n• Нажмите **Подключиться**\n• Весь ваш трафик будет проходить через VPN\n\n**💡 Полезные настройки:**\n• В настройках включите прямой доступ для банковских приложений и местных сайтов\n• Вы можете выбрать конкретные приложения для использования VPN, в то время как остальные будут работать напрямую\n\n**🔄 Если VPN перестал работать:**\nНажмите иконку обновления рядом со списком серверов для обновления подписки.",
-        'ios_guide': " **Руководство для iOS**\n\n**Шаг 1: Установите приложение**\nСкачайте V2RayTUN из App Store:\nhttps://apps.apple.com/us/app/v2raytun/id6476628951\n\n**Шаг 2: Добавьте подписку**\n• Откройте приложение\n• Нажмите кнопку **+** в правом верхнем углу\n• Вставьте ссылку на подписку из бота\n• Приложение автоматически загрузит список VPN серверов\n\n**Шаг 3: Подключитесь**\n• Выберите сервер из списка\n• Нажмите **Подключиться**\n• Весь ваш трафик будет проходить через VPN\n\n**⚠️ Важно для пользователей iOS:**\nВ настоящее время на iOS стабильно работает только протокол VLESS. Другие протоколы могут иметь проблемы с подключением.\n\n**💡 Полезные настройки:**\n• В настройках включите прямой доступ для банковских приложений и местных сайтов для улучшения производительности\n\n**🔄 Если VPN перестал работать:**\nНажмите иконку обновления рядом со списком серверов для обновления подписки.",
-        'buttons': {
-            'access': "🌍 Получить VPN",
-            'guide': "📖 Гайд",
-            'android': "🤖 Android",
-            'ios': " iOS",
-            'web_portal': "🌐 Веб-портал",
-            'all_in_one': "🌍 Все в одном",
-            'back': "⬅️ Назад",
-            'group_prefix': "Группа: ",
-            'request_access': "🔑 Запросить доступ",
-            # Admin buttons
-            'access_requests': "📋 Запросы на доступ",
-            'approve': "✅ Одобрить",
-            'reject': "❌ Отклонить",
-            'details': "👁 Подробности",
-            'confirm_approval': "✅ Подтвердить одобрение",
-            'confirm_rejection': "❌ Подтвердить отклонение",
-            'cancel': "🚫 Отмена"
-        }
-    }
-}
-
-class MessageLocalizer:
-    """Class for bot message localization"""
-    
-    @staticmethod
-    def get_user_language(telegram_user) -> str:
-        """
-        Determines user language from Telegram language_code
-        
-        Args:
-            telegram_user: Telegram user object
-            
-        Returns:
-            str: Language code ('ru' or 'en')
-        """
-        if not telegram_user:
-            return 'en'
-        
-        language_code = getattr(telegram_user, 'language_code', None)
-        
-        if not language_code:
-            return 'en'
-        
-        # Support Russian and English
-        if language_code.startswith('ru'):
-            return 'ru'
-        else:
-            return 'en'
-    
-    @staticmethod
-    def get_message(key: str, language: str = 'en', **kwargs) -> str:
-        """
-        Gets localized message
-        
-        Args:
-            key: Message key
-            language: Language code
-            **kwargs: Formatting parameters
-            
-        Returns:
-            str: Localized message
-        """
-        try:
-            # Fallback to English if language not supported
-            if language not in MESSAGES:
-                language = 'en'
-                
-            message = MESSAGES[language].get(key, MESSAGES['en'].get(key, f"Missing translation: {key}"))
-            
-            # Format with parameters
-            if kwargs:
-                try:
-                    message = message.format(**kwargs)
-                except (KeyError, ValueError) as e:
-                    logger.warning(f"Error formatting message {key}: {e}")
-                    
-            return message
-            
-        except Exception as e:
-            logger.error(f"Error getting message {key} for language {language}: {e}")
-            return f"Error: {key}"
-    
-    @staticmethod
-    def get_button_text(button_key: str, language: str = 'en') -> str:
-        """
-        Gets button text
-        
-        Args:
-            button_key: Button key
-            language: Language code
-            
-        Returns:
-            str: Button text
-        """
-        try:
-            if language not in MESSAGES:
-                language = 'en'
-                
-            buttons = MESSAGES[language].get('buttons', {})
-            return buttons.get(button_key, MESSAGES['en']['buttons'].get(button_key, button_key))
-            
-        except Exception as e:
-            logger.error(f"Error getting button text {button_key} for language {language}: {e}")
-            return button_key
-    
-    @staticmethod
-    def get_content_type_name(content_type: str, language: str = 'en') -> str:
-        """
-        Gets localized content type name
-        
-        Args:
-            content_type: Content type
-            language: Language code
-            
-        Returns:
-            str: Localized name
-        """
-        try:
-            if language not in MESSAGES:
-                language = 'en'
-                
-            content_types = MESSAGES[language].get('content_types', {})
-            return content_types.get(content_type, content_type)
-            
-        except Exception as e:
-            logger.error(f"Error getting content type {content_type} for language {language}: {e}")
-            return content_type
-
-# Convenience functions for use in code
-def get_localized_message(telegram_user, message_key: str, **kwargs) -> str:
-    """Get localized message for user"""
-    language = MessageLocalizer.get_user_language(telegram_user)
-    return MessageLocalizer.get_message(message_key, language, **kwargs)
-
-def get_localized_button(telegram_user, button_key: str) -> str:
-    """Get localized button text for user"""
-    language = MessageLocalizer.get_user_language(telegram_user)
-    return MessageLocalizer.get_button_text(button_key, language)
-
-def get_user_language(telegram_user) -> str:
-    """Get user language"""
-    return MessageLocalizer.get_user_language(telegram_user)
\ No newline at end of file
diff --git a/telegram_bot/management/__init__.py b/telegram_bot/management/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/telegram_bot/management/commands/__init__.py b/telegram_bot/management/commands/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/telegram_bot/management/commands/run_telegram_bot.py b/telegram_bot/management/commands/run_telegram_bot.py
deleted file mode 100644
index 5356950..0000000
--- a/telegram_bot/management/commands/run_telegram_bot.py
+++ /dev/null
@@ -1,99 +0,0 @@
-import logging
-import signal
-import sys
-import time
-from django.core.management.base import BaseCommand
-from django.utils import timezone
-from telegram_bot.models import BotSettings, BotStatus
-from telegram_bot.bot import TelegramBotManager
-
-logger = logging.getLogger(__name__)
-
-
-class Command(BaseCommand):
-    help = 'Run the Telegram bot'
-    
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.bot_manager = None
-        self.running = False
-    
-    def add_arguments(self, parser):
-        parser.add_argument(
-            '--force',
-            action='store_true',
-            help='Force start even if bot is disabled in settings',
-        )
-    
-    def handle(self, *args, **options):
-        """Main command handler"""
-        # Set up signal handlers
-        signal.signal(signal.SIGINT, self.signal_handler)
-        signal.signal(signal.SIGTERM, self.signal_handler)
-        
-        # Check settings
-        settings = BotSettings.get_settings()
-        
-        if not settings.bot_token:
-            self.stdout.write(
-                self.style.ERROR('Bot token is not configured. Please configure it in the admin panel.')
-            )
-            return
-        
-        if not settings.enabled and not options['force']:
-            self.stdout.write(
-                self.style.WARNING('Bot is disabled in settings. Use --force to override.')
-            )
-            return
-        
-        # Initialize bot manager
-        self.bot_manager = TelegramBotManager()
-        
-        try:
-            # Start the bot
-            self.stdout.write(self.style.SUCCESS('Starting Telegram bot...'))
-            self.bot_manager.start()
-            self.running = True
-            
-            self.stdout.write(
-                self.style.SUCCESS(f'Bot is running. Press Ctrl+C to stop.')
-            )
-            
-            # Keep the main thread alive
-            while self.running:
-                time.sleep(1)
-                
-                # Check if bot is still running
-                if not self.bot_manager.is_running:
-                    self.stdout.write(
-                        self.style.ERROR('Bot stopped unexpectedly. Check logs for errors.')
-                    )
-                    break
-        
-        except KeyboardInterrupt:
-            self.stdout.write('\nReceived interrupt signal...')
-        
-        except Exception as e:
-            self.stdout.write(
-                self.style.ERROR(f'Error running bot: {e}')
-            )
-            logger.error(f'Error running bot: {e}', exc_info=True)
-            
-            # Update status
-            status = BotStatus.get_status()
-            status.is_running = False
-            status.last_error = str(e)
-            status.last_stopped = timezone.now()
-            status.save()
-        
-        finally:
-            # Stop the bot
-            if self.bot_manager:
-                self.stdout.write('Stopping bot...')
-                self.bot_manager.stop()
-                self.stdout.write(self.style.SUCCESS('Bot stopped.'))
-    
-    def signal_handler(self, signum, frame):
-        """Handle shutdown signals"""
-        self.stdout.write('\nShutting down gracefully...')
-        self.running = False
\ No newline at end of file
diff --git a/telegram_bot/management/commands/telegram_bot_status.py b/telegram_bot/management/commands/telegram_bot_status.py
deleted file mode 100644
index e91699e..0000000
--- a/telegram_bot/management/commands/telegram_bot_status.py
+++ /dev/null
@@ -1,112 +0,0 @@
-import logging
-import os
-from django.core.management.base import BaseCommand
-from django.utils import timezone
-from telegram_bot.models import BotSettings, BotStatus
-from telegram_bot.bot import TelegramBotManager
-
-logger = logging.getLogger(__name__)
-
-
-class Command(BaseCommand):
-    help = 'Check Telegram bot status and optionally start it'
-    
-    def add_arguments(self, parser):
-        parser.add_argument(
-            '--auto-start',
-            action='store_true',
-            help='Automatically start bot if enabled in settings',
-        )
-        parser.add_argument(
-            '--sync-status',
-            action='store_true',
-            help='Sync database status with real bot state',
-        )
-    
-    def handle(self, *args, **options):
-        """Check bot status"""
-        try:
-            manager = TelegramBotManager()
-            settings = BotSettings.get_settings()
-            status = BotStatus.get_status()
-            
-            # Show current configuration
-            self.stdout.write(f"Bot Configuration:")
-            self.stdout.write(f"  Enabled: {settings.enabled}")
-            self.stdout.write(f"  Token configured: {'Yes' if settings.bot_token else 'No'}")
-            
-            # Show status
-            real_running = manager.is_running
-            db_running = status.is_running
-            
-            self.stdout.write(f"\nBot Status:")
-            self.stdout.write(f"  Database status: {'Running' if db_running else 'Stopped'}")
-            self.stdout.write(f"  Real status: {'Running' if real_running else 'Stopped'}")
-            
-            # Check lock file status
-            from django.conf import settings as django_settings
-            lock_dir = os.path.join(getattr(django_settings, 'BASE_DIR', '/tmp'), 'telegram_bot_locks')
-            lock_path = os.path.join(lock_dir, 'telegram_bot.lock')
-            
-            if os.path.exists(lock_path):
-                try:
-                    with open(lock_path, 'r') as f:
-                        lock_pid = f.read().strip()
-                    self.stdout.write(f"  Lock file: exists (PID: {lock_pid})")
-                except:
-                    self.stdout.write(f"  Lock file: exists (unreadable)")
-            else:
-                self.stdout.write(f"  Lock file: not found")
-            
-            if db_running != real_running:
-                self.stdout.write(
-                    self.style.WARNING("⚠️ Status mismatch detected!")
-                )
-                
-                if options['sync_status']:
-                    status.is_running = real_running
-                    if not real_running:
-                        status.last_stopped = timezone.now()
-                    status.save()
-                    self.stdout.write(
-                        self.style.SUCCESS("✅ Status synchronized")
-                    )
-            
-            # Show timestamps
-            if status.last_started:
-                self.stdout.write(f"  Last started: {status.last_started}")
-            if status.last_stopped:
-                self.stdout.write(f"  Last stopped: {status.last_stopped}")
-            if status.last_error:
-                self.stdout.write(f"  Last error: {status.last_error}")
-            
-            # Auto-start if requested
-            if options['auto_start']:
-                if not real_running and settings.enabled and settings.bot_token:
-                    self.stdout.write("\nAttempting to start bot...")
-                    try:
-                        manager.start()
-                        self.stdout.write(
-                            self.style.SUCCESS("✅ Bot started successfully")
-                        )
-                    except Exception as e:
-                        self.stdout.write(
-                            self.style.ERROR(f"❌ Failed to start bot: {e}")
-                        )
-                elif real_running:
-                    self.stdout.write(
-                        self.style.SUCCESS("✅ Bot is already running")
-                    )
-                elif not settings.enabled:
-                    self.stdout.write(
-                        self.style.WARNING("⚠️ Bot is disabled in settings")
-                    )
-                elif not settings.bot_token:
-                    self.stdout.write(
-                        self.style.ERROR("❌ Bot token not configured")
-                    )
-        
-        except Exception as e:
-            self.stdout.write(
-                self.style.ERROR(f"❌ Error checking bot status: {e}")
-            )
\ No newline at end of file
diff --git a/telegram_bot/migrations/0001_initial.py b/telegram_bot/migrations/0001_initial.py
deleted file mode 100644
index 1702744..0000000
--- a/telegram_bot/migrations/0001_initial.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-14 11:18
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='BotSettings',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('bot_token', models.CharField(help_text='Telegram Bot Token from @BotFather', max_length=255)),
-                ('enabled', models.BooleanField(default=False, help_text='Enable/Disable the bot')),
-                ('welcome_message', models.TextField(default='Hello! Your message has been received. An administrator will review it.', help_text='Message sent when user starts conversation')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-            ],
-            options={
-                'verbose_name': 'Bot Settings',
-                'verbose_name_plural': 'Bot Settings',
-            },
-        ),
-        migrations.CreateModel(
-            name='BotStatus',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('is_running', models.BooleanField(default=False)),
-                ('last_started', models.DateTimeField(blank=True, null=True)),
-                ('last_stopped', models.DateTimeField(blank=True, null=True)),
-                ('last_error', models.TextField(blank=True)),
-                ('last_update_id', models.BigIntegerField(blank=True, help_text='Last processed update ID from Telegram', null=True)),
-            ],
-            options={
-                'verbose_name': 'Bot Status',
-                'verbose_name_plural': 'Bot Status',
-            },
-        ),
-        migrations.CreateModel(
-            name='TelegramMessage',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('direction', models.CharField(choices=[('incoming', 'Incoming'), ('outgoing', 'Outgoing')], db_index=True, max_length=10)),
-                ('telegram_user_id', models.BigIntegerField(db_index=True)),
-                ('telegram_username', models.CharField(blank=True, db_index=True, max_length=255, null=True)),
-                ('telegram_first_name', models.CharField(blank=True, max_length=255, null=True)),
-                ('telegram_last_name', models.CharField(blank=True, max_length=255, null=True)),
-                ('chat_id', models.BigIntegerField(db_index=True)),
-                ('message_id', models.BigIntegerField(blank=True, null=True)),
-                ('message_text', models.TextField(blank=True)),
-                ('raw_data', models.JSONField(blank=True, default=dict, help_text='Full message data from Telegram')),
-                ('created_at', models.DateTimeField(auto_now_add=True, db_index=True)),
-                ('linked_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='telegram_messages', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'Telegram Message',
-                'verbose_name_plural': 'Telegram Messages',
-                'ordering': ['-created_at'],
-                'indexes': [models.Index(fields=['-created_at', 'direction'], name='telegram_bo_created_19b81b_idx'), models.Index(fields=['telegram_user_id', '-created_at'], name='telegram_bo_telegra_f71f27_idx')],
-            },
-        ),
-    ]
diff --git a/telegram_bot/migrations/0002_add_connection_settings.py b/telegram_bot/migrations/0002_add_connection_settings.py
deleted file mode 100644
index 42e7caf..0000000
--- a/telegram_bot/migrations/0002_add_connection_settings.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-14 12:09
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('telegram_bot', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='botsettings',
-            name='api_base_url',
-            field=models.URLField(blank=True, default='https://api.telegram.org', help_text='Telegram API base URL (change for local bot API server)'),
-        ),
-        migrations.AddField(
-            model_name='botsettings',
-            name='connection_timeout',
-            field=models.IntegerField(default=30, help_text='Connection timeout in seconds'),
-        ),
-        migrations.AddField(
-            model_name='botsettings',
-            name='proxy_url',
-            field=models.URLField(blank=True, help_text='Proxy URL (e.g., http://proxy:8080 or socks5://proxy:1080)'),
-        ),
-        migrations.AddField(
-            model_name='botsettings',
-            name='use_proxy',
-            field=models.BooleanField(default=False, help_text='Enable proxy for Telegram API connections'),
-        ),
-    ]
diff --git a/telegram_bot/migrations/0003_accessrequest.py b/telegram_bot/migrations/0003_accessrequest.py
deleted file mode 100644
index 1b76776..0000000
--- a/telegram_bot/migrations/0003_accessrequest.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-14 12:24
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('telegram_bot', '0002_add_connection_settings'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AccessRequest',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('telegram_user_id', models.BigIntegerField(db_index=True, help_text='Telegram user ID who made the request')),
-                ('telegram_username', models.CharField(blank=True, help_text='Telegram username (without @)', max_length=255, null=True)),
-                ('telegram_first_name', models.CharField(blank=True, help_text='First name from Telegram', max_length=255, null=True)),
-                ('telegram_last_name', models.CharField(blank=True, help_text='Last name from Telegram', max_length=255, null=True)),
-                ('message_text', models.TextField(help_text='The message sent by user when requesting access')),
-                ('chat_id', models.BigIntegerField(help_text='Telegram chat ID for sending notifications')),
-                ('status', models.CharField(choices=[('pending', 'Pending'), ('approved', 'Approved'), ('rejected', 'Rejected')], db_index=True, default='pending', max_length=20)),
-                ('admin_comment', models.TextField(blank=True, help_text='Admin comment for approval/rejection')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('processed_at', models.DateTimeField(blank=True, null=True)),
-                ('created_user', models.ForeignKey(blank=True, help_text='User created from this request (when approved)', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
-                ('first_message', models.ForeignKey(blank=True, help_text='First message from this user', null=True, on_delete=django.db.models.deletion.SET_NULL, to='telegram_bot.telegrammessage')),
-                ('processed_by', models.ForeignKey(blank=True, help_text='Admin who processed this request', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='processed_requests', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'Access Request',
-                'verbose_name_plural': 'Access Requests',
-                'ordering': ['-created_at'],
-                'indexes': [models.Index(fields=['telegram_user_id'], name='telegram_bo_telegra_e3429d_idx'), models.Index(fields=['status', '-created_at'], name='telegram_bo_status_cf9310_idx'), models.Index(fields=['-created_at'], name='telegram_bo_created_c82a74_idx')],
-                'constraints': [models.UniqueConstraint(fields=('telegram_user_id',), name='unique_telegram_user_request')],
-            },
-        ),
-    ]
diff --git a/telegram_bot/migrations/0004_remove_accessrequest_telegram_bo_status_cf9310_idx_and_more.py b/telegram_bot/migrations/0004_remove_accessrequest_telegram_bo_status_cf9310_idx_and_more.py
deleted file mode 100644
index e6718c7..0000000
--- a/telegram_bot/migrations/0004_remove_accessrequest_telegram_bo_status_cf9310_idx_and_more.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-14 13:49
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('telegram_bot', '0003_accessrequest'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.RemoveIndex(
-            model_name='accessrequest',
-            name='telegram_bo_status_cf9310_idx',
-        ),
-        migrations.RemoveField(
-            model_name='accessrequest',
-            name='status',
-        ),
-        migrations.AddField(
-            model_name='accessrequest',
-            name='approved',
-            field=models.BooleanField(db_index=True, default=False, help_text='Request approved by administrator'),
-        ),
-        migrations.AlterField(
-            model_name='accessrequest',
-            name='admin_comment',
-            field=models.TextField(blank=True, help_text='Admin comment for approval'),
-        ),
-        migrations.AddIndex(
-            model_name='accessrequest',
-            index=models.Index(fields=['approved', '-created_at'], name='telegram_bo_approve_7ae92d_idx'),
-        ),
-    ]
diff --git a/telegram_bot/migrations/0005_delete_botstatus_remove_botsettings_welcome_message_and_more.py b/telegram_bot/migrations/0005_delete_botstatus_remove_botsettings_welcome_message_and_more.py
deleted file mode 100644
index 2722cc7..0000000
--- a/telegram_bot/migrations/0005_delete_botstatus_remove_botsettings_welcome_message_and_more.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-14 22:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('telegram_bot', '0004_remove_accessrequest_telegram_bo_status_cf9310_idx_and_more'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='BotStatus',
-        ),
-        migrations.RemoveField(
-            model_name='botsettings',
-            name='welcome_message',
-        ),
-        migrations.AddField(
-            model_name='botsettings',
-            name='help_message',
-            field=models.TextField(default='📋 Available commands:\n/start - Start conversation\n📊 Access - View your VPN subscriptions\n\nFor support contact administrator.', help_text='Help message sent for unrecognized commands'),
-        ),
-    ]
diff --git a/telegram_bot/migrations/0006_accessrequest_desired_username.py b/telegram_bot/migrations/0006_accessrequest_desired_username.py
deleted file mode 100644
index c1afad8..0000000
--- a/telegram_bot/migrations/0006_accessrequest_desired_username.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-14 22:30
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('telegram_bot', '0005_delete_botstatus_remove_botsettings_welcome_message_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='accessrequest',
-            name='desired_username',
-            field=models.CharField(blank=True, help_text='Desired username for VPN user (defaults to Telegram username)', max_length=150),
-        ),
-    ]
diff --git a/telegram_bot/migrations/0007_remove_botsettings_help_message_and_more.py b/telegram_bot/migrations/0007_remove_botsettings_help_message_and_more.py
deleted file mode 100644
index db9da40..0000000
--- a/telegram_bot/migrations/0007_remove_botsettings_help_message_and_more.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-14 22:54
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('telegram_bot', '0006_accessrequest_desired_username'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='botsettings',
-            name='help_message',
-        ),
-        migrations.AddField(
-            model_name='accessrequest',
-            name='user_language',
-            field=models.CharField(default='en', help_text="User's preferred language (en/ru)", max_length=10),
-        ),
-        migrations.AddField(
-            model_name='telegrammessage',
-            name='user_language',
-            field=models.CharField(default='en', help_text="User's preferred language (en/ru)", max_length=10),
-        ),
-    ]
diff --git a/telegram_bot/migrations/0008_accessrequest_selected_existing_user.py b/telegram_bot/migrations/0008_accessrequest_selected_existing_user.py
deleted file mode 100644
index 2cfb379..0000000
--- a/telegram_bot/migrations/0008_accessrequest_selected_existing_user.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated migration for adding selected_existing_user field
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('telegram_bot', '0007_remove_botsettings_help_message_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='accessrequest',
-            name='selected_existing_user',
-            field=models.ForeignKey(
-                blank=True,
-                help_text='Existing user selected to link with this Telegram account',
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name='selected_for_requests',
-                to=settings.AUTH_USER_MODEL
-            ),
-        ),
-    ]
\ No newline at end of file
diff --git a/telegram_bot/migrations/0009_accessrequest_selected_inbounds_and_more.py b/telegram_bot/migrations/0009_accessrequest_selected_inbounds_and_more.py
deleted file mode 100644
index 265deca..0000000
--- a/telegram_bot/migrations/0009_accessrequest_selected_inbounds_and_more.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-15 12:31
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('telegram_bot', '0008_accessrequest_selected_existing_user'),
-        ('vpn', '0026_alter_subscriptiongroup_options'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='accessrequest',
-            name='selected_inbounds',
-            field=models.ManyToManyField(blank=True, help_text='Inbound templates to assign to the user', to='vpn.inbound'),
-        ),
-        migrations.AddField(
-            model_name='accessrequest',
-            name='selected_subscription_groups',
-            field=models.ManyToManyField(blank=True, help_text='Subscription groups to assign to the user', to='vpn.subscriptiongroup'),
-        ),
-    ]
diff --git a/telegram_bot/migrations/0010_botsettings_telegram_admins.py b/telegram_bot/migrations/0010_botsettings_telegram_admins.py
deleted file mode 100644
index ac441c4..0000000
--- a/telegram_bot/migrations/0010_botsettings_telegram_admins.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-15 13:00
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('telegram_bot', '0009_accessrequest_selected_inbounds_and_more'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='botsettings',
-            name='telegram_admins',
-            field=models.ManyToManyField(blank=True, help_text='Users with linked Telegram accounts who will have admin access in the bot', related_name='bot_admin_settings', to=settings.AUTH_USER_MODEL),
-        ),
-    ]
\ No newline at end of file
diff --git a/telegram_bot/migrations/__init__.py b/telegram_bot/migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/telegram_bot/models.py b/telegram_bot/models.py
deleted file mode 100644
index 4db112c..0000000
--- a/telegram_bot/models.py
+++ /dev/null
@@ -1,318 +0,0 @@
-from django.db import models
-from django.contrib.auth import get_user_model
-from django.utils import timezone
-import json
-
-User = get_user_model()
-
-
-class BotSettings(models.Model):
-    """Singleton model for bot settings"""
-    bot_token = models.CharField(
-        max_length=255, 
-        help_text="Telegram Bot Token from @BotFather"
-    )
-    enabled = models.BooleanField(
-        default=False,
-        help_text="Enable/Disable the bot"
-    )
-    use_proxy = models.BooleanField(
-        default=False,
-        help_text="Enable proxy for Telegram API connections"
-    )
-    proxy_url = models.URLField(
-        blank=True,
-        help_text="Proxy URL (e.g., http://proxy:8080 or socks5://proxy:1080)"
-    )
-    api_base_url = models.URLField(
-        blank=True,
-        default="https://api.telegram.org",
-        help_text="Telegram API base URL (change for local bot API server)"
-    )
-    connection_timeout = models.IntegerField(
-        default=30,
-        help_text="Connection timeout in seconds"
-    )
-    telegram_admins = models.ManyToManyField(
-        User,
-        blank=True,
-        related_name='bot_admin_settings',
-        help_text="Users with linked Telegram accounts who will have admin access in the bot"
-    )
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-    
-    class Meta:
-        verbose_name = "Bot Settings"
-        verbose_name_plural = "Bot Settings"
-    
-    def save(self, *args, **kwargs):
-        # Ensure only one instance exists
-        self.pk = 1
-        super().save(*args, **kwargs)
-    
-    def delete(self, *args, **kwargs):
-        # Prevent deletion
-        pass
-    
-    @classmethod
-    def get_settings(cls):
-        """Get or create singleton settings"""
-        obj, created = cls.objects.get_or_create(pk=1)
-        return obj
-    
-    def __str__(self):
-        return f"Bot Settings ({'Enabled' if self.enabled else 'Disabled'})"
-
-
-class TelegramMessage(models.Model):
-    """Store all telegram messages"""
-    DIRECTION_CHOICES = [
-        ('incoming', 'Incoming'),
-        ('outgoing', 'Outgoing'),
-    ]
-    
-    direction = models.CharField(
-        max_length=10, 
-        choices=DIRECTION_CHOICES,
-        db_index=True
-    )
-    
-    # Telegram user info
-    telegram_user_id = models.BigIntegerField(db_index=True)
-    telegram_username = models.CharField(
-        max_length=255, 
-        blank=True, 
-        null=True,
-        db_index=True
-    )
-    telegram_first_name = models.CharField(
-        max_length=255, 
-        blank=True, 
-        null=True
-    )
-    telegram_last_name = models.CharField(
-        max_length=255, 
-        blank=True, 
-        null=True
-    )
-    user_language = models.CharField(
-        max_length=10,
-        default='en',
-        help_text="User's preferred language (en/ru)"
-    )
-    
-    # Message info
-    chat_id = models.BigIntegerField(db_index=True)
-    message_id = models.BigIntegerField(null=True, blank=True)
-    message_text = models.TextField(blank=True)
-    
-    # Additional data
-    raw_data = models.JSONField(
-        default=dict, 
-        blank=True,
-        help_text="Full message data from Telegram"
-    )
-    
-    # Timestamps
-    created_at = models.DateTimeField(auto_now_add=True, db_index=True)
-    
-    # Optional link to VPN user if identified
-    linked_user = models.ForeignKey(
-        User,
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-        related_name='telegram_messages'
-    )
-    
-    class Meta:
-        verbose_name = "Telegram Message"
-        verbose_name_plural = "Telegram Messages"
-        ordering = ['-created_at']
-        indexes = [
-            models.Index(fields=['-created_at', 'direction']),
-            models.Index(fields=['telegram_user_id', '-created_at']),
-        ]
-    
-    def __str__(self):
-        username = self.telegram_username or f"ID:{self.telegram_user_id}"
-        direction_icon = "⬇️" if self.direction == 'incoming' else "⬆️"
-        text_preview = self.message_text[:50] + "..." if len(self.message_text) > 50 else self.message_text
-        return f"{direction_icon} {username}: {text_preview}"
-    
-    @property
-    def full_name(self):
-        """Get full name of telegram user"""
-        parts = []
-        if self.telegram_first_name:
-            parts.append(self.telegram_first_name)
-        if self.telegram_last_name:
-            parts.append(self.telegram_last_name)
-        return " ".join(parts) if parts else f"User {self.telegram_user_id}"
-    
-    @property
-    def display_name(self):
-        """Get best available display name"""
-        if self.telegram_username:
-            return f"`@{self.telegram_username}`"
-        return self.full_name
-
-
-
-
-class AccessRequest(models.Model):
-    """Access requests from Telegram users"""
-    
-    # Telegram user information
-    telegram_user_id = models.BigIntegerField(
-        db_index=True,
-        help_text="Telegram user ID who made the request"
-    )
-    telegram_username = models.CharField(
-        max_length=255, 
-        blank=True, 
-        null=True,
-        help_text="Telegram username (without @)"
-    )
-    telegram_first_name = models.CharField(
-        max_length=255, 
-        blank=True, 
-        null=True,
-        help_text="First name from Telegram"
-    )
-    telegram_last_name = models.CharField(
-        max_length=255, 
-        blank=True, 
-        null=True,
-        help_text="Last name from Telegram"
-    )
-    
-    # Request details
-    message_text = models.TextField(
-        help_text="The message sent by user when requesting access"
-    )
-    chat_id = models.BigIntegerField(
-        help_text="Telegram chat ID for sending notifications"
-    )
-    
-    # Username for VPN user creation
-    desired_username = models.CharField(
-        max_length=150,
-        blank=True,
-        help_text="Desired username for VPN user (defaults to Telegram username)"
-    )
-    
-    # User language
-    user_language = models.CharField(
-        max_length=10,
-        default='en',
-        help_text="User's preferred language (en/ru)"
-    )
-    
-    # Status and processing
-    approved = models.BooleanField(
-        default=False,
-        db_index=True,
-        help_text="Request approved by administrator"
-    )
-    admin_comment = models.TextField(
-        blank=True,
-        help_text="Admin comment for approval"
-    )
-    
-    # Related objects
-    selected_existing_user = models.ForeignKey(
-        User,
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-        related_name='selected_for_requests',
-        help_text="Existing user selected to link with this Telegram account"
-    )
-    created_user = models.ForeignKey(
-        User,
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-        help_text="User created from this request (when approved)"
-    )
-    processed_by = models.ForeignKey(
-        User,
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-        related_name='processed_requests',
-        help_text="Admin who processed this request"
-    )
-    first_message = models.ForeignKey(
-        TelegramMessage,
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-        help_text="First message from this user"
-    )
-    
-    # Inbound templates and subscription groups
-    selected_inbounds = models.ManyToManyField(
-        'vpn.Inbound',
-        blank=True,
-        help_text="Inbound templates to assign to the user"
-    )
-    selected_subscription_groups = models.ManyToManyField(
-        'vpn.SubscriptionGroup',
-        blank=True,
-        help_text="Subscription groups to assign to the user"
-    )
-    
-    # Timestamps
-    created_at = models.DateTimeField(auto_now_add=True)
-    processed_at = models.DateTimeField(null=True, blank=True)
-    
-    class Meta:
-        verbose_name = "Access Request"
-        verbose_name_plural = "Access Requests"
-        ordering = ['-created_at']
-        indexes = [
-            models.Index(fields=['telegram_user_id']),
-            models.Index(fields=['approved', '-created_at']),
-            models.Index(fields=['-created_at']),
-        ]
-        constraints = [
-            models.UniqueConstraint(
-                fields=['telegram_user_id'], 
-                name='unique_telegram_user_request'
-            )
-        ]
-    
-    def __str__(self):
-        username = self.telegram_username or f"ID:{self.telegram_user_id}"
-        status = "Approved" if self.approved else "Pending"
-        return f"Request from @{username} ({status})"
-    
-    @property
-    def display_name(self):
-        """Get best available display name"""
-        if self.telegram_username:
-            return f"`@{self.telegram_username}`"
-        
-        name_parts = []
-        if self.telegram_first_name:
-            name_parts.append(self.telegram_first_name)
-        if self.telegram_last_name:
-            name_parts.append(self.telegram_last_name)
-        
-        if name_parts:
-            return " ".join(name_parts)
-        
-        return f"User {self.telegram_user_id}"
-    
-    @property
-    def full_name(self):
-        """Get full name of telegram user"""
-        parts = []
-        if self.telegram_first_name:
-            parts.append(self.telegram_first_name)
-        if self.telegram_last_name:
-            parts.append(self.telegram_last_name)
-        return " ".join(parts) if parts else None
diff --git a/telegram_bot/tests.py b/telegram_bot/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/telegram_bot/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/telegram_bot/views.py b/telegram_bot/views.py
deleted file mode 100644
index 91ea44a..0000000
--- a/telegram_bot/views.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.
diff --git a/telegram_bot_locks/telegram_bot.lock b/telegram_bot_locks/telegram_bot.lock
deleted file mode 100644
index e69de29..0000000
diff --git a/templates/admin/create_xray_inbound.html b/templates/admin/create_xray_inbound.html
deleted file mode 100644
index 5d7af3e..0000000
--- a/templates/admin/create_xray_inbound.html
+++ /dev/null
@@ -1,202 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load static %}
-
-{% block title %}{{ title }}{% endblock %}
-
-{% block content %}
-<div class="card">
-    <div class="card-header">
-        <h3>{{ title }}</h3>
-    </div>
-    <div class="card-body">
-        <form method="post">
-            {% csrf_token %}
-            
-            <div class="row">
-                <div class="col-md-6">
-                    <div class="form-group">
-                        <label for="protocol">Protocol *</label>
-                        <select name="protocol" id="protocol" class="form-control" required>
-                            <option value="">Select Protocol</option>
-                            {% for proto in protocols %}
-                                <option value="{{ proto }}">{{ proto|upper }}</option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                </div>
-                
-                <div class="col-md-6">
-                    <div class="form-group">
-                        <label for="port">Port *</label>
-                        <input type="number" name="port" id="port" class="form-control" 
-                               min="1" max="65535" required>
-                    </div>
-                </div>
-            </div>
-            
-            <div class="row">
-                <div class="col-md-6">
-                    <div class="form-group">
-                        <label for="tag">Tag</label>
-                        <input type="text" name="tag" id="tag" class="form-control" 
-                               placeholder="Auto-generated if empty">
-                    </div>
-                </div>
-                
-                <div class="col-md-6">
-                    <div class="form-group">
-                        <label for="network">Network</label>
-                        <select name="network" id="network" class="form-control">
-                            {% for net in networks %}
-                                <option value="{{ net }}" {% if net == 'tcp' %}selected{% endif %}>
-                                    {{ net|upper }}
-                                </option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                </div>
-            </div>
-            
-            <div class="row">
-                <div class="col-md-6">
-                    <div class="form-group">
-                        <label for="security">Security</label>
-                        <select name="security" id="security" class="form-control">
-                            {% for sec in securities %}
-                                <option value="{{ sec }}" {% if sec == 'none' %}selected{% endif %}>
-                                    {{ sec|upper }}
-                                </option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                </div>
-            </div>
-            
-            <div class="form-group">
-                <div class="alert alert-info">
-                    <strong>Note:</strong> The inbound will be created on both the Django database and the Xray server via gRPC API.
-                </div>
-            </div>
-            
-            <div class="form-group">
-                <button type="submit" class="btn btn-success">
-                    ➕ Create Inbound
-                </button>
-                <a href="{% url 'admin:vpn_xraycoreserver_change' server.pk %}" class="btn btn-secondary">
-                    Cancel
-                </a>
-            </div>
-        </form>
-    </div>
-</div>
-
-<script>
-document.addEventListener('DOMContentLoaded', function() {
-    const protocolField = document.getElementById('protocol');
-    const portField = document.getElementById('port');
-    const tagField = document.getElementById('tag');
-    
-    // Auto-suggest ports based on protocol
-    protocolField.addEventListener('change', function() {
-        const protocol = this.value;
-        const ports = {
-            'vless': 443,
-            'vmess': 443, 
-            'trojan': 443
-        };
-        
-        if (ports[protocol] && !portField.value) {
-            portField.value = ports[protocol];
-        }
-        
-        if (protocol && !tagField.value) {
-            tagField.placeholder = `${protocol}-${portField.value || 'PORT'}`;
-        }
-    });
-    
-    portField.addEventListener('input', function() {
-        const protocol = protocolField.value;
-        if (protocol && !tagField.value) {
-            tagField.placeholder = `${protocol}-${this.value}`;
-        }
-    });
-});
-</script>
-
-<style>
-.card {
-    max-width: 800px;
-    margin: 20px auto;
-    border: 1px solid #ddd;
-    border-radius: 8px;
-}
-
-.card-header {
-    background: #f8f9fa;
-    padding: 15px;
-    border-bottom: 1px solid #ddd;
-}
-
-.card-body {
-    padding: 20px;
-}
-
-.form-group {
-    margin-bottom: 15px;
-}
-
-.form-group label {
-    font-weight: bold;
-    margin-bottom: 5px;
-    display: block;
-}
-
-.form-control {
-    width: 100%;
-    padding: 8px 12px;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-}
-
-.btn {
-    padding: 8px 16px;
-    border: none;
-    border-radius: 4px;
-    cursor: pointer;
-    text-decoration: none;
-    display: inline-block;
-}
-
-.btn-success {
-    background: #28a745;
-    color: white;
-}
-
-.btn-secondary {
-    background: #6c757d;
-    color: white;
-}
-
-.alert {
-    padding: 12px;
-    border-radius: 4px;
-    margin: 15px 0;
-}
-
-.alert-info {
-    background: #d1ecf1;
-    border: 1px solid #bee5eb;
-    color: #0c5460;
-}
-
-.row {
-    display: flex;
-    margin: 0 -10px;
-}
-
-.col-md-6 {
-    flex: 0 0 50%;
-    padding: 0 10px;
-}
-</style>
-{% endblock %}
\ No newline at end of file
diff --git a/vpn/__init__.py b/vpn/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/vpn/admin.py b/vpn/admin.py
deleted file mode 100644
index 2b14fb2..0000000
--- a/vpn/admin.py
+++ /dev/null
@@ -1,169 +0,0 @@
-"""
-Django admin configuration for VPN application
-
-This module has been refactored for better organization. The admin classes
-are now split across multiple modules in the vpn.admin package:
-
-- vpn.admin.user: User management admin interface
-- vpn.admin.server: Server management admin interface  
-- vpn.admin.access: Access control (ACL/ACLLink) admin interfaces
-- vpn.admin.logs: Logging (TaskExecutionLog/AccessLog) admin interfaces
-- vpn.admin.base: Common utilities and base classes
-"""
-
-import logging
-logger = logging.getLogger(__name__)
-
-import json
-from django.contrib import admin
-from django.utils.safestring import mark_safe
-
-
-# Import server plugins and their admin classes
-try:
-    from .server_plugins import (
-        XrayServerV2,
-        XrayServerV2Admin
-    )
-except Exception as e:
-    logger.error(f"❌ Failed to import server plugins: {e}")
-
-# Import admin interfaces from refactored modules
-# This ensures all admin classes are registered
-try:
-    from .admin import *
-except Exception as e:
-    logger.error(f"❌ Failed to import refactored admin modules: {e}")
-    import traceback
-    logger.error(f"Traceback: {traceback.format_exc()}")
-
-# Import Xray admin configuration and all Xray admin classes
-try:
-    from .admin_xray import *
-except Exception as e:
-    logger.error(f"❌ Failed to import Xray admin classes: {e}")
-    import traceback
-    logger.error(f"Traceback: {traceback.format_exc()}")
-
-# Set custom admin site configuration
-admin.site.site_title = "VPN Manager"
-admin.site.site_header = "VPN Manager"
-admin.site.index_title = "OutFleet"
-
-# Custom Celery admin interfaces
-try:
-    from django_celery_results.models import TaskResult
-    
-    # Unregister default TaskResult admin if it exists
-    try:
-        admin.site.unregister(TaskResult)
-    except admin.sites.NotRegistered:
-        pass
-    
-    
-    @admin.register(TaskResult)
-    class CustomTaskResultAdmin(admin.ModelAdmin):
-        list_display = ('task_name_display', 'status', 'date_created', 'date_done', 'worker', 'result_display', 'traceback_display')
-        list_filter = ('status', 'date_created', 'worker', 'task_name')
-        search_fields = ('task_name', 'task_id', 'worker')
-        readonly_fields = ('task_id', 'task_name', 'status', 'result_formatted', 'date_created', 'date_done', 'traceback', 'worker', 'task_args', 'task_kwargs', 'meta')
-        ordering = ('-date_created',)
-        list_per_page = 50
-        
-        fieldsets = (
-            ('Task Information', {
-                'fields': ('task_id', 'task_name', 'status', 'worker')
-            }),
-            ('Timing', {
-                'fields': ('date_created', 'date_done')
-            }),
-            ('Result', {
-                'fields': ('result_formatted',),
-                'classes': ('collapse',)
-            }),
-            ('Arguments', {
-                'fields': ('task_args', 'task_kwargs'),
-                'classes': ('collapse',)
-            }),
-            ('Error Details', {
-                'fields': ('traceback',),
-                'classes': ('collapse',)
-            }),
-            ('Metadata', {
-                'fields': ('meta',),
-                'classes': ('collapse',)
-            }),
-        )
-        
-        @admin.display(description='Task Name', ordering='task_name')
-        def task_name_display(self, obj):
-            task_names = {
-                'sync_all_servers': '🔄 Sync All Servers',
-                'sync_server_users': '👥 Sync Users on Server',
-                'sync_server_info': '⚙️ Sync Server Info',
-                'sync_user_on_server': '👤 Sync User on Server',
-                'cleanup_task_logs': '🧹 Cleanup Old Logs',
-                'update_user_statistics': '📊 Update Statistics',
-            }
-            return task_names.get(obj.task_name, obj.task_name)
-        
-        @admin.display(description='Result')
-        def result_display(self, obj):
-            if obj.status == 'SUCCESS' and obj.result:
-                try:
-                    result = json.loads(obj.result) if isinstance(obj.result, str) else obj.result
-                    if isinstance(result, str):
-                        return result[:100] + '...' if len(result) > 100 else result
-                    elif isinstance(result, dict):
-                        return ', '.join(f'{k}: {v}' for k, v in result.items())[:100]
-                except:
-                    return str(obj.result)[:100] if obj.result else '-'
-            elif obj.status == 'FAILURE':
-                return '❌ Failed'
-            elif obj.status == 'PENDING':
-                return '⏳ Pending'
-            elif obj.status == 'RETRY':
-                return '🔄 Retrying'
-            return '-'
-        
-        @admin.display(description='Result Details')
-        def result_formatted(self, obj):
-            if obj.result:
-                try:
-                    result = json.loads(obj.result) if isinstance(obj.result, str) else obj.result
-                    formatted = json.dumps(result, indent=2)
-                    return mark_safe(f"<pre>{formatted}</pre>")
-                except:
-                    return mark_safe(f"<pre>{obj.result}</pre>")
-            return '-'
-        
-        @admin.display(description='Error Info')
-        def traceback_display(self, obj):
-            if obj.traceback:
-                # Show first 200 chars of traceback
-                short_tb = obj.traceback[:200] + '...' if len(obj.traceback) > 200 else obj.traceback
-                return mark_safe(f"<pre style='color: red; font-size: 12px;'>{short_tb}</pre>")
-            return '-'
-        
-        def has_add_permission(self, request):
-            return False
-        
-        def has_change_permission(self, request, obj=None):
-            return False
-        
-    
-except ImportError:
-    pass  # Celery not available
-
-# Add subscription management to User admin
-try:
-    from vpn.admin_xray import add_subscription_management_to_user
-    from vpn.admin.user import UserAdmin
-    add_subscription_management_to_user(UserAdmin)
-    logger.info("✅ Successfully added subscription management to User admin")
-except Exception as e:
-    logger.error(f"Failed to add subscription management: {e}")
-
-# Note: Unwanted admin interfaces are cleaned up in vpn/apps.py ready() method
-
-# Force reload trigger
\ No newline at end of file
diff --git a/vpn/admin/__init__.py b/vpn/admin/__init__.py
deleted file mode 100644
index 28f2b0a..0000000
--- a/vpn/admin/__init__.py
+++ /dev/null
@@ -1,45 +0,0 @@
-"""
-VPN Admin Module
-
-This module provides Django admin interfaces for the VPN application.
-The admin interface has been refactored into separate modules for better organization:
-
-- base.py: Common utilities and base classes
-- user.py: User management admin interface
-- server.py: Server management admin interface  
-- access.py: Access control (ACL/ACLLink) admin interfaces
-- logs.py: Logging (TaskExecutionLog/AccessLog) admin interfaces
-
-All admin classes are automatically registered with Django admin.
-"""
-
-# Import all admin classes to ensure they are registered
-from .user import UserAdmin
-from .server import ServerAdmin, UserACLInline
-from .access import (
-    ACLAdmin, 
-    ACLLinkAdmin, 
-    UserNameFilter, 
-    ServerNameFilter, 
-    LastAccessFilter,
-    ACLLinkInline
-)
-from .logs import TaskExecutionLogAdmin, AccessLogAdmin
-from .base import BaseVPNAdmin, format_bytes
-
-# Re-export for backward compatibility
-__all__ = [
-    'UserAdmin',
-    'ServerAdmin',
-    'UserACLInline', 
-    'ACLAdmin',
-    'ACLLinkAdmin',
-    'TaskExecutionLogAdmin',
-    'AccessLogAdmin',
-    'BaseVPNAdmin',
-    'format_bytes',
-    'UserNameFilter',
-    'ServerNameFilter', 
-    'LastAccessFilter',
-    'ACLLinkInline'
-]
\ No newline at end of file
diff --git a/vpn/admin/access.py b/vpn/admin/access.py
deleted file mode 100644
index 884fe2d..0000000
--- a/vpn/admin/access.py
+++ /dev/null
@@ -1,485 +0,0 @@
-"""
-Access control admin interfaces (ACL, ACLLink)
-"""
-from django.contrib import admin
-from django.utils.safestring import mark_safe
-from django.utils.html import format_html
-from django.shortcuts import redirect
-from django.contrib import messages
-from django.utils.timezone import localtime
-from django.db.models import Q
-
-from mysite.settings import EXTERNAL_ADDRESS
-from vpn.models import ACL, ACLLink, User
-from .base import BaseVPNAdmin
-from vpn.utils import format_object
-
-
-class UserNameFilter(admin.SimpleListFilter):
-    title = 'User'
-    parameter_name = 'user'
-
-    def lookups(self, request, model_admin):
-        users = set(User.objects.values_list('username', flat=True))
-        return [(user, user) for user in users]
-
-    def queryset(self, request, queryset):
-        if self.value():
-            return queryset.filter(user__username=self.value())
-        return queryset
-
-
-class ServerNameFilter(admin.SimpleListFilter):
-    title = 'Server Name'
-    parameter_name = 'acl__server__name'
-
-    def lookups(self, request, model_admin):
-        servers = set(ACL.objects.values_list('server__name', flat=True))
-        return [(server, server) for server in servers]
-
-    def queryset(self, request, queryset):
-        if self.value():
-            return queryset.filter(acl__server__name=self.value())
-        return queryset
-
-
-class LastAccessFilter(admin.SimpleListFilter):
-    title = 'Last Access'
-    parameter_name = 'last_access_status'
-
-    def lookups(self, request, model_admin):
-        return [
-            ('never', 'Never accessed'),
-            ('week', 'Last week'),
-            ('month', 'Last month'),
-            ('old', 'Older than 3 months'),
-        ]
-
-    def queryset(self, request, queryset):
-        from django.utils import timezone
-        from datetime import timedelta
-        
-        if self.value() == 'never':
-            # Links that have never been accessed
-            return queryset.filter(last_access_time__isnull=True)
-        elif self.value() == 'week':
-            # Links accessed in the last week
-            week_ago = timezone.now() - timedelta(days=7)
-            return queryset.filter(last_access_time__gte=week_ago)
-        elif self.value() == 'month':
-            # Links accessed in the last month
-            month_ago = timezone.now() - timedelta(days=30)
-            return queryset.filter(last_access_time__gte=month_ago)
-        elif self.value() == 'old':
-            # Links not accessed for more than 3 months
-            three_months_ago = timezone.now() - timedelta(days=90)
-            return queryset.filter(last_access_time__lt=three_months_ago)
-        return queryset
-
-
-class ACLLinkInline(admin.TabularInline):
-    model = ACLLink
-    extra = 1
-    help_text = 'Add or change ACL links'
-    verbose_name = 'Dynamic link'
-    verbose_name_plural = 'Dynamic links'
-    fields = ('link', 'generate_link_button', 'comment')
-    readonly_fields = ('generate_link_button',)
-
-    @admin.display(description="Generate")
-    def generate_link_button(self, obj=None):
-        return format_html(
-            '<button type="button" class="generate-link" onclick="generateLink(this)">🔄</button>'
-        )
-
-    class Media:
-        js = ('admin/js/generate_link.js',)
-
-
-@admin.register(ACL)
-class ACLAdmin(BaseVPNAdmin):
-    list_display = ('user', 'server', 'server_type', 'display_links', 'created_at')
-    list_filter = (UserNameFilter, 'server__server_type', ServerNameFilter)
-    # Fixed search_fields - removed problematic polymorphic server fields
-    search_fields = ('user__username', 'user__comment', 'links__link')
-    readonly_fields = ('user_info',)
-    inlines = [ACLLinkInline]
-
-    @admin.display(description='Server Type', ordering='server__server_type')
-    def server_type(self, obj):
-        return obj.server.get_server_type_display()
-
-    @admin.display(description='Client info')
-    def user_info(self, obj):
-        server = obj.server
-        user = obj.user
-        try:
-            # Use cached statistics instead of direct server requests
-            from vpn.models import UserStatistics
-            user_stats = UserStatistics.objects.filter(
-                user=user,
-                server_name=server.name
-            ).first()
-            
-            if user_stats:
-                # Format cached data nicely
-                data = {
-                    'user': user.username,
-                    'server': server.name,
-                    'total_connections': user_stats.total_connections,
-                    'recent_connections': user_stats.recent_connections,
-                    'max_daily': user_stats.max_daily,
-                    'last_updated': user_stats.updated_at.strftime('%Y-%m-%d %H:%M:%S'),
-                    'status': 'from_cache'
-                }
-                return format_object(data)
-            else:
-                # Fallback to minimal server check (avoid slow API calls on admin pages)
-                return mark_safe(
-                    '<div style="background: #fff3cd; border: 1px solid #ffeaa7; padding: 8px; border-radius: 4px;">' +
-                    '<strong>ℹ️ User Statistics:</strong><br>' +
-                    'No cached statistics available.<br>' +
-                    '<small>Run "Update user statistics cache" action to populate data.</small>' +
-                    '</div>'
-                )
-        except Exception as e:
-            import logging
-            logger = logging.getLogger(__name__)
-            logger.error(f"Failed to get cached user info for {user.username} on {server.name}: {e}")
-            return mark_safe(f"<span style='color: red;'>Cache error: {e}</span>")
-
-    @admin.display(description='User Links')
-    def display_links(self, obj):
-        links_count = obj.links.count()
-        portal_url = f"{EXTERNAL_ADDRESS}/u/{obj.user.hash}"
-        
-        return format_html(
-            '<div style="font-size: 12px; margin-bottom: 8px;">'
-            '<strong>🔗 {} link(s)</strong>'
-            '</div>'
-            '<a href="{}" target="_blank" style="background: #4ade80; color: #000; padding: 4px 8px; border-radius: 4px; text-decoration: none; font-size: 11px; font-weight: bold;">🌐 User Portal</a>',
-            links_count, portal_url
-        )
-
-
-# Note: UserStatistics is not registered separately as admin model.
-# All user statistics functionality is integrated into ACLLinkAdmin below.
-@admin.register(ACLLink)
-class ACLLinkAdmin(BaseVPNAdmin):
-    list_display = ('link_display', 'user_display', 'server_display', 'comment_display', 'stats_display', 'usage_chart_display', 'last_access_display', 'created_display')
-    list_filter = ('acl__server__name', 'acl__server__server_type', LastAccessFilter, 'acl__user__username')
-    search_fields = ('link', 'comment', 'acl__user__username', 'acl__server__name')
-    list_per_page = 100
-    actions = ['delete_selected_links', 'update_statistics_action']
-    list_select_related = ('acl__user', 'acl__server')
-
-    def get_queryset(self, request):
-        qs = super().get_queryset(request)
-        qs = qs.select_related('acl__user', 'acl__server')
-        return qs
-
-    @admin.display(description='Link', ordering='link')
-    def link_display(self, obj):
-        link_url = f"{EXTERNAL_ADDRESS}/ss/{obj.link}#{obj.acl.server.name}"
-        return format_html(
-            '<a href="{}" target="_blank" style="color: #2563eb; text-decoration: none; font-family: monospace;">{}</a>',
-            link_url, obj.link[:16] + '...' if len(obj.link) > 16 else obj.link
-        )
-
-    @admin.display(description='User', ordering='acl__user__username')
-    def user_display(self, obj):
-        return obj.acl.user.username
-
-    @admin.display(description='Server', ordering='acl__server__name')
-    def server_display(self, obj):
-        server_type_icons = {
-            'outline': '🔵',
-            'wireguard': '🟢',
-            'xray_core': '🟣',
-        }
-        icon = server_type_icons.get(obj.acl.server.server_type, '⚪')
-        return f"{icon} {obj.acl.server.name}"
-
-    @admin.display(description='Comment', ordering='comment')
-    def comment_display(self, obj):
-        if obj.comment:
-            return obj.comment[:50] + '...' if len(obj.comment) > 50 else obj.comment
-        return '-'
-
-    @admin.display(description='Statistics')
-    def stats_display(self, obj):
-        try:
-            from vpn.models import UserStatistics
-            stats = UserStatistics.objects.get(
-                user=obj.acl.user,
-                server_name=obj.acl.server.name,
-                acl_link_id=obj.link
-            )
-            
-            # Color coding based on usage
-            if stats.total_connections > 100:
-                color = '#16a34a'  # green - high usage
-            elif stats.total_connections > 10:
-                color = '#eab308'  # yellow - medium usage
-            elif stats.total_connections > 0:
-                color = '#f97316'  # orange - low usage
-            else:
-                color = '#9ca3af'  # gray - no usage
-            
-            return mark_safe(
-                f'<div style="font-size: 12px;">'
-                f'<span style="color: {color}; font-weight: bold;">✨ {stats.total_connections} total</span><br>'
-                f'<span style="color: #6b7280;">📅 {stats.recent_connections} last 30d</span>'
-                f'</div>'
-            )
-        except:
-            return mark_safe('<span style="color: #dc2626; font-size: 12px;">No cache</span>')
-
-    @admin.display(description='30-day Chart')
-    def usage_chart_display(self, obj):
-        try:
-            from vpn.models import UserStatistics
-            stats = UserStatistics.objects.get(
-                user=obj.acl.user,
-                server_name=obj.acl.server.name,
-                acl_link_id=obj.link
-            )
-            
-            if not stats.daily_usage:
-                return mark_safe('<span style="color: #9ca3af; font-size: 11px;">No data</span>')
-            
-            # Create wider mini chart for better visibility
-            max_val = max(stats.daily_usage) if stats.daily_usage else 1
-            chart_html = '<div style="display: flex; align-items: end; gap: 1px; height: 35px; width: 180px;">'
-            
-            # Show last 30 days with wider bars for better visibility
-            for day_count in stats.daily_usage[-30:]:  # Last 30 days
-                if max_val > 0:
-                    height_percent = (day_count / max_val) * 100
-                else:
-                    height_percent = 0
-                
-                color = '#4ade80' if day_count > 0 else '#e5e7eb'
-                chart_html += f'<div style="background: {color}; width: 5px; height: {height_percent}%; min-height: 1px; border-radius: 1px;" title="{day_count} connections"></div>'
-            
-            chart_html += '</div>'
-            
-            # Add summary info below chart
-            total_last_30 = sum(stats.daily_usage[-30:]) if stats.daily_usage else 0
-            avg_daily = total_last_30 / 30 if total_last_30 > 0 else 0
-            chart_html += f'<div style="font-size: 10px; color: #6b7280; margin-top: 2px;">'
-            chart_html += f'Max: {max_val} | Avg: {avg_daily:.1f}'
-            chart_html += f'</div>'
-            
-            return mark_safe(chart_html)
-        except:
-            return mark_safe('<span style="color: #dc2626; font-size: 11px;">-</span>')
-
-    @admin.display(description='Last Access', ordering='last_access_time')
-    def last_access_display(self, obj):
-        if obj.last_access_time:
-            from django.utils import timezone
-            from datetime import timedelta
-            
-            local_time = localtime(obj.last_access_time)
-            now = timezone.now()
-            diff = now - obj.last_access_time
-            
-            # Color coding based on age
-            if diff <= timedelta(days=7):
-                color = '#16a34a'  # green - recent
-            elif diff <= timedelta(days=30):
-                color = '#eab308'  # yellow - medium
-            elif diff <= timedelta(days=90):
-                color = '#f97316'  # orange - old
-            else:
-                color = '#dc2626'  # red - very old
-            
-            formatted_date = local_time.strftime('%Y-%m-%d %H:%M')
-            
-            # Add relative time info
-            if diff.days > 365:
-                relative = f'{diff.days // 365}y ago'
-            elif diff.days > 30:
-                relative = f'{diff.days // 30}mo ago'
-            elif diff.days > 0:
-                relative = f'{diff.days}d ago'
-            elif diff.seconds > 3600:
-                relative = f'{diff.seconds // 3600}h ago'
-            else:
-                relative = 'Recently'
-            
-            return mark_safe(
-                f'<span style="color: {color}; font-weight: bold; font-size: 12px;">{formatted_date}</span>'
-                f'<br><small style="color: {color}; font-size: 10px;">{relative}</small>'
-            )
-        return mark_safe('<span style="color: #dc2626; font-weight: bold; font-size: 12px;">Never</span>')
-
-    @admin.display(description='Created', ordering='acl__created_at')
-    def created_display(self, obj):
-        local_time = localtime(obj.acl.created_at)
-        return local_time.strftime('%Y-%m-%d %H:%M')
-
-    def delete_selected_links(self, request, queryset):
-        count = queryset.count()
-        queryset.delete()
-        self.message_user(request, f'Successfully deleted {count} ACL link(s).')
-    delete_selected_links.short_description = "Delete selected ACL links"
-    
-    def update_statistics_action(self, request, queryset):
-        """Trigger comprehensive statistics update for all users and links"""
-        # This action doesn't require selected items
-        try:
-            from vpn.tasks import update_user_statistics
-            
-            # Start the statistics update task
-            task = update_user_statistics.delay()
-            
-            self.message_user(
-                request,
-                f'📊 Statistics update started successfully! Task ID: {task.id}. '
-                f'This will recalculate usage statistics for all users and links. '
-                f'Refresh this page in a few moments to see updated data.',
-                level=messages.SUCCESS
-            )
-            
-        except Exception as e:
-            self.message_user(
-                request,
-                f'❌ Failed to start statistics update: {e}',
-                level=messages.ERROR
-            )
-    update_statistics_action.short_description = "📊 Update all user statistics and usage data"
-
-    def get_actions(self, request):
-        """Remove default delete action and keep only custom one"""
-        actions = super().get_actions(request)
-        if 'delete_selected' in actions:
-            del actions['delete_selected']
-        return actions
-
-    def has_add_permission(self, request):
-        return False
-
-    def has_change_permission(self, request, obj=None):
-        return True
-
-    def has_delete_permission(self, request, obj=None):
-        return True
-    
-    def changelist_view(self, request, extra_context=None):
-        # Handle actions that don't require item selection
-        if 'action' in request.POST:
-            action = request.POST['action']
-            if action == 'update_statistics_action':
-                # Call the action directly without queryset requirement
-                self.update_statistics_action(request, None)
-                # Return redirect to prevent AttributeError
-                return redirect(request.get_full_path())
-        
-        # Add comprehensive statistics to the changelist
-        extra_context = extra_context or {}
-        
-        # Get queryset for statistics
-        queryset = self.get_queryset(request)
-        
-        total_links = queryset.count()
-        never_accessed = queryset.filter(last_access_time__isnull=True).count()
-        
-        from django.utils import timezone
-        from datetime import timedelta
-        from django.db.models import Count, Max, Min
-        
-        now = timezone.now()
-        one_week_ago = now - timedelta(days=7)
-        one_month_ago = now - timedelta(days=30)
-        three_months_ago = now - timedelta(days=90)
-        
-        # Access time statistics
-        old_links = queryset.filter(
-            Q(last_access_time__lt=three_months_ago) | Q(last_access_time__isnull=True)
-        ).count()
-        
-        recent_week = queryset.filter(last_access_time__gte=one_week_ago).count()
-        recent_month = queryset.filter(last_access_time__gte=one_month_ago).count()
-        
-        # Calculate comprehensive statistics from cache
-        try:
-            from vpn.models import UserStatistics
-            from django.db import models
-            
-            # Total usage statistics
-            cached_stats = UserStatistics.objects.aggregate(
-                total_uses=models.Sum('total_connections'),
-                recent_uses=models.Sum('recent_connections'),
-                max_daily_peak=models.Max('max_daily')
-            )
-            total_uses = cached_stats['total_uses'] or 0
-            recent_uses = cached_stats['recent_uses'] or 0
-            max_daily_peak = cached_stats['max_daily_peak'] or 0
-            
-            # Server and user breakdown
-            server_stats = UserStatistics.objects.values('server_name').annotate(
-                total_connections=models.Sum('total_connections'),
-                link_count=models.Count('id')
-            ).order_by('-total_connections')[:5]  # Top 5 servers
-            
-            user_stats = UserStatistics.objects.values('user__username').annotate(
-                total_connections=models.Sum('total_connections'),
-                link_count=models.Count('id')
-            ).order_by('-total_connections')[:5]  # Top 5 users
-            
-            # Links with cache data count
-            cached_links_count = UserStatistics.objects.filter(
-                acl_link_id__isnull=False
-            ).count()
-            
-        except Exception as e:
-            total_uses = 0
-            recent_uses = 0
-            max_daily_peak = 0
-            server_stats = []
-            user_stats = []
-            cached_links_count = 0
-        
-        # Active vs inactive breakdown
-        active_links = total_links - never_accessed - old_links
-        if active_links < 0:
-            active_links = 0
-        
-        extra_context.update({
-            'total_links': total_links,
-            'never_accessed': never_accessed,
-            'old_links': old_links,
-            'active_links': active_links,
-            'recent_week': recent_week,
-            'recent_month': recent_month,
-            'total_uses': total_uses,
-            'recent_uses': recent_uses,
-            'max_daily_peak': max_daily_peak,
-            'server_stats': server_stats,
-            'user_stats': user_stats,
-            'cached_links_count': cached_links_count,
-            'cache_coverage_percent': (cached_links_count * 100 // total_links) if total_links > 0 else 0,
-        })
-        
-        return super().changelist_view(request, extra_context)
-    
-    def get_ordering(self, request):
-        """Allow sorting by annotated fields"""
-        # Handle sorting by last_access_time if requested
-        order_var = request.GET.get('o')
-        if order_var:
-            try:
-                field_index = int(order_var.lstrip('-'))
-                # Check if this corresponds to the last_access column (index 6 in list_display)
-                if field_index == 6:  # last_access_display is at index 6
-                    if order_var.startswith('-'):
-                        return ['-last_access_time']
-                    else:
-                        return ['last_access_time']
-            except (ValueError, IndexError):
-                pass
-        
-        # Default ordering
-        return ['-acl__created_at', 'acl__user__username']
\ No newline at end of file
diff --git a/vpn/admin/base.py b/vpn/admin/base.py
deleted file mode 100644
index f76993d..0000000
--- a/vpn/admin/base.py
+++ /dev/null
@@ -1,57 +0,0 @@
-"""
-Base utilities and common imports for VPN admin interfaces
-"""
-import json
-import shortuuid
-from django.contrib import admin
-from django.utils.safestring import mark_safe
-from django.utils.html import format_html
-from django.db.models import Count
-from django.shortcuts import render, redirect
-from django.contrib import messages
-from django.urls import path, reverse
-from django.http import HttpResponseRedirect, JsonResponse
-from django.utils.timezone import localtime
-from django.db.models import Max, Subquery, OuterRef, Q
-
-from mysite.settings import EXTERNAL_ADDRESS
-
-
-def format_bytes(bytes_val):
-    """Format bytes to human readable format"""
-    for unit in ['B', 'KB', 'MB', 'GB', 'TB']:
-        if bytes_val < 1024.0:
-            return f"{bytes_val:.1f}{unit}"
-        bytes_val /= 1024.0
-    return f"{bytes_val:.1f}PB"
-
-
-class BaseVPNAdmin(admin.ModelAdmin):
-    """Base admin class with common functionality"""
-    
-    class Media:
-        css = {
-            'all': ('admin/css/vpn_admin.css',)
-        }
-    
-    def get_external_address(self):
-        """Get external address for links"""
-        return EXTERNAL_ADDRESS
-    
-    def format_hash_link(self, obj, hash_value):
-        """Format hash as clickable link"""
-        if not hash_value:
-            return mark_safe('<span style="color: #dc3545;">No hash</span>')
-        
-        portal_url = f"https://{EXTERNAL_ADDRESS}/u/{hash_value}"
-        return mark_safe(
-            f'<div style="display: flex; align-items: center; gap: 10px;">'
-            f'<code style="background: #f8f9fa; padding: 4px 8px; border-radius: 3px; font-size: 12px;">{hash_value[:12]}...</code>'
-            f'<a href="{portal_url}" target="_blank" style="color: #007cba; text-decoration: none;">🔗 Portal</a>'
-            f'</div>'
-        )
-
-
-class BaseListFilter(admin.SimpleListFilter):
-    """Base filter class with common functionality"""
-    pass
\ No newline at end of file
diff --git a/vpn/admin/logs.py b/vpn/admin/logs.py
deleted file mode 100644
index 4d01af5..0000000
--- a/vpn/admin/logs.py
+++ /dev/null
@@ -1,179 +0,0 @@
-"""
-Logging admin interfaces (TaskExecutionLog, AccessLog)
-"""
-from django.contrib import admin
-from django.utils.safestring import mark_safe
-from django.utils.html import format_html
-from django.shortcuts import redirect
-from django.contrib import messages
-from django.utils.timezone import localtime
-
-from vpn.models import TaskExecutionLog, AccessLog
-from .base import BaseVPNAdmin
-from vpn.utils import format_object
-
-
-@admin.register(TaskExecutionLog)
-class TaskExecutionLogAdmin(BaseVPNAdmin):
-    list_display = ('task_name_display', 'action', 'status_display', 'server', 'user', 'execution_time_display', 'created_at')
-    list_filter = ('task_name', 'status', 'server', 'created_at')
-    search_fields = ('task_id', 'task_name', 'action', 'user__username', 'server__name', 'message')
-    readonly_fields = ('task_id', 'task_name', 'server', 'user', 'action', 'status', 'message_formatted', 'execution_time', 'created_at')
-    ordering = ('-created_at',)
-    list_per_page = 100
-    date_hierarchy = 'created_at'
-    actions = ['trigger_full_sync', 'trigger_statistics_update']
-    
-    fieldsets = (
-        ('Task Information', {
-            'fields': ('task_id', 'task_name', 'action', 'status')
-        }),
-        ('Related Objects', {
-            'fields': ('server', 'user')
-        }),
-        ('Execution Details', {
-            'fields': ('message_formatted', 'execution_time', 'created_at')
-        }),
-    )
-    
-    def trigger_full_sync(self, request, queryset):
-        """Trigger manual full synchronization of all servers"""
-        # This action doesn't require selected items
-        try:
-            from vpn.tasks import sync_all_users
-            
-            # Start the sync task
-            task = sync_all_users.delay()
-            
-            self.message_user(
-                request,
-                f'Full synchronization started successfully. Task ID: {task.id}. Check logs below for progress.',
-                level=messages.SUCCESS
-            )
-            
-        except Exception as e:
-            self.message_user(
-                request,
-                f'Failed to start full synchronization: {e}',
-                level=messages.ERROR
-            )
-    
-    trigger_full_sync.short_description = "🔄 Trigger full sync of all servers"
-    
-    def trigger_statistics_update(self, request, queryset):
-        """Trigger manual update of user statistics cache"""
-        # This action doesn't require selected items
-        try:
-            from vpn.tasks import update_user_statistics
-            
-            # Start the statistics update task
-            task = update_user_statistics.delay()
-            
-            self.message_user(
-                request,
-                f'User statistics update started successfully. Task ID: {task.id}. Check logs below for progress.',
-                level=messages.SUCCESS
-            )
-            
-        except Exception as e:
-            self.message_user(
-                request,
-                f'Failed to start statistics update: {e}',
-                level=messages.ERROR
-            )
-    
-    trigger_statistics_update.short_description = "📊 Update user statistics cache"
-    
-    def get_actions(self, request):
-        """Remove default delete action for logs"""
-        actions = super().get_actions(request)
-        if 'delete_selected' in actions:
-            del actions['delete_selected']
-        return actions
-    
-    @admin.display(description='Task', ordering='task_name')
-    def task_name_display(self, obj):
-        task_names = {
-            'sync_all_servers': '🔄 Sync All',
-            'sync_server_users': '👥 Server Sync',
-            'sync_server_info': '⚙️ Server Info',
-            'sync_user_on_server': '👤 User Sync',
-            'cleanup_task_logs': '🧹 Cleanup',
-            'update_user_statistics': '📊 Statistics',
-        }
-        return task_names.get(obj.task_name, obj.task_name)
-    
-    @admin.display(description='Status', ordering='status')
-    def status_display(self, obj):
-        status_icons = {
-            'STARTED': '🟡 Started',
-            'SUCCESS': '✅ Success',
-            'FAILURE': '❌ Failed',
-            'RETRY': '🔄 Retry',
-        }
-        return status_icons.get(obj.status, obj.status)
-    
-    @admin.display(description='Time', ordering='execution_time')
-    def execution_time_display(self, obj):
-        if obj.execution_time:
-            if obj.execution_time < 1:
-                return f"{obj.execution_time*1000:.0f}ms"
-            else:
-                return f"{obj.execution_time:.2f}s"
-        return '-'
-    
-    @admin.display(description='Message')
-    def message_formatted(self, obj):
-        if obj.message:
-            return mark_safe(f"<pre style='white-space: pre-wrap; max-width: 800px;'>{obj.message}</pre>")
-        return '-'
-    
-    def has_add_permission(self, request):
-        return False
-    
-    def has_change_permission(self, request, obj=None):
-        return False
-    
-    def changelist_view(self, request, extra_context=None):
-        """Override to handle actions that don't require item selection"""
-        # Handle actions that don't require selection
-        if 'action' in request.POST:
-            action = request.POST['action']
-            if action == 'trigger_full_sync':
-                # Call the action directly without queryset requirement
-                self.trigger_full_sync(request, None)
-                # Return redirect to prevent AttributeError
-                return redirect(request.get_full_path())
-            elif action == 'trigger_statistics_update':
-                # Call the statistics update action
-                self.trigger_statistics_update(request, None)
-                # Return redirect to prevent AttributeError
-                return redirect(request.get_full_path())
-        
-        return super().changelist_view(request, extra_context)
-
-
-@admin.register(AccessLog)
-class AccessLogAdmin(BaseVPNAdmin):
-    list_display = ('user', 'server', 'acl_link_display', 'action', 'formatted_timestamp')
-    list_filter = ('user', 'server', 'action', 'timestamp')
-    search_fields = ('user', 'server', 'acl_link_id', 'action', 'timestamp', 'data')
-    readonly_fields = ('server', 'user', 'acl_link_id', 'formatted_timestamp', 'action', 'formated_data')
-
-    @admin.display(description='Link', ordering='acl_link_id')
-    def acl_link_display(self, obj):
-        if obj.acl_link_id:
-            return format_html(
-                '<span style="font-family: monospace; color: #2563eb;">{}</span>',
-                obj.acl_link_id[:12] + '...' if len(obj.acl_link_id) > 12 else obj.acl_link_id
-            )
-        return '-'
-
-    @admin.display(description='Timestamp')
-    def formatted_timestamp(self, obj):
-        local_time = localtime(obj.timestamp)
-        return local_time.strftime('%Y-%m-%d %H:%M:%S %Z')
-    
-    @admin.display(description='Details')
-    def formated_data(self, obj):
-        return format_object(obj.data)
\ No newline at end of file
diff --git a/vpn/admin/server.py b/vpn/admin/server.py
deleted file mode 100644
index b0f6dd1..0000000
--- a/vpn/admin/server.py
+++ /dev/null
@@ -1,864 +0,0 @@
-"""
-Server admin interface
-"""
-import re
-from polymorphic.admin import PolymorphicParentModelAdmin
-from django.contrib import admin
-from django.utils.safestring import mark_safe
-from django.utils.html import format_html
-from django.db.models import Count, Case, When, Value, IntegerField, F, Subquery, OuterRef
-from django.shortcuts import render, redirect, get_object_or_404
-from django.contrib import messages
-from django.urls import path, reverse
-from django.http import HttpResponseRedirect, JsonResponse
-
-from mysite.settings import EXTERNAL_ADDRESS
-from vpn.models import Server, ACL, ACLLink
-from .base import BaseVPNAdmin, format_bytes
-from vpn.server_plugins import (
-    OutlineServer,
-    WireguardServer,
-    XrayServerV2
-)
-
-
-@admin.register(Server)
-class ServerAdmin(PolymorphicParentModelAdmin, BaseVPNAdmin):
-    base_model = Server
-    child_models = (OutlineServer, WireguardServer, XrayServerV2)
-    list_display = ('name_with_icon', 'server_type', 'comment_short', 'user_stats', 'server_status_compact', 'registration_date')
-    search_fields = ('name', 'comment')
-    list_filter = ('server_type', )
-    actions = ['move_clients_action', 'purge_all_keys_action', 'sync_all_selected_servers', 'sync_xray_inbounds', 'check_status']
-    
-    class Media:
-        css = {
-            'all': ('admin/css/vpn_admin.css',)
-        }
-        js = ('admin/js/server_status_check.js',)
-
-    def get_urls(self):
-        urls = super().get_urls()
-        custom_urls = [
-            path('move-clients/', self.admin_site.admin_view(self.move_clients_view), name='server_move_clients'),
-            path('<int:server_id>/check-status/', self.admin_site.admin_view(self.check_server_status_view), name='server_check_status'),
-            path('<int:object_id>/sync/', self.admin_site.admin_view(self.sync_server_view), name='server_sync'),
-        ]
-        return custom_urls + urls
-
-    def move_clients_action(self, request, queryset):
-        """Custom action to move client links between servers"""
-        if queryset.count() == 0:
-            self.message_user(request, "Please select at least one server.", level=messages.ERROR)
-            return
-        
-        # Redirect to move clients page
-        selected_ids = ','.join(str(server.id) for server in queryset)
-        return HttpResponseRedirect(f"{reverse('admin:server_move_clients')}?servers={selected_ids}")
-
-    move_clients_action.short_description = "Move client links between servers"
-
-    def move_clients_view(self, request):
-        """View for moving clients between servers"""
-        if request.method == 'GET':
-            # Get selected servers from URL parameters
-            server_ids = request.GET.get('servers', '').split(',')
-            if not server_ids or server_ids == ['']:
-                messages.error(request, "No servers selected.")
-                return redirect('admin:vpn_server_changelist')
-            
-            try:
-                # Only work with database objects, don't check server connectivity
-                servers = Server.objects.filter(id__in=server_ids)
-                all_servers = Server.objects.all()
-                
-                # Get ACL links for selected servers with related data
-                # This is purely database operation, no server connectivity required
-                links_by_server = {}
-                for server in servers:
-                    try:
-                        # Get all ACL links for this server with user and ACL data
-                        links = ACLLink.objects.filter(
-                            acl__server=server
-                        ).select_related('acl__user', 'acl__server').order_by('acl__user__username', 'comment')
-                        links_by_server[server] = links
-                    except Exception as e:
-                        # Log the error but continue with other servers
-                        messages.warning(request, f"Warning: Could not load links for server {server.name}: {e}")
-                        links_by_server[server] = []
-                
-                context = {
-                    'title': 'Move Client Links Between Servers',
-                    'servers': servers,
-                    'all_servers': all_servers,
-                    'links_by_server': links_by_server,
-                }
-                
-                return render(request, 'admin/move_clients.html', context)
-                
-            except Exception as e:
-                messages.error(request, f"Database error while loading data: {e}")
-                return redirect('admin:vpn_server_changelist')
-        
-        elif request.method == 'POST':
-            # Process the transfer of ACL links - purely database operations
-            try:
-                source_server_id = request.POST.get('source_server')
-                target_server_id = request.POST.get('target_server')
-                selected_link_ids = request.POST.getlist('selected_links')
-                comment_regex = request.POST.get('comment_regex', '').strip()
-                
-                if not source_server_id or not target_server_id:
-                    messages.error(request, "Please select both source and target servers.")
-                    return redirect(request.get_full_path())
-                
-                if source_server_id == target_server_id:
-                    messages.error(request, "Source and target servers cannot be the same.")
-                    return redirect(request.get_full_path())
-                
-                if not selected_link_ids:
-                    messages.error(request, "Please select at least one link to move.")
-                    return redirect(request.get_full_path())
-                
-                # Parse and validate regex pattern if provided
-                regex_pattern = None
-                regex_replacement = None
-                regex_parts = None
-                if comment_regex:
-                    try:
-                        regex_parts = comment_regex.split(' -> ')
-                        if len(regex_parts) != 2:
-                            messages.error(request, "Invalid regex format. Use: pattern -> replacement")
-                            return redirect(request.get_full_path())
-                        
-                        pattern_str = regex_parts[0]
-                        replacement_str = regex_parts[1]
-                        
-                        # Convert JavaScript-style $1, $2, $3 to Python-style \1, \2, \3
-                        python_replacement = replacement_str
-                        # Replace $1, $2, etc. with \1, \2, etc. for Python regex
-                        python_replacement = re.sub(r'\$(\d+)', r'\\\1', replacement_str)
-                        
-                        # Test compile the regex pattern
-                        regex_pattern = re.compile(pattern_str)
-                        regex_replacement = python_replacement
-                        
-                        # Test the replacement on a sample string to validate syntax
-                        test_result = regex_pattern.sub(regex_replacement, "test sample")
-                        
-                    except re.error as e:
-                        messages.error(request, f"Invalid regular expression pattern '{regex_parts[0] if regex_parts else comment_regex}': {e}")
-                        return redirect(request.get_full_path())
-                    except Exception as e:
-                        messages.error(request, f"Error in regex replacement '{replacement_str if 'replacement_str' in locals() else 'unknown'}': {e}")
-                        return redirect(request.get_full_path())
-                
-                # Get server objects from database only
-                try:
-                    source_server = Server.objects.get(id=source_server_id)
-                    target_server = Server.objects.get(id=target_server_id)
-                except Server.DoesNotExist:
-                    messages.error(request, "One of the selected servers was not found in database.")
-                    return redirect('admin:vpn_server_changelist')
-                
-                moved_count = 0
-                errors = []
-                users_processed = set()
-                comments_transformed = 0
-                
-                # Process each selected link - database operations only
-                for link_id in selected_link_ids:
-                    try:
-                        # Get the ACL link with related ACL and user data
-                        acl_link = ACLLink.objects.select_related('acl__user', 'acl__server').get(
-                            id=link_id, 
-                            acl__server=source_server
-                        )
-                        user = acl_link.acl.user
-                        
-                        # Apply regex transformation to comment if provided
-                        original_comment = acl_link.comment
-                        if regex_pattern and regex_replacement is not None:
-                            try:
-                                # Use Python's re.sub for replacement, which properly handles $1, $2 groups
-                                new_comment = regex_pattern.sub(regex_replacement, original_comment)
-                                if new_comment != original_comment:
-                                    acl_link.comment = new_comment
-                                    comments_transformed += 1
-                                    # Debug logging - shows both original and converted patterns
-                                    print(f"DEBUG: Transformed '{original_comment}' -> '{new_comment}'")
-                                    print(f"  Original pattern: '{regex_parts[0]}' -> '{regex_parts[1]}'")
-                                    print(f"  Python pattern: '{regex_parts[0]}' -> '{regex_replacement}'")
-                            except Exception as e:
-                                errors.append(f"Error applying regex to link {link_id} ('{original_comment}'): {e}")
-                                # Continue with original comment
-                        
-                        # Check if user already has ACL on target server
-                        target_acl = ACL.objects.filter(user=user, server=target_server).first()
-                        
-                        if target_acl:
-                            created = False
-                        else:
-                            # Create new ACL without auto-creating default link
-                            target_acl = ACL(user=user, server=target_server)
-                            target_acl.save(auto_create_link=False)
-                            created = True
-                        
-                        # Move the link to target ACL - pure database operation
-                        acl_link.acl = target_acl
-                        acl_link.save()
-                        
-                        moved_count += 1
-                        users_processed.add(user.username)
-                        
-                        if created:
-                            messages.info(request, f"Created new ACL for user {user.username} on server {target_server.name}")
-                        
-                    except ACLLink.DoesNotExist:
-                        errors.append(f"Link with ID {link_id} not found on source server")
-                    except Exception as e:
-                        errors.append(f"Database error moving link {link_id}: {e}")
-                
-                # Clean up empty ACLs on source server - database operation only
-                try:
-                    empty_acls = ACL.objects.filter(
-                        server=source_server,
-                        links__isnull=True
-                    )
-                    deleted_acls_count = empty_acls.count()
-                    empty_acls.delete()
-                except Exception as e:
-                    messages.warning(request, f"Warning: Could not clean up empty ACLs: {e}")
-                    deleted_acls_count = 0
-                
-                if moved_count > 0:
-                    success_msg = (
-                        f"Successfully moved {moved_count} link(s) for {len(users_processed)} user(s) "
-                        f"from '{source_server.name}' to '{target_server.name}'. "
-                        f"Cleaned up {deleted_acls_count} empty ACL(s)."
-                    )
-                    if comments_transformed > 0:
-                        success_msg += f" Transformed {comments_transformed} comment(s) using regex."
-                    
-                    messages.success(request, success_msg)
-                
-                if errors:
-                    for error in errors:
-                        messages.error(request, error)
-                
-                return redirect('admin:vpn_server_changelist')
-                
-            except Exception as e:
-                messages.error(request, f"Database error during link transfer: {e}")
-                return redirect('admin:vpn_server_changelist')
-    
-    def check_server_status_view(self, request, server_id):
-        """AJAX view to check server status"""
-        import logging
-        
-        logger = logging.getLogger(__name__)
-        
-        if request.method == 'POST':
-            try:
-                logger.info(f"Checking status for server ID: {server_id}")
-                server = Server.objects.get(pk=server_id)
-                real_server = server.get_real_instance()
-                logger.info(f"Server found: {server.name}, type: {type(real_server).__name__}")
-                
-                # Check server status based on type
-                from vpn.server_plugins.outline import OutlineServer
-                # Old xray_core module removed - skip this server type
-                
-                if isinstance(real_server, OutlineServer):
-                    try:
-                        logger.info(f"Checking Outline server: {server.name}")
-                        # Try to get server info to check if it's online
-                        info = real_server.client.get_server_information()
-                        if info:
-                            logger.info(f"Server {server.name} is online with {info.get('accessKeyCount', info.get('access_key_count', 'unknown'))} keys")
-                            return JsonResponse({
-                                'success': True,
-                                'status': 'online',
-                                'message': f'Server is online. Keys: {info.get("accessKeyCount", info.get("access_key_count", "unknown"))}'
-                            })
-                        else:
-                            logger.warning(f"Server {server.name} returned no info")
-                            return JsonResponse({
-                                'success': True,
-                                'status': 'offline',
-                                'message': 'Server not responding'
-                            })
-                    except Exception as e:
-                        logger.error(f"Error checking Outline server {server.name}: {e}")
-                        return JsonResponse({
-                            'success': True,
-                            'status': 'error',
-                            'message': f'Connection error: {str(e)[:100]}'
-                        })
-                
-                elif isinstance(real_server, XrayServerV2):
-                    try:
-                        logger.info(f"Checking Xray v2 server: {server.name}")
-                        # Get server status from new Xray implementation
-                        status = real_server.get_server_status()
-                        if status and isinstance(status, dict):
-                            if status.get('accessible', False):
-                                message = f'✅ Server is {status.get("status", "accessible")}. '
-                                message += f'Host: {status.get("client_hostname", "N/A")}, '
-                                message += f'API: {status.get("api_address", "N/A")}'
-                                
-                                if status.get('api_connected'):
-                                    message += ' (Connected)'
-                                    # Add stats if available
-                                    api_stats = status.get('api_stats', {})
-                                    if api_stats and isinstance(api_stats, dict):
-                                        if 'connection' in api_stats:
-                                            message += f', Stats: {api_stats.get("connection", "ok")}'
-                                        if api_stats.get('library') == 'not_available':
-                                            message += ' [Basic check only]'
-                                elif status.get('api_error'):
-                                    message += f' ({status.get("api_error")})'
-                                
-                                message += f', Inbounds: {status.get("total_inbounds", 0)}'
-                                
-                                logger.info(f"Xray v2 server {server.name} status: {message}")
-                                return JsonResponse({
-                                    'success': True,
-                                    'status': 'online',
-                                    'message': message
-                                })
-                            else:
-                                error_msg = status.get('error') or status.get('api_error', 'Unknown error')
-                                logger.warning(f"Xray v2 server {server.name} not accessible: {error_msg}")
-                                return JsonResponse({
-                                    'success': True,
-                                    'status': 'offline',
-                                    'message': f'❌ Server not accessible: {error_msg}'
-                                })
-                        else:
-                            logger.warning(f"Xray v2 server {server.name} returned invalid status")
-                            return JsonResponse({
-                                'success': True,
-                                'status': 'offline',
-                                'message': 'Invalid server response'
-                            })
-                    except Exception as e:
-                        logger.error(f"Error checking Xray v2 server {server.name}: {e}")
-                        return JsonResponse({
-                            'success': True,
-                            'status': 'error',
-                            'message': f'Connection error: {str(e)[:100]}'
-                        })
-                
-                else:
-                    # For other server types, just return basic info
-                    logger.info(f"Server {server.name}, type: {server.server_type}")
-                    return JsonResponse({
-                        'success': True,
-                        'status': 'unknown',
-                        'message': f'Status check not implemented for {server.server_type} servers'
-                    })
-                    
-            except Server.DoesNotExist:
-                logger.error(f"Server with ID {server_id} not found")
-                return JsonResponse({
-                    'success': False,
-                    'error': 'Server not found'
-                }, status=404)
-            except Exception as e:
-                logger.error(f"Unexpected error checking server {server_id}: {e}")
-                return JsonResponse({
-                    'success': False,
-                    'error': f'Unexpected error: {str(e)}'
-                }, status=500)
-        
-        logger.warning(f"Invalid request method {request.method} for server status check")
-        return JsonResponse({
-            'success': False,
-            'error': 'Invalid request method'
-        }, status=405)
-
-    def purge_all_keys_action(self, request, queryset):
-        """Purge all keys from selected servers without changing database"""
-        if queryset.count() == 0:
-            self.message_user(request, "Please select at least one server.", level=messages.ERROR)
-            return
-        
-        success_count = 0
-        error_count = 0
-        total_keys_removed = 0
-        
-        for server in queryset:
-            try:
-                # Get the real polymorphic instance
-                real_server = server.get_real_instance()
-                server_type = type(real_server).__name__
-                
-                # Check if this is an Outline server
-                from vpn.server_plugins.outline import OutlineServer
-                
-                if isinstance(real_server, OutlineServer) and hasattr(real_server, 'client'):
-                    # For Outline servers, get all keys and delete them
-                    try:
-                        keys = real_server.client.get_keys()
-                        keys_count = len(keys)
-                        
-                        for key in keys:
-                            try:
-                                real_server.client.delete_key(key.key_id)
-                            except Exception as e:
-                                self.message_user(
-                                    request, 
-                                    f"Failed to delete key {key.key_id} from {server.name}: {e}",
-                                    level=messages.WARNING
-                                )
-                        
-                        total_keys_removed += keys_count
-                        success_count += 1
-                        self.message_user(
-                            request,
-                            f"Successfully purged {keys_count} keys from server '{server.name}'.",
-                            level=messages.SUCCESS
-                        )
-                        
-                    except Exception as e:
-                        error_count += 1
-                        self.message_user(
-                            request,
-                            f"Failed to connect to server '{server.name}': {e}",
-                            level=messages.ERROR
-                        )
-                else:
-                    self.message_user(
-                        request,
-                        f"Key purging only supported for Outline servers. Skipping '{server.name}' (type: {server_type}).",
-                        level=messages.INFO
-                    )
-                    
-            except Exception as e:
-                error_count += 1
-                self.message_user(
-                    request,
-                    f"Unexpected error with server '{server.name}': {e}",
-                    level=messages.ERROR
-                )
-        
-        # Summary message
-        if success_count > 0:
-            self.message_user(
-                request,
-                f"Purge completed! {success_count} server(s) processed, {total_keys_removed} total keys removed. "
-                f"Database unchanged - run sync to restore proper keys.",
-                level=messages.SUCCESS
-            )
-        
-        if error_count > 0:
-            self.message_user(
-                request,
-                f"{error_count} server(s) had errors during purge.",
-                level=messages.WARNING
-            )
-    
-    purge_all_keys_action.short_description = "🗑️ Purge all keys from server (database unchanged)"
-    
-    def sync_all_selected_servers(self, request, queryset):
-        """Trigger sync for all users on selected servers"""
-        if queryset.count() == 0:
-            self.message_user(request, "Please select at least one server.", level=messages.ERROR)
-            return
-        
-        try:
-            from vpn.tasks import sync_server_users
-            from celery import current_app
-            
-            tasks_started = 0
-            errors = []
-            scheduled_tasks = set()  # Track already scheduled tasks to avoid duplicates
-            
-            for server in queryset:
-                try:
-                    # Check if a task is already running for this server
-                    task_key = f"sync_server_{server.id}"
-                    
-                    # Use Celery's inspect to check active tasks (optional, for better UX)
-                    try:
-                        inspect = current_app.control.inspect()
-                        active_tasks = inspect.active()
-                        
-                        # Check if task is already scheduled for this server
-                        task_already_running = False
-                        if active_tasks:
-                            for worker, tasks in active_tasks.items():
-                                for task_info in tasks:
-                                    if task_info.get('name') == 'sync_server_users':
-                                        # Check if server.id is in the task args
-                                        task_args = task_info.get('args', [])
-                                        if task_args and len(task_args) > 0 and task_args[0] == server.id:
-                                            task_already_running = True
-                                            break
-                        
-                        if task_already_running:
-                            self.message_user(
-                                request,
-                                f"⏳ Sync already in progress for '{server.name}'",
-                                level=messages.WARNING
-                            )
-                            continue
-                    except Exception as e:
-                        # If we can't check active tasks, just proceed
-                        logger.debug(f"Could not check active tasks: {e}")
-                    
-                    # Avoid scheduling duplicate tasks in this batch
-                    if server.id in scheduled_tasks:
-                        continue
-                        
-                    task = sync_server_users.delay(server.id)
-                    scheduled_tasks.add(server.id)
-                    tasks_started += 1
-                    self.message_user(
-                        request,
-                        f"🔄 Sync task started for '{server.name}' (Task ID: {task.id})",
-                        level=messages.SUCCESS
-                    )
-                except Exception as e:
-                    errors.append(f"'{server.name}': {e}")
-            
-            if tasks_started > 0:
-                self.message_user(
-                    request,
-                    f"✅ Started sync tasks for {tasks_started} server(s). Check Task Execution Logs for progress.",
-                    level=messages.SUCCESS
-                )
-            
-            if errors:
-                for error in errors:
-                    self.message_user(
-                        request,
-                        f"❌ Failed to sync {error}",
-                        level=messages.ERROR
-                    )
-                    
-        except Exception as e:
-            self.message_user(
-                request,
-                f"❌ Failed to start sync tasks: {e}",
-                level=messages.ERROR
-            )
-    
-    sync_all_selected_servers.short_description = "🔄 Sync all users on selected servers"
-    
-    def check_status(self, request, queryset):
-        """Check status for selected servers"""
-        for server in queryset:
-            try:
-                status = server.get_server_status()
-                msg = f"{server.name}: {status.get('accessible', 'Unknown')} - {status.get('status', 'N/A')}"
-                self.message_user(request, msg, level=messages.INFO)
-            except Exception as e:
-                self.message_user(request, f"Error checking {server.name}: {e}", level=messages.ERROR)
-    check_status.short_description = "📊 Check server status"
-    
-    def sync_xray_inbounds(self, request, queryset):
-        """Sync inbounds for selected servers (Xray v2 only)"""
-        synced_count = 0
-        
-        for server in queryset:
-            try:
-                real_server = server.get_real_instance()
-                if isinstance(real_server, XrayServerV2):
-                    real_server.sync_inbounds()
-                    synced_count += 1
-                    self.message_user(request, f"Scheduled inbound sync for {server.name}", level=messages.SUCCESS)
-                else:
-                    self.message_user(request, f"{server.name} is not an Xray v2 server", level=messages.WARNING)
-            except Exception as e:
-                self.message_user(request, f"Error syncing inbounds for {server.name}: {e}", level=messages.ERROR)
-        
-        if synced_count > 0:
-            self.message_user(request, f"Scheduled inbound sync for {synced_count} server(s)", level=messages.SUCCESS)
-    sync_xray_inbounds.short_description = "🔧 Sync Xray inbounds"
-
-    @admin.display(description='Server', ordering='name')
-    def name_with_icon(self, obj):
-        """Display server name with type icon"""
-        icons = {
-            'outline': '🔵',
-            'wireguard': '🟢',
-            'xray_core': '🟣',
-            'xray_v2': '🟡',
-        }
-        icon = icons.get(obj.server_type, '')
-        name_part = f"{icon} {obj.name}" if icon else obj.name
-        return name_part
-    
-    @admin.display(description='Comment')
-    def comment_short(self, obj):
-        """Display shortened comment"""
-        if obj.comment:
-            short_comment = obj.comment[:40] + '...' if len(obj.comment) > 40 else obj.comment
-            return mark_safe(f'<span title="{obj.comment}" style="font-size: 12px;">{short_comment}</span>')
-        return '-'
-    
-    @admin.display(description='Users & Links')
-    def user_stats(self, obj):
-        """Display user count and active links statistics (optimized)"""
-        try:
-            from django.utils import timezone
-            from datetime import timedelta
-            
-            user_count = obj.user_count if hasattr(obj, 'user_count') else 0
-            
-            # Different logic for Xray vs legacy servers
-            if obj.server_type == 'xray_v2':
-                # For Xray servers, count inbounds and active subscriptions
-                from vpn.models_xray import ServerInbound
-                total_inbounds = ServerInbound.objects.filter(server=obj, active=True).count()
-                
-                # Count recent subscription accesses via AccessLog
-                thirty_days_ago = timezone.now() - timedelta(days=30)
-                from vpn.models import AccessLog
-                active_accesses = AccessLog.objects.filter(
-                    server='Xray-Subscription',
-                    action='Success',
-                    timestamp__gte=thirty_days_ago
-                ).values('user').distinct().count()
-                
-                total_links = total_inbounds
-                active_links = min(active_accesses, user_count)  # Can't be more than total users
-            else:
-                # Legacy servers: use ACL links as before
-                if hasattr(obj, 'acl_set'):
-                    all_links = []
-                    for acl in obj.acl_set.all():
-                        if hasattr(acl, 'links') and hasattr(acl.links, 'all'):
-                            all_links.extend(acl.links.all())
-                    
-                    total_links = len(all_links)
-                    
-                    # Count active links from prefetched data
-                    thirty_days_ago = timezone.now() - timedelta(days=30)
-                    active_links = sum(1 for link in all_links 
-                                     if link.last_access_time and link.last_access_time >= thirty_days_ago)
-                else:
-                    # Fallback to direct queries (less efficient)
-                    total_links = ACLLink.objects.filter(acl__server=obj).count()
-                    thirty_days_ago = timezone.now() - timedelta(days=30)
-                    active_links = ACLLink.objects.filter(
-                        acl__server=obj,
-                        last_access_time__isnull=False,
-                        last_access_time__gte=thirty_days_ago
-                    ).count()
-            
-            # Color coding based on activity
-            if user_count == 0:
-                color = '#9ca3af'  # gray - no users
-            elif total_links == 0:
-                color = '#dc2626'  # red - no links/inbounds
-            elif obj.server_type == 'xray_v2':
-                # For Xray: base on user activity rather than link activity
-                if active_links > user_count * 0.5:  # More than half users active
-                    color = '#16a34a'  # green
-                elif active_links > user_count * 0.2:  # More than 20% users active
-                    color = '#eab308'  # yellow
-                else:
-                    color = '#f97316'  # orange - low activity
-            else:
-                # Legacy servers: base on link activity
-                if total_links > 0 and active_links > total_links * 0.7:  # High activity
-                    color = '#16a34a'  # green
-                elif total_links > 0 and active_links > total_links * 0.3:  # Medium activity
-                    color = '#eab308'  # yellow
-                else:
-                    color = '#f97316'  # orange - low activity
-            
-            # Different display for Xray vs legacy
-            if obj.server_type == 'xray_v2':
-                # Try to get traffic stats if stats enabled
-                traffic_info = ""
-                # Get the real XrayServerV2 instance to access its fields
-                xray_server = obj.get_real_instance()
-                if hasattr(xray_server, 'stats_enabled') and xray_server.stats_enabled and xray_server.api_enabled:
-                    try:
-                        from vpn.xray_api_v2.client import XrayClient
-                        from vpn.xray_api_v2.stats import StatsManager
-                        
-                        client = XrayClient(server=xray_server.api_address)
-                        stats_manager = StatsManager(client)
-                        traffic_summary = stats_manager.get_traffic_summary()
-                        
-                        # Calculate total traffic
-                        total_uplink = 0
-                        total_downlink = 0
-                        
-                        # Sum up user traffic
-                        for user_email, user_traffic in traffic_summary.get('users', {}).items():
-                            total_uplink += user_traffic.get('uplink', 0)
-                            total_downlink += user_traffic.get('downlink', 0)
-                        
-                        # Format traffic
-                        
-                        if total_uplink > 0 or total_downlink > 0:
-                            traffic_info = f'<div style="color: #6b7280; font-size: 11px;">↑{format_bytes(total_uplink)} ↓{format_bytes(total_downlink)}</div>'
-                    except Exception as e:
-                        import logging
-                        logger = logging.getLogger(__name__)
-                        logger.debug(f"Could not get stats for Xray server {xray_server.name}: {e}")
-                
-                return mark_safe(
-                    f'<div style="font-size: 12px;">' +
-                    f'<div style="color: {color}; font-weight: bold;">👥 {user_count} users</div>' +
-                    f'<div style="color: #6b7280;">📡 {total_links} inbounds</div>' +
-                    traffic_info +
-                    f'</div>'
-                )
-            else:
-                return mark_safe(
-                    f'<div style="font-size: 12px;">' +
-                    f'<div style="color: {color}; font-weight: bold;">👥 {user_count} users</div>' +
-                    f'<div style="color: #6b7280;">🔗 {active_links}/{total_links} active</div>' +
-                    f'</div>'
-                )
-        except Exception as e:
-            import traceback
-            import logging
-            logger = logging.getLogger(__name__)
-            logger.error(f"Error in user_stats for server {obj.name}: {e}", exc_info=True)
-            return mark_safe(f'<span style="color: #dc2626; font-size: 11px;">Stats error: {e}</span>')
-    
-    @admin.display(description='Activity')
-    def activity_summary(self, obj):
-        """Display recent activity summary (optimized)"""
-        try:
-            # Simplified version - avoid heavy DB queries on list page
-            # This could be computed once per page load if needed
-            return mark_safe(
-                f'<div style="font-size: 11px; color: #6b7280;">' +
-                f'<div>📊 Activity data</div>' +
-                f'<div><small>Click to view details</small></div>' +
-                f'</div>'
-            )
-        except Exception as e:
-            return mark_safe(f'<span style="color: #dc2626; font-size: 11px;">Activity unavailable</span>')
-    
-    @admin.display(description='Status')
-    def server_status_compact(self, obj):
-        """Display server status in compact format (optimized)"""
-        try:
-            # Avoid expensive server connectivity checks on list page
-            # Show basic info and let users click to check status
-            server_type_icons = {
-                'outline': '🔵',
-                'wireguard': '🟢',
-                'xray_core': '🟣',
-            }
-            icon = server_type_icons.get(obj.server_type, '⚪')
-            
-            return mark_safe(
-                f'<div style="color: #6b7280; font-size: 11px;">' +
-                f'{icon} {obj.server_type.title()}<br>' +
-                f'<button type="button" class="check-status-btn btn btn-xs" '
-                f'data-server-id="{obj.id}" data-server-name="{obj.name}" '
-                f'data-server-type="{obj.server_type}" '
-                f'style="background: #007cba; color: white; border: none; padding: 2px 6px; '
-                f'border-radius: 3px; font-size: 10px; cursor: pointer;">'
-                f'⚪ Check Status'
-                f'</button>' +
-                f'</div>'
-            )
-        except Exception as e:
-            return mark_safe(
-                f'<div style="color: #f97316; font-size: 11px; font-weight: bold;">' +
-                f'⚠️ Error<br>' +
-                f'<span style="font-weight: normal;" title="{str(e)}">' +
-                f'{str(e)[:25]}...</span>' +
-                f'</div>'
-            )
-
-    def get_queryset(self, request):
-        from vpn.models_xray import UserSubscription, ServerInbound
-        
-        qs = super().get_queryset(request)
-        
-        # Count ACL users for all servers
-        qs = qs.annotate(
-            acl_user_count=Count('acl__user', distinct=True)
-        )
-        
-        # For Xray servers, calculate user count separately
-        # Create subquery to count Xray users
-        xray_user_count_subquery = ServerInbound.objects.filter(
-            server_id=OuterRef('pk'),
-            active=True,
-            inbound__subscriptiongroup__usersubscription__active=True,
-            inbound__subscriptiongroup__is_active=True
-        ).values('server_id').annotate(
-            count=Count('inbound__subscriptiongroup__usersubscription__user', distinct=True)
-        ).values('count')
-        
-        qs = qs.annotate(
-            xray_user_count=Subquery(xray_user_count_subquery, output_field=IntegerField()),
-            user_count=Case(
-                When(server_type='xray_v2', then=F('xray_user_count')),
-                default=F('acl_user_count'),
-                output_field=IntegerField()
-            )
-        )
-        
-        # Handle None values from subquery
-        qs = qs.annotate(
-            user_count=Case(
-                When(server_type='xray_v2', user_count__isnull=True, then=Value(0)),
-                When(server_type='xray_v2', then=F('xray_user_count')),
-                default=F('acl_user_count'),
-                output_field=IntegerField()
-            )
-        )
-        
-        qs = qs.prefetch_related(
-            'acl_set__links',
-            'acl_set__user'
-        )
-        return qs
-    
-    def sync_server_view(self, request, object_id):
-        """Dispatch sync to appropriate server type."""
-        try:
-            server = get_object_or_404(Server, pk=object_id)
-            real_server = server.get_real_instance()
-            
-            # Handle XrayServerV2
-            if isinstance(real_server, XrayServerV2):
-                return redirect(f'/admin/vpn/xrayserverv2/{real_server.pk}/sync/')
-            
-            # Fallback for other server types
-            else:
-                messages.info(request, f"Sync not implemented for server type: {real_server.server_type}")
-                return redirect('admin:vpn_server_changelist')
-            
-        except Exception as e:
-            messages.error(request, f"Error during sync: {e}")
-            return redirect('admin:vpn_server_changelist')
-
-
-# Inline for legacy VPN access (Outline/Wireguard)
-class UserACLInline(admin.TabularInline):
-    model = ACL
-    extra = 0
-    fields = ('server', 'created_at', 'link_count')
-    readonly_fields = ('created_at', 'link_count')
-    verbose_name = "Legacy VPN Server Access"
-    verbose_name_plural = "Legacy VPN Server Access (Outline/Wireguard)"
-    
-    def formfield_for_foreignkey(self, db_field, request, **kwargs):
-        if db_field.name == "server":
-            # Only show old-style servers (Outline/Wireguard)
-            kwargs["queryset"] = Server.objects.exclude(server_type='xray_v2')
-        return super().formfield_for_foreignkey(db_field, request, **kwargs)
-    
-    @admin.display(description='Links')
-    def link_count(self, obj):
-        count = obj.links.count()
-        return format_html(
-            '<span style="font-weight: bold;">{}</span> link(s)',
-            count
-        )
\ No newline at end of file
diff --git a/vpn/admin/user.py b/vpn/admin/user.py
deleted file mode 100644
index ce99f46..0000000
--- a/vpn/admin/user.py
+++ /dev/null
@@ -1,702 +0,0 @@
-"""
-User admin interface
-"""
-import shortuuid
-from django.contrib import admin
-from django.utils.safestring import mark_safe
-from django.utils.html import format_html
-from django.db.models import Count
-from django.shortcuts import get_object_or_404
-from django.contrib import messages
-from django.urls import path, reverse
-from django.http import HttpResponseRedirect, JsonResponse
-from django.utils.timezone import localtime
-
-from mysite.settings import EXTERNAL_ADDRESS
-from vpn.models import User, ACL, ACLLink, Server, AccessLog, UserStatistics
-from vpn.forms import UserForm
-from .base import BaseVPNAdmin, format_bytes
-
-
-@admin.register(User)
-class UserAdmin(BaseVPNAdmin):
-    form = UserForm
-    list_display = ('username', 'comment', 'registration_date', 'hash_link', 'server_count')
-    search_fields = ('username', 'hash', 'telegram_user_id', 'telegram_username')
-    readonly_fields = ('hash_link', 'vpn_access_summary', 'user_statistics_summary', 'telegram_info_display', 'subscription_management_info')
-    inlines = []  # Inlines will be added by subscription management function
-    
-    fieldsets = (
-        ('User Information', {
-            'fields': ('username', 'first_name', 'last_name', 'email', 'comment')
-        }),
-        ('Telegram Integration', {
-            'fields': ('telegram_username', 'telegram_info_display'),
-            'classes': ('collapse',),
-            'description': 'Link existing users to Telegram by setting telegram_username (without @)'
-        }),
-        ('Access Information', {
-            'fields': ('hash_link', 'is_active', 'vpn_access_summary')
-        }),
-        ('Statistics & Server Management', {
-            'fields': ('user_statistics_summary',),
-            'classes': ('wide',)
-        }),
-        ('Subscription Management', {
-            'fields': ('subscription_management_info',),
-            'classes': ('wide',),
-            'description': 'Manage user\'s Xray subscription groups. Use the "User\'s Subscription Groups" section below to add/remove subscriptions.'
-        }),
-    )
-
-    @admin.display(description='VPN Access Summary')
-    def vpn_access_summary(self, obj):
-        """Display summary of user's VPN access"""
-        if not obj.pk:
-            return "Save user first to see VPN access"
-        
-        # Get legacy VPN access
-        acl_count = ACL.objects.filter(user=obj).count()
-        legacy_links = ACLLink.objects.filter(acl__user=obj).count()
-        
-        # Get Xray access
-        from vpn.models_xray import UserSubscription
-        xray_subs = UserSubscription.objects.filter(user=obj, active=True).select_related('subscription_group')
-        xray_groups = [sub.subscription_group.name for sub in xray_subs]
-        
-        html = '<div style="background: #f8f9fa; padding: 15px; border-radius: 5px; margin: 10px 0;">'
-        
-        # Legacy VPN section
-        html += '<div style="margin-bottom: 15px;">'
-        html += '<h4 style="margin: 0 0 10px 0; color: #495057;">📡 Legacy VPN (Outline/Wireguard)</h4>'
-        if acl_count > 0:
-            html += f'<p style="margin: 5px 0;">✅ Access to <strong>{acl_count}</strong> server(s)</p>'
-            html += f'<p style="margin: 5px 0;">🔗 Total links: <strong>{legacy_links}</strong></p>'
-        else:
-            html += '<p style="margin: 5px 0; color: #6c757d;">No legacy VPN access</p>'
-        html += '</div>'
-        
-        # Xray section
-        html += '<div>'
-        html += '<h4 style="margin: 0 0 10px 0; color: #495057;">🚀 Xray VPN</h4>'
-        if xray_groups:
-            html += f'<p style="margin: 5px 0;">✅ Active subscriptions: <strong>{len(xray_groups)}</strong></p>'
-            html += '<ul style="margin: 5px 0; padding-left: 20px;">'
-            for group in xray_groups:
-                html += f'<li>{group}</li>'
-            html += '</ul>'
-            
-            # Try to get traffic statistics for this user
-            try:
-                from vpn.server_plugins.xray_v2 import XrayServerV2
-                traffic_total_up = 0
-                traffic_total_down = 0
-                servers_checked = set()
-                
-                # Get all Xray servers
-                xray_servers = XrayServerV2.objects.filter(api_enabled=True, stats_enabled=True)
-                
-                for server in xray_servers:
-                    if server.name not in servers_checked:
-                        try:
-                            from vpn.xray_api_v2.client import XrayClient
-                            from vpn.xray_api_v2.stats import StatsManager
-                            
-                            client = XrayClient(server=server.api_address)
-                            stats_manager = StatsManager(client)
-                            
-                            # Get user stats (use email format: username@servername)
-                            user_email = f"{obj.username}@{server.name}"
-                            user_stats = stats_manager.get_user_stats(user_email)
-                            
-                            if user_stats:
-                                traffic_total_up += user_stats.get('uplink', 0)
-                                traffic_total_down += user_stats.get('downlink', 0)
-                            
-                            servers_checked.add(server.name)
-                        except Exception as e:
-                            import logging
-                            logger = logging.getLogger(__name__)
-                            logger.debug(f"Could not get user stats from server {server.name}: {e}")
-                
-                # Format traffic if we got any
-                if traffic_total_up > 0 or traffic_total_down > 0:
-                    
-                    html += f'<p style="margin: 10px 0 5px 0; color: #007cba;"><strong>📊 Traffic Statistics:</strong></p>'
-                    html += f'<p style="margin: 5px 0 5px 20px;">↑ Upload: <strong>{format_bytes(traffic_total_up)}</strong></p>'
-                    html += f'<p style="margin: 5px 0 5px 20px;">↓ Download: <strong>{format_bytes(traffic_total_down)}</strong></p>'
-            except Exception as e:
-                import logging
-                logger = logging.getLogger(__name__)
-                logger.debug(f"Could not get traffic stats for user {obj.username}: {e}")
-        else:
-            html += '<p style="margin: 5px 0; color: #6c757d;">No Xray subscriptions</p>'
-        html += '</div>'
-        
-        html += '</div>'
-        
-        return format_html(html)
-    
-    @admin.display(description='User Portal', ordering='hash')
-    def hash_link(self, obj):
-        portal_url = f"{EXTERNAL_ADDRESS}/u/{obj.hash}"
-        json_url = f"{EXTERNAL_ADDRESS}/stat/{obj.hash}"
-        return format_html(
-            '<div style="display: flex; gap: 10px; flex-wrap: wrap;">' + 
-            '<a href="{}" target="_blank" style="background: #4ade80; color: #000; padding: 4px 8px; border-radius: 4px; text-decoration: none; font-size: 12px; font-weight: bold;">🌐 Portal</a>' +
-            '<a href="{}" target="_blank" style="background: #3b82f6; color: #fff; padding: 4px 8px; border-radius: 4px; text-decoration: none; font-size: 12px; font-weight: bold;">📄 JSON</a>' +
-            '</div>',
-            portal_url, json_url
-        )
-    
-    @admin.display(description='User Statistics Summary')
-    def user_statistics_summary(self, obj):
-        """Display user statistics with integrated server management"""
-        try:
-            from vpn.models import UserStatistics
-            from django.db import models
-            
-            # Get statistics for this user
-            user_stats = UserStatistics.objects.filter(user=obj).aggregate(
-                total_connections=models.Sum('total_connections'),
-                recent_connections=models.Sum('recent_connections'),
-                total_links=models.Count('id'),
-                max_daily_peak=models.Max('max_daily')
-            )
-            
-            # Get server breakdown
-            server_breakdown = UserStatistics.objects.filter(user=obj).values('server_name').annotate(
-                connections=models.Sum('total_connections'),
-                links=models.Count('id')
-            ).order_by('-connections')
-            
-            # Get all ACLs and links for this user
-            user_acls = ACL.objects.filter(user=obj).select_related('server').prefetch_related('links')
-            
-            # Get available servers not yet assigned
-            all_servers = Server.objects.all()
-            assigned_server_ids = [acl.server.id for acl in user_acls]
-            unassigned_servers = all_servers.exclude(id__in=assigned_server_ids)
-            
-            html = '<div class="user-management-section">'
-            
-            # Overall Statistics
-            html += '<div style="background: #e7f3ff; border-left: 4px solid #007cba; padding: 12px; margin-bottom: 16px; border-radius: 4px;">'
-            html += f'<div style="display: flex; gap: 20px; margin-bottom: 8px; flex-wrap: wrap;">'
-            html += f'<div><strong>Total Uses:</strong> {user_stats["total_connections"] or 0}</div>'
-            html += f'<div><strong>Recent (30d):</strong> {user_stats["recent_connections"] or 0}</div>'
-            html += f'<div><strong>Total Links:</strong> {user_stats["total_links"] or 0}</div>'
-            if user_stats["max_daily_peak"]:
-                html += f'<div><strong>Daily Peak:</strong> {user_stats["max_daily_peak"]}</div>'
-            html += f'</div>'
-            html += '</div>'
-            
-            # Server Management
-            if user_acls:
-                html += '<h4 style="color: #007cba; margin: 16px 0 8px 0;">🔗 Server Access & Links</h4>'
-                
-                for acl in user_acls:
-                    server = acl.server
-                    links = list(acl.links.all())
-                    
-                    # Server header (no slow server status checks)
-                    # Determine server type icon and label
-                    if server.server_type == 'Outline':
-                        type_icon = '🔵'
-                        type_label = 'Outline'
-                    elif server.server_type == 'Wireguard':
-                        type_icon = '🟢'
-                        type_label = 'Wireguard'
-                    elif server.server_type in ['xray_core', 'xray_v2']:
-                        type_icon = '🟣'
-                        type_label = 'Xray'
-                    else:
-                        type_icon = '❓'
-                        type_label = server.server_type
-                    
-                    html += f'<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px;">'
-                    html += f'<h5 style="margin: 0; color: #333; font-size: 14px; font-weight: 600;">{type_icon} {server.name} ({type_label})</h5>'
-                    
-                    # Server stats
-                    server_stat = next((s for s in server_breakdown if s['server_name'] == server.name), None)
-                    if server_stat:
-                        html += f'<span style="background: #f8f9fa; padding: 4px 8px; border-radius: 4px; font-size: 12px; color: #6c757d;">'
-                        html += f'📊 {server_stat["connections"]} uses ({server_stat["links"]} links)'
-                        html += f'</span>'
-                    html += f'</div>'
-                    
-                    html += '<div class="server-section">'
-                    
-                    # Links display
-                    if links:
-                        for link in links:
-                            # Get link stats
-                            link_stats = UserStatistics.objects.filter(
-                                user=obj, server_name=server.name, acl_link_id=link.link
-                            ).first()
-                            
-                            html += '<div class="link-item">'
-                            html += f'<div style="flex: 1;">'
-                            html += f'<div style="font-family: monospace; font-size: 13px; color: #007cba; font-weight: 500;">'
-                            html += f'{link.link[:16]}...' if len(link.link) > 16 else link.link
-                            html += f'</div>'
-                            if link.comment:
-                                html += f'<div style="font-size: 11px; color: #6c757d;">{link.comment}</div>'
-                            html += f'</div>'
-                            
-                            # Link stats and actions
-                            html += f'<div style="display: flex; gap: 8px; align-items: center; flex-wrap: wrap;">'
-                            if link_stats:
-                                html += f'<span style="background: #d4edda; color: #155724; padding: 2px 6px; border-radius: 3px; font-size: 10px;">'
-                                html += f'✨ {link_stats.total_connections}'
-                                html += f'</span>'
-                            
-                            # Test link button
-                            html += f'<a href="{EXTERNAL_ADDRESS}/ss/{link.link}#{server.name}" target="_blank" '
-                            html += f'class="btn btn-sm btn-primary btn-sm-custom">🔗</a>'
-                            
-                            # Delete button
-                            html += f'<button type="button" class="btn btn-sm btn-danger btn-sm-custom delete-link-btn" '
-                            html += f'data-link-id="{link.id}" data-link-name="{link.link[:12]}">🗑️</button>'
-                            
-                            # Last access
-                            if link.last_access_time:
-                                local_time = localtime(link.last_access_time)
-                                html += f'<span style="background: #f8f9fa; padding: 2px 6px; border-radius: 3px; font-size: 10px; color: #6c757d;">'
-                                html += f'{local_time.strftime("%m-%d %H:%M")}'
-                                html += f'</span>'
-                            else:
-                                html += f'<span style="background: #f8d7da; color: #721c24; padding: 2px 6px; border-radius: 3px; font-size: 10px;">'
-                                html += f'Never'
-                                html += f'</span>'
-                            
-                            html += f'</div></div>'
-                    
-                    # Add link button
-                    html += f'<div style="text-align: center; margin-top: 12px;">'
-                    html += f'<button type="button" class="btn btn-sm btn-success add-link-btn" '
-                    html += f'data-server-id="{server.id}" data-server-name="{server.name}">'
-                    html += f'➕ Add Link'
-                    html += f'</button>'
-                    html += f'</div>'
-                    
-                    html += '</div>'  # End server-section
-            
-            # Add server access section
-            if unassigned_servers:
-                html += '<div style="background: #d1ecf1; border-left: 4px solid #bee5eb; padding: 12px; margin-top: 16px; border-radius: 4px;">'
-                html += '<h5 style="margin: 0 0 8px 0; color: #0c5460; font-size: 13px;">➕ Available Servers</h5>'
-                html += '<div style="display: flex; gap: 8px; flex-wrap: wrap;">'
-                for server in unassigned_servers:
-                    # Determine server type icon and label
-                    if server.server_type == 'Outline':
-                        type_icon = '🔵'
-                        type_label = 'Outline'
-                    elif server.server_type == 'Wireguard':
-                        type_icon = '🟢'
-                        type_label = 'Wireguard'
-                    elif server.server_type in ['xray_core', 'xray_v2']:
-                        type_icon = '🟣'
-                        type_label = 'Xray'
-                    else:
-                        type_icon = '❓'
-                        type_label = server.server_type
-                    
-                    html += f'<button type="button" class="btn btn-sm btn-outline-info btn-sm-custom add-server-btn" '
-                    html += f'data-server-id="{server.id}" data-server-name="{server.name}" '
-                    html += f'title="{type_label} server">'
-                    html += f'{type_icon} {server.name} ({type_label})'
-                    html += f'</button>'
-                html += '</div></div>'
-            
-            html += '</div>'  # End user-management-section
-            return mark_safe(html)
-            
-        except Exception as e:
-            return mark_safe(f'<span style="color: #dc3545;">Error loading management interface: {e}</span>')
-    
-    @admin.display(description='Recent Activity')
-    def recent_activity_display(self, obj):
-        """Display recent activity in compact admin-friendly format"""
-        try:
-            from datetime import timedelta
-            from django.utils import timezone
-            
-            # Get recent access logs for this user (last 7 days, limited)
-            seven_days_ago = timezone.now() - timedelta(days=7)
-            recent_logs = AccessLog.objects.filter(
-                user=obj.username,
-                timestamp__gte=seven_days_ago
-            ).order_by('-timestamp')[:15]  # Limit to 15 most recent
-            
-            if not recent_logs:
-                return mark_safe('<div style="color: #6c757d; font-style: italic; padding: 12px; background: #f8f9fa; border-radius: 4px;">No recent activity (last 7 days)</div>')
-            
-            html = '<div style="background: #f8f9fa; border: 1px solid #dee2e6; border-radius: 4px; padding: 0; max-height: 300px; overflow-y: auto;">'
-            
-            # Header
-            html += '<div style="background: #e9ecef; padding: 8px 12px; border-bottom: 1px solid #dee2e6; font-weight: 600; font-size: 12px; color: #495057;">'
-            html += f'📊 Recent Activity ({recent_logs.count()} entries, last 7 days)'
-            html += '</div>'
-            
-            # Activity entries
-            for i, log in enumerate(recent_logs):
-                bg_color = '#ffffff' if i % 2 == 0 else '#f8f9fa'
-                local_time = localtime(log.timestamp)
-                
-                # Status icon and color
-                if log.action == 'Success':
-                    icon = '✅'
-                    status_color = '#28a745'
-                elif log.action == 'Failed':
-                    icon = '❌'
-                    status_color = '#dc3545'
-                else:
-                    icon = 'ℹ️'
-                    status_color = '#6c757d'
-                
-                html += f'<div style="display: flex; justify-content: space-between; align-items: center; padding: 6px 12px; border-bottom: 1px solid #f1f3f4; background: {bg_color};">' 
-                
-                # Left side - server and link info
-                html += f'<div style="display: flex; gap: 8px; align-items: center; flex: 1; min-width: 0;">'
-                html += f'<span style="color: {status_color}; font-size: 14px;">{icon}</span>'
-                html += f'<div style="overflow: hidden;">'
-                html += f'<div style="font-weight: 500; font-size: 12px; color: #495057; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{log.server}</div>'
-                
-                if log.acl_link_id:
-                    link_short = log.acl_link_id[:12] + '...' if len(log.acl_link_id) > 12 else log.acl_link_id
-                    html += f'<div style="font-family: monospace; font-size: 10px; color: #6c757d;">{link_short}</div>'
-                
-                html += f'</div></div>'
-                
-                # Right side - timestamp and status
-                html += f'<div style="text-align: right; flex-shrink: 0;">'
-                html += f'<div style="font-size: 10px; color: #6c757d;">{local_time.strftime("%m-%d %H:%M")}</div>'
-                html += f'<div style="font-size: 9px; color: {status_color}; font-weight: 500;">{log.action}</div>'
-                html += f'</div>'
-                
-                html += f'</div>'
-            
-            # Footer with summary if there are more entries
-            total_recent = AccessLog.objects.filter(
-                user=obj.username,
-                timestamp__gte=seven_days_ago
-            ).count()
-            
-            if total_recent > 15:
-                html += f'<div style="background: #e9ecef; padding: 6px 12px; font-size: 11px; color: #6c757d; text-align: center;">'
-                html += f'Showing 15 of {total_recent} entries from last 7 days'
-                html += f'</div>'
-            
-            html += '</div>'
-            return mark_safe(html)
-            
-        except Exception as e:
-            return mark_safe(f'<span style="color: #dc3545; font-size: 12px;">Error loading activity: {e}</span>')
-
-    @admin.display(description='Telegram Account')
-    def telegram_info_display(self, obj):
-        """Display Telegram account information"""
-        if not obj.telegram_user_id:
-            if obj.telegram_username:
-                return mark_safe(f'<div style="background: #fff3cd; padding: 10px; border-radius: 5px; border-left: 4px solid #ffc107;">'
-                               f'<span style="color: #856404;">🔗 Ready to link: @{obj.telegram_username}</span><br/>'
-                               f'<small>User will be automatically linked when they message the bot</small></div>')
-            else:
-                return mark_safe('<span style="color: #6c757d;">No Telegram account linked</span>')
-        
-        html = '<div style="background: #f8f9fa; padding: 15px; border-radius: 5px; margin: 10px 0;">'
-        html += '<h4 style="margin: 0 0 10px 0; color: #495057;">📱 Telegram Account Information</h4>'
-        
-        # Telegram User ID
-        html += f'<p style="margin: 5px 0;"><strong>User ID:</strong> <code>{obj.telegram_user_id}</code></p>'
-        
-        # Telegram Username
-        if obj.telegram_username:
-            html += f'<p style="margin: 5px 0;"><strong>Username:</strong> @{obj.telegram_username}</p>'
-        
-        # Telegram Names
-        name_parts = []
-        if obj.telegram_first_name:
-            name_parts.append(obj.telegram_first_name)
-        if obj.telegram_last_name:
-            name_parts.append(obj.telegram_last_name)
-        
-        if name_parts:
-            full_name = ' '.join(name_parts)
-            html += f'<p style="margin: 5px 0;"><strong>Name:</strong> {full_name}</p>'
-        
-        # Telegram Phone (if available)
-        if obj.telegram_phone:
-            html += f'<p style="margin: 5px 0;"><strong>Phone:</strong> {obj.telegram_phone}</p>'
-        
-        # Access requests count (if any)
-        try:
-            from telegram_bot.models import AccessRequest
-            requests_count = AccessRequest.objects.filter(telegram_user_id=obj.telegram_user_id).count()
-            if requests_count > 0:
-                html += f'<p style="margin: 10px 0 5px 0; color: #007cba;"><strong>📝 Access Requests:</strong> {requests_count}</p>'
-                
-                # Show latest request status
-                latest_request = AccessRequest.objects.filter(telegram_user_id=obj.telegram_user_id).order_by('-created_at').first()
-                if latest_request:
-                    status_color = '#28a745' if latest_request.approved else '#ffc107'
-                    status_text = 'Approved' if latest_request.approved else 'Pending'
-                    html += f'<p style="margin: 5px 0 5px 20px;">Latest: <span style="color: {status_color}; font-weight: bold;">{status_text}</span></p>'
-        except:
-            pass  # Telegram bot app might not be available
-        
-        # Add unlink button
-        unlink_url = reverse('admin:vpn_user_unlink_telegram', args=[obj.pk])
-        html += f'<div style="margin-top: 15px; padding-top: 10px; border-top: 1px solid #dee2e6;">'
-        html += f'<a href="{unlink_url}" class="button" style="background: #dc3545; color: white; text-decoration: none; padding: 8px 15px; border-radius: 3px; font-size: 13px;" onclick="return confirm(\'Are you sure you want to unlink this Telegram account?\')">🔗💥 Unlink Telegram Account</a>'
-        html += '</div>'
-        
-        html += '</div>'
-        return mark_safe(html)
-
-    @admin.display(description='Subscription Management')
-    def subscription_management_info(self, obj):
-        """Display subscription management information and quick access"""
-        if not obj.pk:
-            return "Save user first to manage subscriptions"
-        
-        try:
-            from vpn.models_xray import UserSubscription, SubscriptionGroup
-            
-            # Get user's current subscriptions
-            user_subscriptions = UserSubscription.objects.filter(user=obj).select_related('subscription_group')
-            active_subs = user_subscriptions.filter(active=True)
-            inactive_subs = user_subscriptions.filter(active=False)
-            
-            # Get available subscription groups
-            all_groups = SubscriptionGroup.objects.filter(is_active=True)
-            subscribed_group_ids = user_subscriptions.values_list('subscription_group_id', flat=True)
-            available_groups = all_groups.exclude(id__in=subscribed_group_ids)
-            
-            html = '<div style="background: #f8f9fa; padding: 15px; border-radius: 5px; margin: 10px 0;">'
-            html += '<h4 style="margin: 0 0 15px 0; color: #495057;">🚀 Xray Subscription Management</h4>'
-            
-            # Active subscriptions
-            if active_subs.exists():
-                html += '<div style="margin-bottom: 15px;">'
-                html += '<h5 style="color: #28a745; margin: 0 0 8px 0;">✅ Active Subscriptions</h5>'
-                for sub in active_subs:
-                    html += f'<div style="background: #d4edda; padding: 8px 12px; border-radius: 4px; margin: 4px 0; display: flex; justify-content: space-between; align-items: center;">'
-                    html += f'<span><strong>{sub.subscription_group.name}</strong>'
-                    if sub.subscription_group.description:
-                        html += f' - {sub.subscription_group.description[:50]}{"..." if len(sub.subscription_group.description) > 50 else ""}'
-                    html += f'</span>'
-                    html += f'<small style="color: #155724;">Since: {sub.created_at.strftime("%Y-%m-%d")}</small>'
-                    html += f'</div>'
-                html += '</div>'
-            
-            # Inactive subscriptions
-            if inactive_subs.exists():
-                html += '<div style="margin-bottom: 15px;">'
-                html += '<h5 style="color: #dc3545; margin: 0 0 8px 0;">❌ Inactive Subscriptions</h5>'
-                for sub in inactive_subs:
-                    html += f'<div style="background: #f8d7da; padding: 8px 12px; border-radius: 4px; margin: 4px 0;">'
-                    html += f'<span style="color: #721c24;"><strong>{sub.subscription_group.name}</strong></span>'
-                    html += f'</div>'
-                html += '</div>'
-            
-            # Available subscription groups
-            if available_groups.exists():
-                html += '<div style="margin-bottom: 15px;">'
-                html += '<h5 style="color: #007cba; margin: 0 0 8px 0;">➕ Available Subscription Groups</h5>'
-                html += '<div style="display: flex; gap: 8px; flex-wrap: wrap;">'
-                for group in available_groups[:10]:  # Limit to avoid clutter
-                    html += f'<span style="background: #cce7ff; color: #004085; padding: 4px 8px; border-radius: 3px; font-size: 12px;">'
-                    html += f'{group.name}'
-                    html += f'</span>'
-                if available_groups.count() > 10:
-                    html += f'<span style="color: #6c757d; font-style: italic;">+{available_groups.count() - 10} more...</span>'
-                html += '</div>'
-                html += '</div>'
-            
-            # Quick access links
-            html += '<div style="border-top: 1px solid #dee2e6; padding-top: 12px; margin-top: 15px;">'
-            html += '<h5 style="margin: 0 0 8px 0; color: #495057;">🔗 Quick Access</h5>'
-            html += '<div style="display: flex; gap: 10px; flex-wrap: wrap;">'
-            
-            # Link to standalone UserSubscription admin
-            subscription_admin_url = f"/admin/vpn/usersubscription/?user__id__exact={obj.id}"
-            html += f'<a href="{subscription_admin_url}" class="button" style="background: #007cba; color: white; text-decoration: none; padding: 6px 12px; border-radius: 3px; font-size: 12px;">📋 Manage All Subscriptions</a>'
-            
-            # Link to add new subscription
-            add_subscription_url = f"/admin/vpn/usersubscription/add/?user={obj.id}"
-            html += f'<a href="{add_subscription_url}" class="button" style="background: #28a745; color: white; text-decoration: none; padding: 6px 12px; border-radius: 3px; font-size: 12px;">➕ Add New Subscription</a>'
-            
-            # Link to subscription groups admin  
-            groups_admin_url = "/admin/vpn/subscriptiongroup/"
-            html += f'<a href="{groups_admin_url}" class="button" style="background: #17a2b8; color: white; text-decoration: none; padding: 6px 12px; border-radius: 3px; font-size: 12px;">⚙️ Manage Groups</a>'
-            
-            html += '</div>'
-            html += '</div>'
-            
-            # Statistics
-            total_subs = user_subscriptions.count()
-            if total_subs > 0:
-                html += '<div style="border-top: 1px solid #dee2e6; padding-top: 8px; margin-top: 10px;">'
-                html += f'<small style="color: #6c757d;">📊 Total: {total_subs} subscription(s) | Active: {active_subs.count()} | Inactive: {inactive_subs.count()}</small>'
-                html += '</div>'
-            
-            html += '</div>'
-            return mark_safe(html)
-            
-        except Exception as e:
-            return mark_safe(f'<div style="background: #f8d7da; padding: 10px; border-radius: 4px; color: #721c24;">❌ Error loading subscription management: {e}</div>')
-
-    @admin.display(description='Allowed servers', ordering='server_count')
-    def server_count(self, obj):
-        return obj.server_count
-    
-    def get_queryset(self, request):
-        qs = super().get_queryset(request)
-        qs = qs.annotate(server_count=Count('acl'))
-        return qs
-    
-    def get_urls(self):
-        """Add custom URLs for link management"""
-        urls = super().get_urls()
-        custom_urls = [
-            path('<int:user_id>/add-link/', self.admin_site.admin_view(self.add_link_view), name='user_add_link'),
-            path('<int:user_id>/delete-link/<int:link_id>/', self.admin_site.admin_view(self.delete_link_view), name='user_delete_link'),
-            path('<int:user_id>/add-server-access/', self.admin_site.admin_view(self.add_server_access_view), name='user_add_server_access'),
-            path('<int:user_id>/unlink-telegram/', self.admin_site.admin_view(self.unlink_telegram_view), name='vpn_user_unlink_telegram'),
-        ]
-        return custom_urls + urls
-    
-    def add_link_view(self, request, user_id):
-        """AJAX view to add a new link for user on specific server"""
-        if request.method == 'POST':
-            try:
-                user = User.objects.get(pk=user_id)
-                server_id = request.POST.get('server_id')
-                comment = request.POST.get('comment', '')
-                
-                if not server_id:
-                    return JsonResponse({'error': 'Server ID is required'}, status=400)
-                
-                server = Server.objects.get(pk=server_id)
-                acl = ACL.objects.get(user=user, server=server)
-                
-                # Create new link
-                new_link = ACLLink.objects.create(
-                    acl=acl,
-                    comment=comment,
-                    link=shortuuid.ShortUUID().random(length=16)
-                )
-                
-                return JsonResponse({
-                    'success': True,
-                    'link_id': new_link.id,
-                    'link': new_link.link,
-                    'comment': new_link.comment,
-                    'url': f"{EXTERNAL_ADDRESS}/ss/{new_link.link}#{server.name}"
-                })
-                
-            except Exception as e:
-                return JsonResponse({'error': str(e)}, status=500)
-        
-        return JsonResponse({'error': 'Invalid request method'}, status=405)
-    
-    def delete_link_view(self, request, user_id, link_id):
-        """AJAX view to delete a specific link"""
-        if request.method == 'POST':
-            try:
-                user = User.objects.get(pk=user_id)
-                link = ACLLink.objects.get(pk=link_id, acl__user=user)
-                link.delete()
-                
-                return JsonResponse({'success': True})
-                
-            except Exception as e:
-                return JsonResponse({'error': str(e)}, status=500)
-        
-        return JsonResponse({'error': 'Invalid request method'}, status=405)
-    
-    def add_server_access_view(self, request, user_id):
-        """AJAX view to add server access for user"""
-        if request.method == 'POST':
-            try:
-                user = User.objects.get(pk=user_id)
-                server_id = request.POST.get('server_id')
-                
-                if not server_id:
-                    return JsonResponse({'error': 'Server ID is required'}, status=400)
-                
-                server = Server.objects.get(pk=server_id)
-                
-                # Check if ACL already exists
-                if ACL.objects.filter(user=user, server=server).exists():
-                    return JsonResponse({'error': 'User already has access to this server'}, status=400)
-                
-                # Create new ACL (with default link)
-                acl = ACL.objects.create(user=user, server=server)
-                
-                return JsonResponse({
-                    'success': True,
-                    'server_name': server.name,
-                    'server_type': server.server_type,
-                    'acl_id': acl.id
-                })
-                
-            except Exception as e:
-                return JsonResponse({'error': str(e)}, status=500)
-        
-        return JsonResponse({'error': 'Invalid request method'}, status=405)
-    
-    def unlink_telegram_view(self, request, user_id):
-        """Unlink Telegram account from user"""
-        user = get_object_or_404(User, pk=user_id)
-        
-        if request.method == 'GET':
-            # Store original Telegram info for logging
-            telegram_info = {
-                'user_id': user.telegram_user_id,
-                'username': user.telegram_username,
-                'first_name': user.telegram_first_name,
-                'last_name': user.telegram_last_name
-            }
-            
-            # Clear all Telegram fields
-            user.telegram_user_id = None
-            user.telegram_username = ""
-            user.telegram_first_name = ""
-            user.telegram_last_name = ""
-            user.telegram_phone = ""
-            user.save()
-            
-            # Also clean up any related access requests
-            try:
-                from telegram_bot.models import AccessRequest
-                AccessRequest.objects.filter(telegram_user_id=telegram_info['user_id']).delete()
-            except:
-                pass  # Telegram bot app might not be available
-            
-            messages.success(
-                request, 
-                f"Telegram account {'@' + telegram_info['username'] if telegram_info['username'] else telegram_info['user_id']} "
-                f"has been unlinked from user '{user.username}'"
-            )
-            
-        return HttpResponseRedirect(reverse('admin:vpn_user_change', args=[user_id]))
-    
-    def change_view(self, request, object_id, form_url='', extra_context=None):
-        """Override change view to add user management data and fix layout"""
-        extra_context = extra_context or {}
-        
-        if object_id:
-            try:
-                user = User.objects.get(pk=object_id)
-                extra_context.update({
-                    'user_object': user,
-                    'external_address': EXTERNAL_ADDRESS,
-                })
-                
-            except User.DoesNotExist:
-                pass
-        
-        return super().change_view(request, object_id, form_url, extra_context)
\ No newline at end of file
diff --git a/vpn/admin_minimal.py b/vpn/admin_minimal.py
deleted file mode 100644
index 4549623..0000000
--- a/vpn/admin_minimal.py
+++ /dev/null
@@ -1,73 +0,0 @@
-"""
-Minimal admin test to check execution
-"""
-
-import logging
-logger = logging.getLogger(__name__)
-import json
-from django.contrib import admin
-from django.utils.safestring import mark_safe
-
-# Try importing server plugins
-try:
-    from .server_plugins import (
-        XrayServerV2,
-        XrayServerV2Admin
-    )
-except Exception as e:
-    logger.error(f"🔴 Failed to import server plugins: {e}")
-
-# Try importing refactored admin modules
-try:
-    from .admin import *
-except Exception as e:
-    logger.error(f"🔴 Failed to import refactored admin modules: {e}")
-    import traceback
-    logger.error(f"Traceback: {traceback.format_exc()}")
-
-# Try importing Xray admin classes
-try:
-    from .admin_xray import *
-except Exception as e:
-    logger.error(f"🔴 Failed to import Xray admin classes: {e}")
-    import traceback
-    logger.error(f"Traceback: {traceback.format_exc()}")
-
-# Set custom admin site configuration
-admin.site.site_title = "VPN Manager"
-admin.site.site_header = "VPN Manager"
-admin.site.index_title = "OutFleet"
-
-# Try adding custom Celery admin interfaces
-try:
-    from django_celery_results.models import TaskResult
-    
-    # Unregister default TaskResult admin if it exists
-    try:
-        admin.site.unregister(TaskResult)
-    except admin.sites.NotRegistered:
-        pass
-    
-    
-    @admin.register(TaskResult)
-    class CustomTaskResultAdmin(admin.ModelAdmin):
-        list_display = ('task_name_display', 'status', 'date_created')
-        
-        @admin.display(description='Task Name', ordering='task_name')
-        def task_name_display(self, obj):
-            return obj.task_name
-    
-    
-except ImportError:
-    pass  # Celery not available
-
-# Add subscription management to User admin
-try:
-    from vpn.admin.user import add_subscription_management_to_user
-    from django.contrib.admin import site
-    for model, admin_instance in site._registry.items():
-        if model.__name__ == 'User' and hasattr(admin_instance, 'fieldsets'):
-            add_subscription_management_to_user(admin_instance.__class__)
-            break
-except Exception as e:
-    logger.error(f"Failed to add subscription management: {e}")
\ No newline at end of file
diff --git a/vpn/admin_test.py b/vpn/admin_test.py
deleted file mode 100644
index 54bd1a8..0000000
--- a/vpn/admin_test.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-Test admin file to check if code execution works
-"""
-
-import logging
-logger = logging.getLogger(__name__)
-logger.info("🧪 TEST ADMIN FILE EXECUTING!")
-
-from django.contrib import admin
-from .models import User
-
-@admin.register(User)
-class TestUserAdmin(admin.ModelAdmin):
-    list_display = ('username',)
-
-logger.info("🧪 TEST ADMIN FILE COMPLETED!")
\ No newline at end of file
diff --git a/vpn/admin_xray.py b/vpn/admin_xray.py
deleted file mode 100644
index 38c4254..0000000
--- a/vpn/admin_xray.py
+++ /dev/null
@@ -1,1056 +0,0 @@
-"""
-Admin interface for new Xray models.
-"""
-
-import json
-import logging
-
-logger = logging.getLogger(__name__)
-
-# Export all admin classes for import *
-__all__ = [
-    'CredentialsAdmin',
-    'CredentialsHiddenAdmin', 
-    'CertificateAdmin',
-    'CertificateTabAdmin',
-    'InboundAdmin',
-    'InboundTabAdmin',
-    'SubscriptionGroupAdmin',
-    'UnifiedXRayAdmin',
-    'UserSubscriptionAdmin',
-    'UserSubscriptionTabAdmin',
-    'ServerInboundAdmin',
-    'InboundInline',
-    'UserSubscriptionInline',
-    'add_subscription_management_to_user'
-]
-from django.contrib import admin, messages
-from django.utils.safestring import mark_safe
-from django.utils.html import format_html
-from django.db import models
-from django.forms import CheckboxSelectMultiple, Textarea
-from django.shortcuts import render, redirect
-from django.urls import path, reverse
-from django.http import JsonResponse, HttpResponseRedirect
-
-try:
-    from .models_xray import (
-        Credentials, Certificate,
-        Inbound, SubscriptionGroup, UserSubscription, ServerInbound
-    )
-except Exception as e:
-    logger.error(f"Failed to import Xray models: {e}")
-    import traceback
-    logger.error(f"Traceback: {traceback.format_exc()}")
-    raise
-
-
-
-# Credentials admin available through direct URL but not in main menu
-class CredentialsAdmin(admin.ModelAdmin):
-    """Admin for credentials management (accessible via direct URL only)"""
-    list_display = ('name', 'cred_type', 'description', 'created_at')
-    list_filter = ('cred_type',)
-    search_fields = ('name', 'description')
-    
-    fieldsets = (
-        ('Basic Information', {
-            'fields': ('name', 'cred_type', 'description')
-        }),
-        ('Credentials Data', {
-            'fields': ('credentials_help', 'credentials'),
-            'description': 'Enter credentials as JSON'
-        }),
-        ('Preview', {
-            'fields': ('credentials_display',),
-            'classes': ('collapse',),
-        }),
-        ('Timestamps', {
-            'fields': ('created_at', 'updated_at'),
-            'classes': ('collapse',)
-        })
-    )
-    
-    readonly_fields = ('credentials_display', 'credentials_help', 'created_at', 'updated_at')
-    
-    formfield_overrides = {
-        models.JSONField: {'widget': Textarea(attrs={'rows': 6, 'style': 'font-family: monospace;'})},
-    }
-    
-    def credentials_help(self, obj):
-        """Display help for different credential formats"""
-        examples = {
-            'cloudflare': {
-                'api_token': 'your_cloudflare_api_token_here'
-            },
-            'digitalocean': {
-                'token': 'your_digitalocean_token_here'
-            },
-            'aws_route53': {
-                'access_key_id': 'your_access_key_id',
-                'secret_access_key': 'your_secret_access_key',
-                'region': 'us-east-1'
-            }
-        }
-        
-        html = '<div style="background: #f8f9fa; padding: 15px; border-radius: 4px; margin-bottom: 10px;">'
-        html += '<h4>JSON Examples:</h4>'
-        
-        for cred_type, example in examples.items():
-            html += '<div style="margin: 10px 0;">'
-            html += '<strong>' + cred_type.title() + ':</strong>'
-            json_str = json.dumps(example, indent=2)
-            html += '<pre style="background: white; padding: 8px; border-radius: 3px; font-size: 12px;">' + json_str + '</pre>'
-            html += '</div>'
-        
-        html += '<p><strong>Note:</strong> Make sure your JSON is valid. Use double quotes for strings.</p>'
-        html += '</div>'
-        
-        return mark_safe(html)
-    credentials_help.short_description = 'Credentials Format Help'
-    
-    def credentials_display(self, obj):
-        """Display credentials in a safe format"""
-        if obj.credentials:
-            # Hide sensitive values
-            safe_creds = {}
-            for key, value in obj.credentials.items():
-                if any(sensitive in key.lower() for sensitive in ['token', 'key', 'password', 'secret']):
-                    safe_creds[key] = '*' * 8
-                else:
-                    safe_creds[key] = value
-            
-            return format_html(
-                '<pre style="background: #f4f4f4; padding: 10px; border-radius: 4px;">{}</pre>',
-                json.dumps(safe_creds, indent=2)
-            )
-        return '-'
-    credentials_display.short_description = 'Credentials (Preview)'
-
-# Register Credentials admin but hide from main menu for Django + button functionality
-@admin.register(Credentials)
-class CredentialsHiddenAdmin(CredentialsAdmin):
-    """Credentials admin hidden from main menu but available for + button"""
-    
-    def has_module_permission(self, request):
-        """Hide this model from the main admin index"""
-        return False
-
-
-class CertificateAdmin(admin.ModelAdmin):
-    """Admin for certificate management"""
-    list_display = (
-        'domain', 'cert_type', 'status_display', 
-        'expires_at', 'auto_renew', 'action_buttons'
-    )
-    list_filter = ('cert_type', 'auto_renew')
-    search_fields = ('domain',)
-    actions = ['rotate_selected_certificates']
-    
-    fieldsets = (
-        ('Certificate Request', {
-            'fields': ('domain', 'cert_type', 'acme_email', 'auto_renew'),
-            'description': 'For Let\'s Encrypt certificates, provide email for ACME registration and select/create credentials below.'
-        }),
-        ('API Credentials', {
-            'fields': ('credentials',),
-            'description': 'Select API credentials for automatic Let\'s Encrypt certificate generation'
-        }),
-        ('Certificate Generation Status', {
-            'fields': ('generation_help',),
-            'classes': ('wide',)
-        }),
-        ('Certificate Data', {
-            'fields': ('certificate_info', 'certificate_pem', 'private_key_pem'),
-            'classes': ('collapse',),
-            'description': 'Detailed certificate information'
-        }),
-        ('Renewal Settings', {
-            'fields': ('last_renewed',),
-            'classes': ('collapse',)
-        }),
-        ('Timestamps', {
-            'fields': ('created_at', 'updated_at'),
-            'classes': ('collapse',)
-        })
-    )
-    
-    readonly_fields = (
-        'certificate_info', 'status_display', 'generation_help',
-        'expires_at', 'last_renewed', 'created_at', 'updated_at'
-    )
-    
-    def generation_help(self, obj):
-        """Show help text for certificate generation"""
-        if not obj.pk:
-            return mark_safe('<div style="background: #e3f2fd; padding: 10px; border-radius: 4px;">'
-                           '<p><strong>How it works:</strong></p>'
-                           '<ol>'
-                           '<li>Fill in the domain name</li>'
-                           '<li>Select certificate type (Let\'s Encrypt recommended)</li>'
-                           '<li>For Let\'s Encrypt: provide email for ACME account registration</li>'
-                           '<li>Select credentials with Cloudflare API token</li>'
-                           '<li>Save - certificate will be generated automatically</li>'
-                           '</ol>'
-                           '</div>')
-        
-        if obj.cert_type == 'letsencrypt' and not obj.certificate_pem:
-            return mark_safe('<div style="background: #fff3e0; padding: 10px; border-radius: 4px;">'
-                           '<p><strong>⏳ Certificate not generated yet</strong></p>'
-                           '<p>Certificate will be generated automatically using Let\'s Encrypt DNS-01 challenge.</p>'
-                           '</div>')
-        
-        if obj.certificate_pem:
-            days = obj.days_until_expiration if obj.days_until_expiration is not None else 'Unknown'
-            return mark_safe('<div style="background: #e8f5e8; padding: 10px; border-radius: 4px;">'
-                           '<p><strong>✅ Certificate generated successfully</strong></p>'
-                           f'<p>Expires: {obj.expires_at}</p>'
-                           f'<p>Days remaining: {days}</p>'
-                           '</div>')
-        
-        return '-'
-    generation_help.short_description = 'Certificate Generation Status'
-    
-    def status_display(self, obj):
-        """Display certificate status"""
-        if obj.is_expired:
-            return format_html(
-                '<span style="color: red;">❌ Expired</span>'
-            )
-        elif obj.needs_renewal:
-            return format_html(
-                '<span style="color: orange;">⚠️ Needs renewal ({} days)</span>',
-                obj.days_until_expiration
-            )
-        else:
-            return format_html(
-                '<span style="color: green;">✅ Valid ({} days)</span>',
-                obj.days_until_expiration
-            )
-    status_display.short_description = 'Status'
-    
-    def certificate_preview(self, obj):
-        """Preview certificate info"""
-        if obj.certificate_pem:
-            lines = obj.certificate_pem.strip().split('\n')
-            preview = '\n'.join(lines[:5] + ['...'] + lines[-3:])
-            return format_html(
-                '<pre style="background: #f4f4f4; padding: 10px; font-family: monospace; font-size: 12px;">{}</pre>',
-                preview
-            )
-        return '-'
-    certificate_preview.short_description = 'Certificate Preview'
-    
-    def action_buttons(self, obj):
-        """Action buttons for certificate"""
-        buttons = []
-        
-        if obj.needs_renewal and obj.auto_renew:
-            renew_url = reverse('admin:certificate_renew', args=[obj.pk])
-            buttons.append(
-                f'<a href="{renew_url}" class="button" style="background: #ff9800;">🔄 Renew Now</a>'
-            )
-        
-        if obj.cert_type == 'self_signed':
-            regenerate_url = reverse('admin:certificate_regenerate', args=[obj.pk])
-            buttons.append(
-                f'<a href="{regenerate_url}" class="button">🔄 Regenerate</a>'
-            )
-        
-        return format_html(' '.join(buttons)) if buttons else '-'
-    action_buttons.short_description = 'Actions'
-    
-    def get_urls(self):
-        urls = super().get_urls()
-        custom_urls = [
-            path('<int:cert_id>/renew/',
-                 self.admin_site.admin_view(self.renew_certificate_view),
-                 name='certificate_renew'),
-            path('<int:cert_id>/regenerate/',
-                 self.admin_site.admin_view(self.regenerate_certificate_view),
-                 name='certificate_regenerate'),
-        ]
-        return custom_urls + urls
-    
-    def renew_certificate_view(self, request, cert_id):
-        """Renew Let's Encrypt certificate"""
-        try:
-            cert = Certificate.objects.get(pk=cert_id)
-            # TODO: Implement renewal logic
-            messages.success(request, f'Certificate for {cert.domain} renewed successfully!')
-        except Exception as e:
-            messages.error(request, f'Failed to renew certificate: {e}')
-        
-        return redirect('admin:vpn_certificate_change', cert_id)
-    
-    def regenerate_certificate_view(self, request, cert_id):
-        """Regenerate self-signed certificate"""
-        try:
-            cert = Certificate.objects.get(pk=cert_id)
-            # TODO: Implement regeneration logic
-            messages.success(request, f'Certificate for {cert.domain} regenerated successfully!')
-        except Exception as e:
-            messages.error(request, f'Failed to regenerate certificate: {e}')
-        
-        return redirect('admin:vpn_certificate_change', cert_id)
-    
-    def save_model(self, request, obj, form, change):
-        """Auto-generate certificate for Let's Encrypt after saving"""
-        super().save_model(request, obj, form, change)
-        
-        # Auto-generate Let's Encrypt certificate if needed
-        if obj.cert_type == 'letsencrypt' and not obj.certificate_pem:
-            try:
-                self.generate_letsencrypt_certificate(obj, request)
-            except Exception as e:
-                messages.warning(request, f'Certificate saved but auto-generation failed: {e}')
-    
-    def generate_letsencrypt_certificate(self, cert_obj, request):
-        """Generate Let's Encrypt certificate using DNS-01 challenge"""
-        if not cert_obj.credentials:
-            messages.error(request, 'Credentials required for Let\'s Encrypt certificate generation')
-            return
-        
-        if not cert_obj.acme_email:
-            messages.error(request, 'ACME email address required for Let\'s Encrypt certificate generation')
-            return
-        
-        try:
-            from vpn.letsencrypt.letsencrypt_dns import get_certificate_for_domain
-            from datetime import datetime, timedelta
-            from django.utils import timezone
-            
-            # Get Cloudflare credentials
-            api_token = cert_obj.credentials.get_credential('api_token')
-            
-            if not api_token:
-                messages.error(request, 'Cloudflare API token not found in credentials')
-                return
-            
-            messages.info(request, f'🔄 Generating Let\'s Encrypt certificate for {cert_obj.domain} using {cert_obj.acme_email}...')
-            
-            # Schedule certificate generation via Celery
-            from vpn.tasks import generate_certificate_task
-            task = generate_certificate_task.delay(cert_obj.id)
-            
-            messages.success(
-                request, 
-                f'🔄 Certificate generation scheduled for {cert_obj.domain}. Task ID: {task.id}'
-            )
-            
-        except ImportError:
-            messages.warning(request, 'Let\'s Encrypt DNS challenge library not available')
-        except Exception as e:
-            messages.error(request, f'Failed to generate certificate: {str(e)}')
-            # Log the full error for debugging
-            import logging
-            logger = logging.getLogger(__name__)
-            logger.error(f'Certificate generation failed for {cert_obj.domain}: {e}', exc_info=True)
-
-    def certificate_info(self, obj):
-        """Display detailed certificate information"""
-        if not obj.pk:
-            return "Save certificate to see details"
-        
-        if not obj.certificate_pem:
-            return "Certificate not generated yet"
-            
-        html = '<div style="background: #f8f9fa; padding: 15px; border-radius: 4px;">'
-        
-        # Import here to avoid circular imports
-        try:
-            from cryptography import x509
-            from cryptography.hazmat.backends import default_backend
-            
-            # Parse certificate
-            cert = x509.load_pem_x509_certificate(obj.certificate_pem.encode(), default_backend())
-            
-            # Basic info
-            html += '<h4>📜 Certificate Information</h4>'
-            html += '<table style="width: 100%; font-size: 12px;">'
-            html += f'<tr><td><strong>Subject:</strong></td><td>{cert.subject.rfc4514_string()}</td></tr>'
-            html += f'<tr><td><strong>Issuer:</strong></td><td>{cert.issuer.rfc4514_string()}</td></tr>'
-            html += f'<tr><td><strong>Serial Number:</strong></td><td>{cert.serial_number}</td></tr>'
-            # Use UTC versions to avoid deprecation warnings
-            try:
-                # Try new UTC properties first (cryptography >= 42.0.0)
-                valid_from = cert.not_valid_before_utc
-                valid_until = cert.not_valid_after_utc
-                cert_not_after = valid_until
-            except AttributeError:
-                # Fall back to old properties for older cryptography versions
-                valid_from = cert.not_valid_before
-                valid_until = cert.not_valid_after
-                cert_not_after = cert.not_valid_after
-                if cert_not_after.tzinfo is None:
-                    cert_not_after = cert_not_after.replace(tzinfo=timezone.utc)
-            
-            html += f'<tr><td><strong>Valid From:</strong></td><td>{valid_from}</td></tr>'
-            html += f'<tr><td><strong>Valid Until:</strong></td><td>{valid_until}</td></tr>'
-            
-            # Status
-            from datetime import datetime, timezone
-            now = datetime.now(timezone.utc)
-            
-            days_until_expiry = (cert_not_after - now).days
-            
-            if days_until_expiry < 0:
-                status = f'<span style="color: red;">❌ Expired {abs(days_until_expiry)} days ago</span>'
-            elif days_until_expiry < 30:
-                status = f'<span style="color: orange;">⚠️ Expires in {days_until_expiry} days</span>'
-            else:
-                status = f'<span style="color: green;">✅ Valid for {days_until_expiry} days</span>'
-            
-            html += f'<tr><td><strong>Status:</strong></td><td>{status}</td></tr>'
-            
-            # Extensions
-            try:
-                san = cert.extensions.get_extension_for_oid(x509.ExtensionOID.SUBJECT_ALTERNATIVE_NAME)
-                domains = [name.value for name in san.value]
-                html += f'<tr><td><strong>Domains:</strong></td><td>{", ".join(domains)}</td></tr>'
-            except:
-                # No SAN extension or other error
-                pass
-            
-            html += '</table>'
-            
-        except ImportError:
-            html += '<p>⚠️ Install cryptography package to see detailed certificate information</p>'
-        except Exception as e:
-            html += f'<p>❌ Error parsing certificate: {e}</p>'
-        
-        html += '</div>'
-        return mark_safe(html)
-    certificate_info.short_description = 'Certificate Details'
-    
-    def rotate_selected_certificates(self, request, queryset):
-        """Admin action to rotate selected certificates"""
-        from vpn.tasks import generate_certificate_task
-        
-        # Filter only Let's Encrypt certificates
-        valid_certs = queryset.filter(cert_type='letsencrypt')
-        if not valid_certs.exists():
-            self.message_user(request, "No Let's Encrypt certificates selected. Only Let's Encrypt certificates can be rotated.", level='ERROR')
-            return
-        
-        # Check for certificates without credentials
-        certs_without_creds = valid_certs.filter(credentials__isnull=True)
-        if certs_without_creds.exists():
-            domains = ', '.join(certs_without_creds.values_list('domain', flat=True))
-            self.message_user(request, f"The following certificates have no credentials configured and will be skipped: {domains}", level='WARNING')
-        
-        # Filter certificates that have credentials
-        certs_to_rotate = valid_certs.filter(credentials__isnull=False)
-        
-        if not certs_to_rotate.exists():
-            self.message_user(request, "No certificates with valid credentials found.", level='ERROR')
-            return
-        
-        # Launch rotation tasks
-        rotated_count = 0
-        task_ids = []
-        
-        for certificate in certs_to_rotate:
-            try:
-                task = generate_certificate_task.delay(certificate.id)
-                task_ids.append(task.id)
-                rotated_count += 1
-            except Exception as e:
-                self.message_user(request, f"Failed to start rotation for {certificate.domain}: {str(e)}", level='ERROR')
-        
-        if rotated_count > 0:
-            domains = ', '.join(certs_to_rotate.values_list('domain', flat=True))
-            task_list = ', '.join(task_ids)
-            self.message_user(
-                request,
-                f'Successfully initiated certificate rotation for {rotated_count} certificate(s): {domains}. '
-                f'Task IDs: {task_list}. Certificates will be automatically redeployed to all servers once generated.',
-                level='SUCCESS'
-            )
-        
-    rotate_selected_certificates.short_description = "🔄 Rotate selected Let's Encrypt certificates"
-
-
-class InboundAdmin(admin.ModelAdmin):
-    """Admin for inbound template management"""
-    list_display = (
-        'name', 'protocol', 'port', 'network', 
-        'security', 'group_count'
-    )
-    list_filter = ('protocol', 'network', 'security')
-    search_fields = ('name',)
-    
-    fieldsets = (
-        ('Basic Configuration', {
-            'fields': ('name', 'protocol', 'port'),
-            'description': 'Certificates are configured per-server in Server admin → Inbound Templates tab'
-        }),
-        ('Transport & Security', {
-            'fields': ('network', 'security', 'listen_address')
-        }),
-        ('Advanced Settings', {
-            'fields': ('enable_sniffing', 'full_config_display'),
-            'classes': ('collapse',),
-            'description': 'Configuration is auto-generated based on basic settings above'
-        }),
-        ('Timestamps', {
-            'fields': ('created_at', 'updated_at'),
-            'classes': ('collapse',)
-        })
-    )
-    
-    readonly_fields = ('full_config_display', 'created_at', 'updated_at')
-    
-    def group_count(self, obj):
-        """Number of groups this inbound belongs to"""
-        return obj.subscriptiongroup_set.count()
-    group_count.short_description = 'Groups'
-    
-    def full_config_display(self, obj):
-        """Display full config in formatted JSON"""
-        if obj.full_config:
-            return format_html(
-                '<pre style="background: #f4f4f4; padding: 10px; border-radius: 4px; max-height: 400px; overflow-y: auto;">{}</pre>',
-                json.dumps(obj.full_config, indent=2)
-            )
-        return 'Not generated yet'
-    full_config_display.short_description = 'Configuration Preview'
-    
-    def save_model(self, request, obj, form, change):
-        """Generate config on save"""
-        try:
-            # Always regenerate config to reflect any changes
-            obj.build_config()
-            if change:
-                messages.success(request, f'✅ Inbound "{obj.name}" updated. Changes will be automatically deployed to servers.')
-            else:
-                messages.success(request, f'✅ Inbound "{obj.name}" created. It will be deployed when added to subscription groups.')
-        except Exception as e:
-            messages.warning(request, f'Inbound saved but config generation failed: {e}')
-            # Set empty dict if generation fails
-            if not obj.full_config:
-                obj.full_config = {}
-        
-        super().save_model(request, obj, form, change)
-
-
-class InboundInline(admin.TabularInline):
-    """Inline for inbounds in subscription groups"""
-    model = SubscriptionGroup.inbounds.through
-    extra = 1
-    verbose_name = "Inbound"
-    verbose_name_plural = "Inbounds in this group"
-
-
-class SubscriptionGroupAdmin(admin.ModelAdmin):
-    """Admin for subscription groups"""
-    list_display = ('name', 'is_active', 'inbound_count', 'user_count', 'created_at')
-    list_filter = ('is_active',)
-    search_fields = ('name', 'description')
-    filter_horizontal = ('inbounds',)
-    
-    fieldsets = (
-        ('Group Information', {
-            'fields': ('name', 'description', 'is_active')
-        }),
-        ('Inbounds', {
-            'fields': ('inbounds',),
-            'description': 'Select inbounds to include in this group. ' +
-                         '<br><strong>🚀 Auto-sync enabled:</strong> Changes will be automatically deployed to servers!'
-        }),
-        ('Statistics', {
-            'fields': ('group_statistics',),
-            'classes': ('collapse',)
-        })
-    )
-    
-    readonly_fields = ('group_statistics',)
-    
-    def save_model(self, request, obj, form, change):
-        """Override save to notify about auto-sync"""
-        super().save_model(request, obj, form, change)
-        if change:
-            messages.success(
-                request, 
-                f'Subscription group "{obj.name}" updated. Changes will be automatically synchronized to all Xray servers.'
-            )
-        else:
-            messages.success(
-                request, 
-                f'Subscription group "{obj.name}" created. Inbounds will be automatically deployed when you add them to this group.'
-            )
-    
-    def group_statistics(self, obj):
-        """Display group statistics"""
-        if obj.pk:
-            stats = {
-                'Total Inbounds': obj.inbound_count,
-                'Active Users': obj.user_count,
-                'Protocols': list(obj.inbounds.values_list('protocol', flat=True).distinct()),
-                'Ports': list(obj.inbounds.values_list('port', flat=True).distinct())
-            }
-            
-            html = '<div style="background: #f4f4f4; padding: 10px; border-radius: 4px;">'
-            for key, value in stats.items():
-                if isinstance(value, list):
-                    value = ', '.join(map(str, value))
-                html += f'<div><strong>{key}:</strong> {value}</div>'
-            html += '</div>'
-            
-            return format_html(html)
-        return 'Save to see statistics'
-    group_statistics.short_description = 'Group Statistics'
-
-
-
-class UserSubscriptionInline(admin.TabularInline):
-    """Inline for user subscriptions"""
-    model = UserSubscription
-    extra = 0
-    fields = ('subscription_group', 'active', 'created_at')
-    readonly_fields = ('created_at',)
-    verbose_name = "Subscription Group"
-    verbose_name_plural = "User's Subscription Groups"
-
-
-# Extension for User admin
-def add_subscription_management_to_user(UserAdminClass):
-    """Add subscription management to existing User admin"""
-    
-    # Add inline to the User admin class
-    if hasattr(UserAdminClass, 'inlines'):
-        if UserSubscriptionInline not in UserAdminClass.inlines:
-            UserAdminClass.inlines = list(UserAdminClass.inlines) + [UserSubscriptionInline]
-    else:
-        UserAdminClass.inlines = [UserSubscriptionInline]
-
-
-# UserSubscription admin will be integrated into unified Subscriptions admin
-class UserSubscriptionAdmin(admin.ModelAdmin):
-    """Admin for user subscriptions (integrated into unified Subscriptions admin)"""
-    list_display = ('user', 'subscription_group', 'active', 'created_at')
-    list_filter = ('active', 'subscription_group')
-    search_fields = ('user__username', 'subscription_group__name')
-    date_hierarchy = 'created_at'
-    
-    def has_add_permission(self, request):
-        return True  # Allow adding subscriptions
-
-
-# ServerInbound admin is integrated into XrayServerV2 admin, not shown in main menu
-class ServerInboundAdmin(admin.ModelAdmin):
-    """Admin for server-inbound deployment tracking"""
-    list_display = ('server', 'inbound', 'certificate_status', 'active', 'deployed_at', 'updated_at')
-    list_filter = ('active', 'inbound__protocol', 'deployed_at')
-    search_fields = ('server__name', 'inbound__name')
-    date_hierarchy = 'deployed_at'
-    
-    fieldsets = (
-        ('Template Deployment', {
-            'fields': ('server', 'inbound', 'active')
-        }),
-        ('Certificate Configuration', {
-            'fields': ('certificate', 'certificate_info'),
-            'description': 'Certificate for TLS. If not specified, will be auto-selected by server hostname.'
-        }),
-        ('Timestamps', {
-            'fields': ('deployed_at', 'updated_at'),
-            'classes': ('collapse',)
-        })
-    )
-    
-    readonly_fields = ('deployed_at', 'updated_at', 'certificate_info')
-    
-    def certificate_status(self, obj):
-        """Display certificate status"""
-        if not obj.requires_certificate():
-            return format_html('<span style="color: gray;">-</span>')
-            
-        cert = obj.get_certificate()
-        if cert:
-            if cert.is_expired:
-                return format_html('<span style="color: red;">❌ {}</span>', cert.domain)
-            else:
-                return format_html('<span style="color: green;">✅ {}</span>', cert.domain)
-        else:
-            return format_html('<span style="color: orange;">⚠️ No cert</span>')
-    certificate_status.short_description = 'Certificate'
-    
-    def certificate_info(self, obj):
-        """Display certificate information and selection logic"""
-        html = '<div style="background: #f8f9fa; padding: 10px; border-radius: 4px;">'
-        
-        if not obj.requires_certificate():
-            html += '<p><strong>Certificate not required</strong> for this protocol/security combination.</p>'
-        else:
-            cert = obj.get_certificate()
-            if obj.certificate:
-                html += f'<p><strong>✅ Explicit certificate:</strong> {obj.certificate.domain}</p>'
-            elif cert:
-                html += f'<p><strong>🔄 Auto-selected:</strong> {cert.domain} (matches server hostname)</p>'
-            else:
-                server_hostname = getattr(obj.server.get_real_instance(), 'client_hostname', 'N/A')
-                html += f'<p><strong>⚠️ No certificate found</strong></p>'
-                html += f'<p>Server hostname: <code>{server_hostname}</code></p>'
-                html += f'<p>Consider creating certificate for this domain or select one manually above.</p>'
-        
-        html += '</div>'
-        return format_html(html)
-    certificate_info.short_description = 'Certificate Selection Info'
-
-
-# Unified XRay-core Admin with tabs
-@admin.register(SubscriptionGroup)
-class UnifiedXRayAdmin(admin.ModelAdmin):
-    """Unified admin for managing XRay-core: Subscription Groups, User Subscriptions, Certificates, and Inbound Templates"""
-    
-    # Use SubscriptionGroup as the base model but provide access to UserSubscription via tabs
-    list_display = ('name', 'is_active', 'inbound_count', 'user_count', 'created_at')
-    list_filter = ('is_active',)
-    search_fields = ('name', 'description')
-    filter_horizontal = ('inbounds',)
-    
-    def get_urls(self):
-        """Add custom URLs for additional tabs"""
-        urls = super().get_urls()
-        custom_urls = [
-            path('user-subscriptions/', 
-                 self.admin_site.admin_view(self.user_subscriptions_view),
-                 name='vpn_usersubscription_changelist_tab'),
-            path('certificates/', 
-                 self.admin_site.admin_view(self.certificates_view),
-                 name='vpn_certificate_changelist_tab'),
-            path('inbound-templates/', 
-                 self.admin_site.admin_view(self.inbound_templates_view),
-                 name='vpn_inbound_changelist_tab'),
-        ]
-        return custom_urls + urls
-    
-    def user_subscriptions_view(self, request):
-        """Redirect to user subscriptions with tab navigation"""
-        from django.shortcuts import redirect
-        return redirect('/admin/vpn/usersubscription/')
-    
-    def certificates_view(self, request):
-        """Redirect to certificates with tab navigation"""
-        from django.shortcuts import redirect
-        return redirect('/admin/vpn/certificate/')
-    
-    def inbound_templates_view(self, request):
-        """Redirect to inbound templates with tab navigation"""
-        from django.shortcuts import redirect
-        return redirect('/admin/vpn/inbound/')
-    
-    def changelist_view(self, request, extra_context=None):
-        """Override changelist to add tab navigation"""
-        extra_context = extra_context or {}
-        extra_context.update({
-            'show_tab_navigation': True,
-            'current_tab': 'subscription_groups',
-            'tabs': [
-                {'name': 'subscription_groups', 'label': 'Subscription Groups', 'url': '/admin/vpn/subscriptiongroup/', 'active': True},
-                {'name': 'user_subscriptions', 'label': 'User Subscriptions', 'url': '/admin/vpn/subscriptiongroup/user-subscriptions/', 'active': False},
-                {'name': 'certificates', 'label': 'Certificates', 'url': '/admin/vpn/subscriptiongroup/certificates/', 'active': False},
-                {'name': 'inbound_templates', 'label': 'Inbound Templates', 'url': '/admin/vpn/subscriptiongroup/inbound-templates/', 'active': False},
-            ]
-        })
-        return super().changelist_view(request, extra_context)
-    
-    def change_view(self, request, object_id, form_url='', extra_context=None):
-        """Override change view to add tab navigation"""
-        extra_context = extra_context or {}
-        extra_context.update({
-            'show_tab_navigation': True,
-            'current_tab': 'subscription_groups',
-            'tabs': [
-                {'name': 'subscription_groups', 'label': 'Subscription Groups', 'url': '/admin/vpn/subscriptiongroup/', 'active': True},
-                {'name': 'user_subscriptions', 'label': 'User Subscriptions', 'url': '/admin/vpn/subscriptiongroup/user-subscriptions/', 'active': False},
-                {'name': 'certificates', 'label': 'Certificates', 'url': '/admin/vpn/subscriptiongroup/certificates/', 'active': False},
-                {'name': 'inbound_templates', 'label': 'Inbound Templates', 'url': '/admin/vpn/subscriptiongroup/inbound-templates/', 'active': False},
-            ]
-        })
-        return super().change_view(request, object_id, form_url, extra_context)
-    
-    def add_view(self, request, form_url='', extra_context=None):
-        """Override add view to add tab navigation"""
-        extra_context = extra_context or {}
-        extra_context.update({
-            'show_tab_navigation': True,
-            'current_tab': 'subscription_groups',
-            'tabs': [
-                {'name': 'subscription_groups', 'label': 'Subscription Groups', 'url': '/admin/vpn/subscriptiongroup/', 'active': True},
-                {'name': 'user_subscriptions', 'label': 'User Subscriptions', 'url': '/admin/vpn/subscriptiongroup/user-subscriptions/', 'active': False},
-                {'name': 'certificates', 'label': 'Certificates', 'url': '/admin/vpn/subscriptiongroup/certificates/', 'active': False},
-                {'name': 'inbound_templates', 'label': 'Inbound Templates', 'url': '/admin/vpn/subscriptiongroup/inbound-templates/', 'active': False},
-            ]
-        })
-        return super().add_view(request, form_url, extra_context)
-    
-    # Copy fieldsets and methods from SubscriptionGroupAdmin
-    fieldsets = (
-        ('Group Information', {
-            'fields': ('name', 'description', 'is_active')
-        }),
-        ('Inbounds', {
-            'fields': ('inbounds',),
-            'description': 'Select inbounds to include in this group. ' +
-                         '<br><strong>🚀 Auto-sync enabled:</strong> Changes will be automatically deployed to servers!'
-        }),
-        ('Statistics', {
-            'fields': ('group_statistics',),
-            'classes': ('collapse',)
-        })
-    )
-    
-    readonly_fields = ('group_statistics',)
-    
-    def save_model(self, request, obj, form, change):
-        """Override save to notify about auto-sync"""
-        super().save_model(request, obj, form, change)
-        if change:
-            messages.success(
-                request, 
-                f'Subscription group "{obj.name}" updated. Changes will be automatically synchronized to all Xray servers.'
-            )
-        else:
-            messages.success(
-                request, 
-                f'Subscription group "{obj.name}" created. Inbounds will be automatically deployed when you add them to this group.'
-            )
-    
-    def group_statistics(self, obj):
-        """Display group statistics"""
-        if obj.pk:
-            stats = {
-                'Total Inbounds': obj.inbound_count,
-                'Active Users': obj.user_count,
-                'Protocols': list(obj.inbounds.values_list('protocol', flat=True).distinct()),
-                'Ports': list(obj.inbounds.values_list('port', flat=True).distinct())
-            }
-            
-            html = '<div style="background: #f4f4f4; padding: 10px; border-radius: 4px;">'
-            for key, value in stats.items():
-                if isinstance(value, list):
-                    value = ', '.join(map(str, value))
-                html += f'<div><strong>{key}:</strong> {value}</div>'
-            html += '</div>'
-            
-            return format_html(html)
-        return 'Save to see statistics'
-    group_statistics.short_description = 'Group Statistics'
-
-
-# UserSubscription admin with tab navigation (hidden from main menu)
-@admin.register(UserSubscription)  
-class UserSubscriptionTabAdmin(UserSubscriptionAdmin):
-    """UserSubscription admin with tab navigation"""
-    
-    def has_module_permission(self, request):
-        """Hide this model from the main admin index"""
-        return False
-        
-    def has_view_permission(self, request, obj=None):
-        """Allow viewing through direct URL access"""
-        return request.user.is_staff
-        
-    def has_add_permission(self, request):
-        """Allow adding through direct URL access"""
-        return request.user.is_staff
-        
-    def has_change_permission(self, request, obj=None):
-        """Allow changing through direct URL access"""
-        return request.user.is_staff
-        
-    def has_delete_permission(self, request, obj=None):
-        """Allow deleting through direct URL access"""
-        return request.user.is_staff
-    
-    def changelist_view(self, request, extra_context=None):
-        """Override changelist to add tab navigation"""
-        extra_context = extra_context or {}
-        extra_context.update({
-            'show_tab_navigation': True,
-            'current_tab': 'user_subscriptions',
-            'tabs': [
-                {'name': 'subscription_groups', 'label': 'Subscription Groups', 'url': '/admin/vpn/subscriptiongroup/', 'active': False},
-                {'name': 'user_subscriptions', 'label': 'User Subscriptions', 'url': '/admin/vpn/subscriptiongroup/user-subscriptions/', 'active': True},
-                {'name': 'certificates', 'label': 'Certificates', 'url': '/admin/vpn/subscriptiongroup/certificates/', 'active': False},
-                {'name': 'inbound_templates', 'label': 'Inbound Templates', 'url': '/admin/vpn/subscriptiongroup/inbound-templates/', 'active': False},
-            ]
-        })
-        return super().changelist_view(request, extra_context)
-    
-    def change_view(self, request, object_id, form_url='', extra_context=None):
-        """Override change view to add tab navigation"""
-        extra_context = extra_context or {}
-        extra_context.update({
-            'show_tab_navigation': True,
-            'current_tab': 'user_subscriptions',
-            'tabs': [
-                {'name': 'subscription_groups', 'label': 'Subscription Groups', 'url': '/admin/vpn/subscriptiongroup/', 'active': False},
-                {'name': 'user_subscriptions', 'label': 'User Subscriptions', 'url': '/admin/vpn/subscriptiongroup/user-subscriptions/', 'active': True},
-                {'name': 'certificates', 'label': 'Certificates', 'url': '/admin/vpn/subscriptiongroup/certificates/', 'active': False},
-                {'name': 'inbound_templates', 'label': 'Inbound Templates', 'url': '/admin/vpn/subscriptiongroup/inbound-templates/', 'active': False},
-            ]
-        })
-        return super().change_view(request, object_id, form_url, extra_context)
-    
-    def add_view(self, request, form_url='', extra_context=None):
-        """Override add view to add tab navigation"""
-        extra_context = extra_context or {}
-        extra_context.update({
-            'show_tab_navigation': True,
-            'current_tab': 'user_subscriptions',
-            'tabs': [
-                {'name': 'subscription_groups', 'label': 'Subscription Groups', 'url': '/admin/vpn/subscriptiongroup/', 'active': False},
-                {'name': 'user_subscriptions', 'label': 'User Subscriptions', 'url': '/admin/vpn/subscriptiongroup/user-subscriptions/', 'active': True},
-                {'name': 'certificates', 'label': 'Certificates', 'url': '/admin/vpn/subscriptiongroup/certificates/', 'active': False},
-                {'name': 'inbound_templates', 'label': 'Inbound Templates', 'url': '/admin/vpn/subscriptiongroup/inbound-templates/', 'active': False},
-            ]
-        })
-        return super().add_view(request, form_url, extra_context)
-
-
-# Certificate admin with tab navigation (hidden from main menu)
-@admin.register(Certificate)
-class CertificateTabAdmin(CertificateAdmin):
-    """Certificate admin with tab navigation"""
-    
-    def has_module_permission(self, request):
-        """Hide this model from the main admin index"""
-        return False
-        
-    def has_view_permission(self, request, obj=None):
-        """Allow viewing through direct URL access"""
-        return True
-        
-    def has_add_permission(self, request):
-        """Allow adding through direct URL access"""
-        return True
-        
-    def has_change_permission(self, request, obj=None):
-        """Allow changing through direct URL access"""
-        return True
-        
-    def has_delete_permission(self, request, obj=None):
-        """Allow deleting through direct URL access"""
-        return True
-    
-    def changelist_view(self, request, extra_context=None):
-        """Override changelist to add tab navigation"""
-        extra_context = extra_context or {}
-        extra_context.update({
-            'show_tab_navigation': True,
-            'current_tab': 'certificates',
-            'tabs': [
-                {'name': 'subscription_groups', 'label': 'Subscription Groups', 'url': '/admin/vpn/subscriptiongroup/', 'active': False},
-                {'name': 'user_subscriptions', 'label': 'User Subscriptions', 'url': '/admin/vpn/subscriptiongroup/user-subscriptions/', 'active': False},
-                {'name': 'certificates', 'label': 'Certificates', 'url': '/admin/vpn/subscriptiongroup/certificates/', 'active': True},
-                {'name': 'inbound_templates', 'label': 'Inbound Templates', 'url': '/admin/vpn/subscriptiongroup/inbound-templates/', 'active': False},
-            ]
-        })
-        return super().changelist_view(request, extra_context)
-    
-    def change_view(self, request, object_id, form_url='', extra_context=None):
-        """Override change view to add tab navigation"""
-        extra_context = extra_context or {}
-        extra_context.update({
-            'show_tab_navigation': True,
-            'current_tab': 'certificates',
-            'tabs': [
-                {'name': 'subscription_groups', 'label': 'Subscription Groups', 'url': '/admin/vpn/subscriptiongroup/', 'active': False},
-                {'name': 'user_subscriptions', 'label': 'User Subscriptions', 'url': '/admin/vpn/subscriptiongroup/user-subscriptions/', 'active': False},
-                {'name': 'certificates', 'label': 'Certificates', 'url': '/admin/vpn/subscriptiongroup/certificates/', 'active': True},
-                {'name': 'inbound_templates', 'label': 'Inbound Templates', 'url': '/admin/vpn/subscriptiongroup/inbound-templates/', 'active': False},
-            ]
-        })
-        return super().change_view(request, object_id, form_url, extra_context)
-    
-    def add_view(self, request, form_url='', extra_context=None):
-        """Override add view to add tab navigation"""
-        extra_context = extra_context or {}
-        extra_context.update({
-            'show_tab_navigation': True,
-            'current_tab': 'certificates',
-            'tabs': [
-                {'name': 'subscription_groups', 'label': 'Subscription Groups', 'url': '/admin/vpn/subscriptiongroup/', 'active': False},
-                {'name': 'user_subscriptions', 'label': 'User Subscriptions', 'url': '/admin/vpn/subscriptiongroup/user-subscriptions/', 'active': False},
-                {'name': 'certificates', 'label': 'Certificates', 'url': '/admin/vpn/subscriptiongroup/certificates/', 'active': True},
-                {'name': 'inbound_templates', 'label': 'Inbound Templates', 'url': '/admin/vpn/subscriptiongroup/inbound-templates/', 'active': False},
-            ]
-        })
-        return super().add_view(request, form_url, extra_context)
-
-
-# Inbound admin with tab navigation (hidden from main menu)
-@admin.register(Inbound)
-class InboundTabAdmin(InboundAdmin):
-    """Inbound admin with tab navigation"""
-    
-    def has_module_permission(self, request):
-        """Hide this model from the main admin index"""
-        return False
-        
-    def has_view_permission(self, request, obj=None):
-        """Allow viewing through direct URL access"""
-        return True
-        
-    def has_add_permission(self, request):
-        """Allow adding through direct URL access"""
-        return True
-        
-    def has_change_permission(self, request, obj=None):
-        """Allow changing through direct URL access"""
-        return True
-        
-    def has_delete_permission(self, request, obj=None):
-        """Allow deleting through direct URL access"""
-        return True
-    
-    def changelist_view(self, request, extra_context=None):
-        """Override changelist to add tab navigation"""
-        extra_context = extra_context or {}
-        extra_context.update({
-            'show_tab_navigation': True,
-            'current_tab': 'inbound_templates',
-            'tabs': [
-                {'name': 'subscription_groups', 'label': 'Subscription Groups', 'url': '/admin/vpn/subscriptiongroup/', 'active': False},
-                {'name': 'user_subscriptions', 'label': 'User Subscriptions', 'url': '/admin/vpn/subscriptiongroup/user-subscriptions/', 'active': False},
-                {'name': 'certificates', 'label': 'Certificates', 'url': '/admin/vpn/subscriptiongroup/certificates/', 'active': False},
-                {'name': 'inbound_templates', 'label': 'Inbound Templates', 'url': '/admin/vpn/subscriptiongroup/inbound-templates/', 'active': True},
-            ]
-        })
-        return super().changelist_view(request, extra_context)
-    
-    def change_view(self, request, object_id, form_url='', extra_context=None):
-        """Override change view to add tab navigation"""
-        extra_context = extra_context or {}
-        extra_context.update({
-            'show_tab_navigation': True,
-            'current_tab': 'inbound_templates',
-            'tabs': [
-                {'name': 'subscription_groups', 'label': 'Subscription Groups', 'url': '/admin/vpn/subscriptiongroup/', 'active': False},
-                {'name': 'user_subscriptions', 'label': 'User Subscriptions', 'url': '/admin/vpn/subscriptiongroup/user-subscriptions/', 'active': False},
-                {'name': 'certificates', 'label': 'Certificates', 'url': '/admin/vpn/subscriptiongroup/certificates/', 'active': False},
-                {'name': 'inbound_templates', 'label': 'Inbound Templates', 'url': '/admin/vpn/subscriptiongroup/inbound-templates/', 'active': True},
-            ]
-        })
-        return super().change_view(request, object_id, form_url, extra_context)
-    
-    def add_view(self, request, form_url='', extra_context=None):
-        """Override add view to add tab navigation"""
-        extra_context = extra_context or {}
-        extra_context.update({
-            'show_tab_navigation': True,
-            'current_tab': 'inbound_templates',
-            'tabs': [
-                {'name': 'subscription_groups', 'label': 'Subscription Groups', 'url': '/admin/vpn/subscriptiongroup/', 'active': False},
-                {'name': 'user_subscriptions', 'label': 'User Subscriptions', 'url': '/admin/vpn/subscriptiongroup/user-subscriptions/', 'active': False},
-                {'name': 'certificates', 'label': 'Certificates', 'url': '/admin/vpn/subscriptiongroup/certificates/', 'active': False},
-                {'name': 'inbound_templates', 'label': 'Inbound Templates', 'url': '/admin/vpn/subscriptiongroup/inbound-templates/', 'active': True},
-            ]
-        })
-        return super().add_view(request, form_url, extra_context)
-
-
-# Log successful completion of admin registration
diff --git a/vpn/apps.py b/vpn/apps.py
deleted file mode 100644
index 4c0f0d7..0000000
--- a/vpn/apps.py
+++ /dev/null
@@ -1,109 +0,0 @@
-from django.apps import AppConfig
-from django.contrib.auth import get_user_model
-
-class VPN(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'vpn'
-    
-    def ready(self):
-        """Import signals when Django starts"""
-        import sys
-        import logging
-        logger = logging.getLogger(__name__)
-        
-        logger.info(f"VPN App ready() called in process: {' '.join(sys.argv)}")
-        
-        try:
-            import vpn.signals  # noqa
-        except ImportError:
-            pass
-        
-        # Only load admin interfaces in web processes, not in worker/beat
-        skip_admin_load = any([
-            'worker' in sys.argv,
-            'beat' in sys.argv,
-            'makemigrations' in sys.argv,
-            'migrate' in sys.argv,
-            'shell' in sys.argv,
-            'test' in sys.argv,
-        ])
-        
-        if not skip_admin_load:
-            logger.info("VPN App: Loading admin interfaces in web process")
-            # Force load admin interfaces first
-            self._load_admin_interfaces()
-            
-            # Clean up unwanted admin interfaces
-            self._cleanup_admin_interfaces()
-        else:
-            logger.info("VPN App: Skipping admin loading in non-web process")
-    
-    def _cleanup_admin_interfaces(self):
-        """Remove unwanted admin interfaces after all apps are loaded"""
-        from django.contrib import admin
-        import logging
-        logger = logging.getLogger(__name__)
-        
-        logger.info("VPN App: Starting admin cleanup...")
-        
-        try:
-            from django_celery_results.models import GroupResult
-            from django_celery_beat.models import (
-                PeriodicTask, 
-                ClockedSchedule, 
-                CrontabSchedule, 
-                IntervalSchedule, 
-                SolarSchedule
-            )
-            from django.contrib.auth.models import Group
-            
-            # Unregister celery models that we don't want in admin
-            models_to_unregister = [
-                GroupResult, PeriodicTask, ClockedSchedule, 
-                CrontabSchedule, IntervalSchedule, SolarSchedule
-            ]
-            
-            for model in models_to_unregister:
-                try:
-                    admin.site.unregister(model)
-                    logger.info(f"VPN App: Unregistered {model.__name__}")
-                except admin.sites.NotRegistered:
-                    logger.debug(f"VPN App: {model.__name__} was not registered, skipping")
-            
-            # Unregister Django's default Group model
-            try:
-                admin.site.unregister(Group)
-                logger.info("VPN App: Unregistered Django Group model")
-            except admin.sites.NotRegistered:
-                logger.debug("VPN App: Django Group was not registered, skipping")
-                
-        except ImportError as e:
-            # Celery packages not installed
-            logger.warning(f"VPN App: Celery packages not available: {e}")
-        
-        logger.info("VPN App: Admin cleanup completed")
-    
-    def _load_admin_interfaces(self):
-        """Force load admin interfaces to ensure they are registered"""
-        import logging
-        logger = logging.getLogger(__name__)
-        
-        logger.info("VPN App: Force loading admin interfaces...")
-        
-        try:
-            # Import admin module to trigger registration
-            import sys
-            if 'vpn.admin_minimal' in sys.modules:
-                # Module already imported, remove it to force fresh import
-                del sys.modules['vpn.admin_minimal']
-                logger.info("VPN App: Removed vpn.admin_minimal from cache")
-            
-            import vpn.admin_minimal
-            logger.info("VPN App: Successfully loaded vpn.admin_minimal")
-            
-        except Exception as e:
-            logger.error(f"VPN App: Failed to load vpn.admin: {e}")
-            import traceback
-            logger.error(f"VPN App: Traceback: {traceback.format_exc()}")
-        
-        logger.info("VPN App: Admin loading completed")
diff --git a/vpn/forms.py b/vpn/forms.py
deleted file mode 100644
index 0e7300a..0000000
--- a/vpn/forms.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django import forms
-from .models import User
-
-class UserForm(forms.ModelForm):
-    class Meta:
-        model = User
-        fields = ['username', 'first_name', 'last_name', 'email', 'comment', 'is_active']
diff --git a/vpn/letsencrypt/__init__.py b/vpn/letsencrypt/__init__.py
deleted file mode 100644
index d47fd53..0000000
--- a/vpn/letsencrypt/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""Let's Encrypt DNS Challenge Library for OutFleet"""
-
-from .letsencrypt_dns import (
-    AcmeDnsChallenge,
-    get_certificate,
-    get_certificate_for_domain
-)
-
-__all__ = [
-    'AcmeDnsChallenge',
-    'get_certificate',
-    'get_certificate_for_domain'
-]
\ No newline at end of file
diff --git a/vpn/letsencrypt/letsencrypt_dns.py b/vpn/letsencrypt/letsencrypt_dns.py
deleted file mode 100644
index 17e40ff..0000000
--- a/vpn/letsencrypt/letsencrypt_dns.py
+++ /dev/null
@@ -1,403 +0,0 @@
-#!/usr/bin/env python3
-"""
-Let's Encrypt/ZeroSSL Certificate Library with Cloudflare DNS Challenge
-Generate publicly trusted SSL certificates using ACME DNS-01 challenge
-"""
-
-import time
-import logging
-from typing import List, Tuple
-
-from cryptography import x509
-from cryptography.x509.oid import NameOID
-from cryptography.hazmat.primitives import hashes, serialization
-from cryptography.hazmat.primitives.asymmetric import rsa
-from acme import client, messages, challenges, errors
-from acme.client import ClientV2
-import josepy as jose
-from cloudflare import Cloudflare
-
-logger = logging.getLogger(__name__)
-
-class AcmeDnsChallenge:
-    """ACME DNS-01 Challenge handler with Cloudflare API"""
-    
-    def __init__(self, cloudflare_token: str, acme_directory: str = None):
-        """
-        Initialize ACME DNS challenge handler
-        
-        Args:
-            cloudflare_token: Cloudflare API token with DNS edit permissions
-            acme_directory: ACME directory URL (defaults to Let's Encrypt production)
-        """
-        self.cf_token = cloudflare_token
-        self.cf = Cloudflare(api_token=cloudflare_token)
-        
-        # ACME directory URLs
-        self.acme_directories = {
-            'letsencrypt': 'https://acme-v02.api.letsencrypt.org/directory',
-            'letsencrypt_staging': 'https://acme-staging-v02.api.letsencrypt.org/directory',
-            'zerossl': 'https://acme.zerossl.com/v2/DV90'
-        }
-        
-        self.acme_directory = acme_directory or self.acme_directories['letsencrypt']
-        self.acme_client = None
-        self.account_key = None
-        
-    def _generate_account_key(self) -> jose.JWKRSA:
-        """Generate RSA private key for ACME account"""
-        # Generate cryptography key first
-        private_key = rsa.generate_private_key(
-            public_exponent=65537,
-            key_size=2048
-        )
-        # Convert to josepy format for ACME
-        return jose.JWKRSA(key=private_key)
-    
-    def _get_zone_id(self, domain: str) -> str:
-        """Get Cloudflare zone ID for domain"""
-        try:
-            # Get base domain (remove subdomains)
-            parts = domain.split('.')
-            if len(parts) >= 2:
-                base_domain = '.'.join(parts[-2:])
-            else:
-                base_domain = domain
-                
-            zones = self.cf.zones.list(name=base_domain)
-            if not zones.result:
-                raise ValueError(f"Domain {base_domain} not found in Cloudflare")
-            
-            return zones.result[0].id
-        except Exception as e:
-            logger.error(f"Failed to get zone ID for {domain}: {e}")
-            raise
-    
-    def _create_dns_record(self, domain: str, name: str, content: str) -> str:
-        """Create DNS TXT record for ACME challenge"""
-        try:
-            zone_id = self._get_zone_id(domain)
-            
-            result = self.cf.dns.records.create(
-                zone_id=zone_id,
-                name=name,
-                type='TXT',
-                content=content,
-                ttl=60  # 1 minute TTL for faster propagation
-            )
-            logger.info(f"Created DNS record: {name} = {content}")
-            return result.id
-            
-        except Exception as e:
-            logger.error(f"Failed to create DNS record {name}: {e}")
-            raise
-    
-    def _delete_dns_record(self, domain: str, record_id: str):
-        """Delete DNS TXT record"""
-        try:
-            zone_id = self._get_zone_id(domain)
-            self.cf.dns.records.delete(zone_id=zone_id, dns_record_id=record_id)
-            logger.info(f"Deleted DNS record: {record_id}")
-        except Exception as e:
-            logger.warning(f"Failed to delete DNS record {record_id}: {e}")
-    
-    def _wait_for_dns_propagation(self, record_name: str, expected_value: str, wait_time: int = 20):
-        """Wait for DNS record to propagate - no local checks, just wait"""
-        logger.info(f"Waiting {wait_time} seconds for DNS propagation of {record_name}...")
-        logger.info(f"Record value: {expected_value}")
-        logger.info("(No local DNS checks - Let's Encrypt servers will verify)")
-        
-        time.sleep(wait_time)
-        
-        logger.info("DNS propagation wait completed - proceeding with challenge")
-        return True
-    
-    def create_acme_client(self, email: str, accept_tos: bool = True) -> ClientV2:
-        """Create and register ACME client"""
-        if self.acme_client:
-            return self.acme_client
-            
-        try:
-            logger.info("Generating ACME account key...")
-            # Generate account key
-            self.account_key = self._generate_account_key()
-            logger.info("Account key generated successfully")
-            
-            logger.info(f"Connecting to ACME directory: {self.acme_directory}")
-            # Create ACME client
-            net = client.ClientNetwork(self.account_key, user_agent='letsencrypt-dns-lib/1.0')
-            logger.info("Getting ACME directory...")
-            directory_response = net.get(self.acme_directory)
-            logger.info(f"Directory response status: {directory_response.status_code}")
-            directory = messages.Directory.from_json(directory_response.json())
-            logger.info("ACME directory loaded successfully")
-            
-            self.acme_client = ClientV2(directory, net=net)
-            logger.info("ACME client created successfully")
-            
-            # Register account
-            logger.info(f"Registering ACME account for email: {email}")
-            try:
-                registration = messages.NewRegistration.from_data(
-                    email=email,
-                    terms_of_service_agreed=accept_tos
-                )
-                logger.info("Sending account registration...")
-                account = self.acme_client.new_account(registration)
-                logger.info(f"ACME account registered: {account.uri}")
-                
-            except errors.ConflictError as e:
-                logger.info(f"Account already exists (ConflictError): {e}")
-                # Account already exists
-                account = self.acme_client.query_registration(messages.NewRegistration())
-                logger.info("Using existing ACME account")
-            except Exception as reg_e:
-                logger.error(f"Account registration failed: {reg_e}")
-                logger.error(f"Registration error type: {type(reg_e).__name__}")
-                raise
-            
-            return self.acme_client
-            
-        except Exception as e:
-            logger.error(f"Failed to create ACME client: {e}")
-            logger.error(f"Error type: {type(e).__name__}")
-            import traceback
-            logger.error(f"Full traceback: {traceback.format_exc()}")
-            raise
-    
-    def request_certificate(self, domains: List[str], email: str, 
-                          key_size: int = 2048) -> Tuple[str, str]:
-        """
-        Request certificate using DNS-01 challenge
-        
-        Args:
-            domains: List of domain names for certificate
-            email: Email for ACME account registration
-            key_size: RSA key size for certificate
-            
-        Returns:
-            Tuple of (certificate_pem, private_key_pem)
-        """
-        logger.info(f"Requesting certificate for domains: {domains}")
-        
-        try:
-            # Create ACME client
-            logger.info("Creating ACME client...")
-            acme_client = self.create_acme_client(email)
-            logger.info("ACME client created successfully")
-        except Exception as e:
-            logger.error(f"Failed to create ACME client: {e}")
-            import traceback
-            logger.error(f"Traceback: {traceback.format_exc()}")
-            raise
-        
-        try:
-            # Generate private key for certificate
-            logger.info(f"Generating {key_size}-bit RSA private key...")
-            private_key = rsa.generate_private_key(
-                public_exponent=65537,
-                key_size=key_size
-            )
-            logger.info("Private key generated successfully")
-            
-            # Create CSR
-            logger.info(f"Creating CSR for domains: {domains}")
-            csr_obj = x509.CertificateSigningRequestBuilder().subject_name(
-                x509.Name([
-                    x509.NameAttribute(NameOID.COMMON_NAME, domains[0])
-                ])
-            ).add_extension(
-                x509.SubjectAlternativeName([
-                    x509.DNSName(domain) for domain in domains
-                ]),
-                critical=False
-            ).sign(private_key, hashes.SHA256())
-            
-            # Convert CSR to PEM format for ACME
-            csr_pem = csr_obj.public_bytes(serialization.Encoding.PEM)
-            logger.info("CSR created successfully")
-            
-            # Request certificate
-            logger.info("Requesting certificate order from ACME...")
-            order = acme_client.new_order(csr_pem)
-            logger.info(f"Created ACME order: {order.uri}")
-        except Exception as e:
-            logger.error(f"Failed during CSR/order creation: {e}")
-            import traceback
-            logger.error(f"Traceback: {traceback.format_exc()}")
-            raise
-        
-        # Process challenges - collect all challenges first, then create DNS records
-        dns_records = []
-        challenges_to_answer = []
-        
-        try:
-            # First pass: collect all challenges and create DNS records
-            for authorization in order.authorizations:
-                domain = authorization.body.identifier.value
-                logger.info(f"Processing authorization for: {domain}")
-                
-                # Find DNS-01 challenge
-                dns_challenge = None
-                for challenge in authorization.body.challenges:
-                    if isinstance(challenge.chall, challenges.DNS01):
-                        dns_challenge = challenge
-                        break
-                
-                if not dns_challenge:
-                    raise ValueError(f"No DNS-01 challenge found for {domain}")
-                
-                # Calculate challenge response
-                response, validation = dns_challenge.response_and_validation(acme_client.net.key)
-                
-                # For wildcard domains, use base domain for DNS record
-                if domain.startswith('*.'):
-                    dns_domain = domain[2:]  # Remove *. prefix
-                else:
-                    dns_domain = domain
-                
-                # Create DNS record
-                record_name = f"_acme-challenge.{dns_domain}"
-                
-                # Check if we already created this DNS record
-                existing_record = None
-                for existing_domain, existing_id, existing_validation in dns_records:
-                    if existing_domain == dns_domain:
-                        existing_record = (existing_domain, existing_id, existing_validation)
-                        break
-                
-                if existing_record:
-                    logger.info(f"DNS record already exists for {dns_domain}, reusing...")
-                    record_id = existing_record[1]
-                    # Verify the validation value matches
-                    if existing_record[2] != validation:
-                        logger.warning(f"Validation values differ for {dns_domain}! This may cause issues.")
-                else:
-                    logger.info(f"Creating DNS record for {dns_domain}...")
-                    record_id = self._create_dns_record(dns_domain, record_name, validation)
-                    dns_records.append((dns_domain, record_id, validation))
-                
-                # Store challenge to answer later
-                challenges_to_answer.append((dns_challenge, response, domain, dns_domain))
-            
-            # Wait for DNS propagation once for all records
-            if dns_records:
-                logger.info(f"Waiting for DNS propagation for {len(dns_records)} DNS records...")
-                for dns_domain, record_id, validation in dns_records:
-                    record_name = f"_acme-challenge.{dns_domain}"
-                    self._wait_for_dns_propagation(record_name, validation)
-            
-            # Second pass: answer all challenges
-            for dns_challenge, response, domain, dns_domain in challenges_to_answer:
-                logger.info(f"Responding to DNS challenge for {domain}...")
-                challenge_response = acme_client.answer_challenge(dns_challenge, response)
-                logger.info(f"Challenge response sent for {domain}")
-            
-            # Finalize order
-            logger.info("Finalizing certificate order...")
-            order = acme_client.poll_and_finalize(order)
-            
-            # Get certificate
-            certificate_pem = order.fullchain_pem
-            private_key_pem = private_key.private_bytes(
-                encoding=serialization.Encoding.PEM,
-                format=serialization.PrivateFormat.PKCS8,
-                encryption_algorithm=serialization.NoEncryption()
-            ).decode('utf-8')
-            
-            logger.info("Certificate obtained successfully!")
-            return certificate_pem, private_key_pem
-            
-        finally:
-            # Clean up DNS records
-            for dns_domain, record_id, validation in dns_records:
-                try:
-                    self._delete_dns_record(dns_domain, record_id)
-                except Exception as e:
-                    logger.warning(f"Failed to cleanup DNS record for {dns_domain}: {e}")
-
-def get_certificate(domains: List[str], email: str, cloudflare_token: str,
-                   provider: str = 'letsencrypt', staging: bool = False) -> Tuple[str, str]:
-    """
-    Simple function to get Let's Encrypt/ZeroSSL certificate
-    
-    Args:
-        domains: List of domains for certificate
-        email: Email for ACME registration
-        cloudflare_token: Cloudflare API token
-        provider: 'letsencrypt' or 'zerossl'
-        staging: Use staging environment (for testing)
-        
-    Returns:
-        Tuple of (certificate_pem, private_key_pem)
-    """
-    # Select ACME directory
-    acme_dns = AcmeDnsChallenge(cloudflare_token)
-    
-    if provider == 'letsencrypt':
-        if staging:
-            acme_dns.acme_directory = acme_dns.acme_directories['letsencrypt_staging']
-        else:
-            acme_dns.acme_directory = acme_dns.acme_directories['letsencrypt']
-    elif provider == 'zerossl':
-        acme_dns.acme_directory = acme_dns.acme_directories['zerossl']
-    else:
-        raise ValueError("Provider must be 'letsencrypt' or 'zerossl'")
-    
-    return acme_dns.request_certificate(domains, email)
-
-def get_certificate_for_domain(domain: str, email: str, cloudflare_token: str,
-                              include_wildcard: bool = False, **kwargs) -> Tuple[str, str]:
-    """
-    Helper function to get certificate for single domain (compatible with Cloudflare cert lib)
-    
-    Args:
-        domain: Primary domain
-        email: Email for ACME registration  
-        cloudflare_token: Cloudflare API token
-        include_wildcard: Include wildcard subdomain
-        **kwargs: Additional arguments (provider, staging)
-        
-    Returns:
-        Tuple of (certificate_pem, private_key_pem)
-    """
-    domains = [domain]
-    if include_wildcard:
-        domains.append(f"*.{domain}")
-    
-    return get_certificate(domains, email, cloudflare_token, **kwargs)
-
-if __name__ == "__main__":
-    # Example usage
-    import sys
-    
-    if len(sys.argv) != 4:
-        print("Usage: python letsencrypt_dns.py <domain> <email> <cloudflare_token>")
-        sys.exit(1)
-    
-    domain, email, token = sys.argv[1:4]
-    
-    try:
-        cert_pem, key_pem = get_certificate_for_domain(
-            domain=domain,
-            email=email,
-            cloudflare_token=token,
-            include_wildcard=True,
-            staging=True  # Use staging for testing
-        )
-        
-        print(f"Certificate obtained for {domain}")
-        print(f"Certificate length: {len(cert_pem)} bytes")
-        print(f"Private key length: {len(key_pem)} bytes")
-        
-        # Save to files
-        with open(f"{domain}.crt", 'w') as f:
-            f.write(cert_pem)
-        with open(f"{domain}.key", 'w') as f:
-            f.write(key_pem)
-        
-        print(f"Saved: {domain}.crt, {domain}.key")
-        
-    except Exception as e:
-        print(f"Error: {e}")
-        sys.exit(1)
\ No newline at end of file
diff --git a/vpn/management/__init__.py b/vpn/management/__init__.py
deleted file mode 100644
index 889b444..0000000
--- a/vpn/management/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# Django management commands package\n
\ No newline at end of file
diff --git a/vpn/management/commands/cleanup_access_logs.py b/vpn/management/commands/cleanup_access_logs.py
deleted file mode 100644
index bf756aa..0000000
--- a/vpn/management/commands/cleanup_access_logs.py
+++ /dev/null
@@ -1,158 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.db import connection, transaction
-from datetime import datetime, timedelta
-from vpn.models import AccessLog
-
-
-class Command(BaseCommand):
-    help = 'Clean up old AccessLog entries without acl_link_id'
-
-    def add_arguments(self, parser):
-        parser.add_argument(
-            '--days',
-            type=int,
-            default=30,
-            help='Delete logs older than this many days (default: 30)'
-        )
-        parser.add_argument(
-            '--batch-size',
-            type=int,
-            default=10000,
-            help='Number of records to delete in each batch (default: 10000)'
-        )
-        parser.add_argument(
-            '--dry-run',
-            action='store_true',
-            help='Show what would be deleted without actually deleting'
-        )
-        parser.add_argument(
-            '--keep-recent',
-            type=int,
-            default=1000,
-            help='Keep this many recent logs even if they have no link (default: 1000)'
-        )
-
-    def handle(self, *args, **options):
-        days = options['days']
-        batch_size = options['batch_size']
-        dry_run = options['dry_run']
-        keep_recent = options['keep_recent']
-        
-        cutoff_date = datetime.now() - timedelta(days=days)
-        
-        self.stdout.write(f"🔍 Analyzing AccessLog cleanup...")
-        self.stdout.write(f"   - Delete logs without acl_link_id older than {days} days")
-        self.stdout.write(f"   - Keep {keep_recent} most recent logs without links")
-        self.stdout.write(f"   - Batch size: {batch_size}")
-        self.stdout.write(f"   - Dry run: {dry_run}")
-        
-        # Count total records to be deleted
-        with connection.cursor() as cursor:
-            # Count logs without acl_link_id
-            cursor.execute("""
-                SELECT COUNT(*) FROM vpn_accesslog 
-                WHERE (acl_link_id IS NULL OR acl_link_id = '')
-            """)
-            total_without_link = cursor.fetchone()[0]
-            
-            # Count logs to be deleted (older than cutoff, excluding recent ones to keep)
-            cursor.execute("""
-                SELECT COUNT(*) FROM vpn_accesslog 
-                WHERE (acl_link_id IS NULL OR acl_link_id = '') 
-                  AND timestamp < %s
-                  AND id NOT IN (
-                    SELECT id FROM (
-                      SELECT id FROM vpn_accesslog 
-                      WHERE acl_link_id IS NULL OR acl_link_id = ''
-                      ORDER BY timestamp DESC 
-                      LIMIT %s
-                    ) AS recent_logs
-                  )
-            """, [cutoff_date, keep_recent])
-            total_to_delete = cursor.fetchone()[0]
-            
-            # Count total records
-            cursor.execute("SELECT COUNT(*) FROM vpn_accesslog")
-            total_records = cursor.fetchone()[0]
-        
-        self.stdout.write(f"📊 Statistics:")
-        self.stdout.write(f"   - Total AccessLog records: {total_records:,}")
-        self.stdout.write(f"   - Records without acl_link_id: {total_without_link:,}")
-        self.stdout.write(f"   - Records to be deleted: {total_to_delete:,}")
-        self.stdout.write(f"   - Records to be kept (recent): {keep_recent:,}")
-        
-        if total_to_delete == 0:
-            self.stdout.write(self.style.SUCCESS("✅ No records to delete."))
-            return
-        
-        if dry_run:
-            self.stdout.write(self.style.WARNING(f"🔍 DRY RUN: Would delete {total_to_delete:,} records"))
-            return
-        
-        # Confirm deletion
-        if not options.get('verbosity', 1) == 0:  # Only ask if not --verbosity=0
-            confirm = input(f"❓ Delete {total_to_delete:,} records? (yes/no): ")
-            if confirm.lower() != 'yes':
-                self.stdout.write("❌ Cancelled.")
-                return
-        
-        self.stdout.write(f"🗑️  Starting deletion of {total_to_delete:,} records...")
-        
-        deleted_total = 0
-        batch_num = 0
-        
-        while True:
-            batch_num += 1
-            
-            with transaction.atomic():
-                with connection.cursor() as cursor:
-                    # Delete batch
-                    cursor.execute("""
-                        DELETE FROM vpn_accesslog 
-                        WHERE (acl_link_id IS NULL OR acl_link_id = '') 
-                          AND timestamp < %s
-                          AND id NOT IN (
-                            SELECT id FROM (
-                              SELECT id FROM vpn_accesslog 
-                              WHERE acl_link_id IS NULL OR acl_link_id = ''
-                              ORDER BY timestamp DESC 
-                              LIMIT %s
-                            ) AS recent_logs
-                          )
-                        LIMIT %s
-                    """, [cutoff_date, keep_recent, batch_size])
-                    
-                    deleted_in_batch = cursor.rowcount
-            
-            if deleted_in_batch == 0:
-                break
-            
-            deleted_total += deleted_in_batch
-            progress = (deleted_total / total_to_delete) * 100
-            
-            self.stdout.write(
-                f"   Batch {batch_num}: Deleted {deleted_in_batch:,} records "
-                f"(Total: {deleted_total:,}/{total_to_delete:,}, {progress:.1f}%)"
-            )
-            
-            if deleted_in_batch < batch_size:
-                break
-        
-        self.stdout.write(self.style.SUCCESS(f"✅ Cleanup completed!"))
-        self.stdout.write(f"   - Deleted {deleted_total:,} old AccessLog records")
-        self.stdout.write(f"   - Kept {keep_recent:,} recent records without links")
-        
-        # Show final statistics
-        with connection.cursor() as cursor:
-            cursor.execute("SELECT COUNT(*) FROM vpn_accesslog")
-            final_total = cursor.fetchone()[0]
-            
-            cursor.execute("""
-                SELECT COUNT(*) FROM vpn_accesslog 
-                WHERE acl_link_id IS NULL OR acl_link_id = ''
-            """)
-            final_without_link = cursor.fetchone()[0]
-        
-        self.stdout.write(f"📊 Final statistics:")
-        self.stdout.write(f"   - Total AccessLog records: {final_total:,}")
-        self.stdout.write(f"   - Records without acl_link_id: {final_without_link:,}")
diff --git a/vpn/management/commands/cleanup_logs.py b/vpn/management/commands/cleanup_logs.py
deleted file mode 100644
index 178ea22..0000000
--- a/vpn/management/commands/cleanup_logs.py
+++ /dev/null
@@ -1,208 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.db import connection
-from django.utils import timezone
-from datetime import timedelta
-
-
-class Command(BaseCommand):
-    help = '''
-    Clean up AccessLog entries efficiently using direct SQL.
-    
-    Examples:
-      # Delete logs without acl_link_id older than 30 days (recommended)
-      python manage.py cleanup_logs --keep-days=30
-      
-      # Keep only last 5000 logs without acl_link_id
-      python manage.py cleanup_logs --keep-count=5000
-      
-      # Delete ALL logs older than 7 days (including with acl_link_id) 
-      python manage.py cleanup_logs --keep-days=7 --target=all
-      
-      # Preview what would be deleted
-      python manage.py cleanup_logs --keep-days=30 --dry-run
-      
-      # Force delete without confirmation
-      python manage.py cleanup_logs --keep-days=30 --force
-    '''
-
-    def add_arguments(self, parser):
-        # Primary options (mutually exclusive)
-        group = parser.add_mutually_exclusive_group(required=True)
-        group.add_argument(
-            '--keep-days',
-            type=int,
-            help='Keep logs newer than this many days (delete older)'
-        )
-        group.add_argument(
-            '--keep-count', 
-            type=int,
-            help='Keep this many most recent logs (delete the rest)'
-        )
-        
-        parser.add_argument(
-            '--target',
-            choices=['no-links', 'all'],
-            default='no-links',
-            help='Target: "no-links" = only logs without acl_link_id (default), "all" = all logs'
-        )
-        
-        parser.add_argument(
-            '--dry-run',
-            action='store_true',
-            help='Show what would be deleted without actually deleting'
-        )
-        
-        parser.add_argument(
-            '--force',
-            action='store_true', 
-            help='Skip confirmation prompt'
-        )
-
-    def handle(self, *args, **options):
-        keep_days = options.get('keep_days')
-        keep_count = options.get('keep_count')
-        target = options['target']
-        dry_run = options['dry_run']
-        force = options['force']
-        
-        # Build SQL conditions
-        if target == 'no-links':
-            base_condition = "(acl_link_id IS NULL OR acl_link_id = '')"
-            target_desc = "logs without acl_link_id"
-        else:
-            base_condition = "1=1"
-            target_desc = "all logs"
-        
-        # Get current statistics
-        with connection.cursor() as cursor:
-            # Total records
-            cursor.execute("SELECT COUNT(*) FROM vpn_accesslog")
-            total_records = cursor.fetchone()[0]
-            
-            # Target records count
-            cursor.execute(f"SELECT COUNT(*) FROM vpn_accesslog WHERE {base_condition}")
-            target_records = cursor.fetchone()[0]
-            
-            # Records to delete
-            if keep_days:
-                cutoff_date = timezone.now() - timedelta(days=keep_days)
-                cursor.execute(f"""
-                    SELECT COUNT(*) FROM vpn_accesslog 
-                    WHERE {base_condition} AND timestamp < %s
-                """, [cutoff_date])
-                to_delete = cursor.fetchone()[0]
-                strategy = f"older than {keep_days} days"
-            else:  # keep_count
-                to_delete = max(0, target_records - keep_count)
-                strategy = f"keeping only {keep_count} most recent"
-        
-        # Print statistics
-        self.stdout.write("🗑️  AccessLog Cleanup" + (" (DRY RUN)" if dry_run else ""))
-        self.stdout.write(f"   Target: {target_desc}")
-        self.stdout.write(f"   Strategy: {strategy}")
-        self.stdout.write("")
-        self.stdout.write("📊 Statistics:")
-        self.stdout.write(f"   Total AccessLog records: {total_records:,}")
-        self.stdout.write(f"   Target records: {target_records:,}")
-        self.stdout.write(f"   Records to delete: {to_delete:,}")
-        self.stdout.write(f"   Records to keep: {target_records - to_delete:,}")
-        
-        if total_records > 0:
-            delete_percent = (to_delete / total_records) * 100
-            self.stdout.write(f"   Deletion percentage: {delete_percent:.1f}%")
-        
-        if to_delete == 0:
-            self.stdout.write(self.style.SUCCESS("✅ No records to delete."))
-            return
-        
-        # Show SQL that will be executed
-        if dry_run or not force:
-            self.stdout.write("")
-            self.stdout.write("📝 SQL to execute:")
-            if keep_days:
-                sql_preview = f"""
-                DELETE FROM vpn_accesslog 
-                WHERE {base_condition} AND timestamp < '{cutoff_date.strftime('%Y-%m-%d %H:%M:%S')}'
-                """
-            else:  # keep_count
-                sql_preview = f"""
-                DELETE FROM vpn_accesslog 
-                WHERE {base_condition} 
-                  AND id NOT IN (
-                    SELECT id FROM (
-                      SELECT id FROM vpn_accesslog 
-                      WHERE {base_condition}
-                      ORDER BY timestamp DESC 
-                      LIMIT {keep_count}
-                    ) AS recent_logs
-                  )
-                """
-            self.stdout.write(sql_preview.strip())
-        
-        if dry_run:
-            self.stdout.write("")
-            self.stdout.write(self.style.WARNING(f"🔍 DRY RUN: Would delete {to_delete:,} records"))
-            return
-        
-        # Confirm deletion
-        if not force:
-            self.stdout.write("")
-            self.stdout.write(self.style.ERROR(f"⚠️  About to DELETE {to_delete:,} records!"))
-            confirm = input("Type 'DELETE' to confirm: ")
-            if confirm != 'DELETE':
-                self.stdout.write("❌ Cancelled.")
-                return
-        
-        # Execute deletion
-        self.stdout.write("")
-        self.stdout.write(f"🗑️  Deleting {to_delete:,} records...")
-        
-        with connection.cursor() as cursor:
-            if keep_days:
-                # Simple time-based deletion
-                cursor.execute(f"""
-                    DELETE FROM vpn_accesslog 
-                    WHERE {base_condition} AND timestamp < %s
-                """, [cutoff_date])
-            else:
-                # Keep count deletion (more complex)
-                cursor.execute(f"""
-                    DELETE FROM vpn_accesslog 
-                    WHERE {base_condition} 
-                      AND id NOT IN (
-                        SELECT id FROM (
-                          SELECT id FROM vpn_accesslog 
-                          WHERE {base_condition}
-                          ORDER BY timestamp DESC 
-                          LIMIT %s
-                        ) AS recent_logs
-                      )
-                """, [keep_count])
-            
-            deleted_count = cursor.rowcount
-        
-        # Final statistics
-        with connection.cursor() as cursor:
-            cursor.execute("SELECT COUNT(*) FROM vpn_accesslog")
-            final_total = cursor.fetchone()[0]
-            
-            cursor.execute(f"SELECT COUNT(*) FROM vpn_accesslog WHERE {base_condition}")
-            final_target = cursor.fetchone()[0]
-        
-        self.stdout.write("")
-        self.stdout.write(self.style.SUCCESS("✅ Cleanup completed!"))
-        self.stdout.write(f"   Deleted: {deleted_count:,} records")
-        self.stdout.write(f"   Remaining total: {final_total:,}")
-        
-        if target == 'no-links':
-            self.stdout.write(f"   Remaining without links: {final_target:,}")
-        
-        # Calculate space saved (rough estimate)
-        if deleted_count > 0:
-            # Rough estimate: ~200 bytes per AccessLog record
-            space_saved_mb = (deleted_count * 200) / (1024 * 1024)
-            if space_saved_mb > 1024:
-                space_saved_gb = space_saved_mb / 1024
-                self.stdout.write(f"   Estimated space saved: ~{space_saved_gb:.1f} GB")
-            else:
-                self.stdout.write(f"   Estimated space saved: ~{space_saved_mb:.1f} MB")
diff --git a/vpn/management/commands/create_admin.py b/vpn/management/commands/create_admin.py
deleted file mode 100644
index 7305e80..0000000
--- a/vpn/management/commands/create_admin.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.contrib.auth import get_user_model
-
-class Command(BaseCommand):
-    help = 'Create default admin user'
-
-    def handle(self, *args, **kwargs):
-        User = get_user_model()
-        if not User.objects.filter(username='admin').exists():
-            User.objects.create_superuser(
-                username='admin',
-                password='admin',
-                email='admin@localhost'
-            )
-            self.stdout.write(self.style.SUCCESS('Admin user created'))
-        else:
-            self.stdout.write(self.style.WARNING('Admin user already exists'))
diff --git a/vpn/management/commands/init_statistics.py b/vpn/management/commands/init_statistics.py
deleted file mode 100644
index df1864a..0000000
--- a/vpn/management/commands/init_statistics.py
+++ /dev/null
@@ -1 +0,0 @@
-from django.core.management.base import BaseCommand\nfrom django.utils import timezone\nfrom vpn.models import User, ACLLink, UserStatistics\nfrom vpn.tasks import update_user_statistics\n\n\nclass Command(BaseCommand):\n    help = 'Initialize user statistics cache by running the update task'\n    \n    def add_arguments(self, parser):\n        parser.add_argument(\n            '--async',\n            action='store_true',\n            help='Run statistics update as async Celery task (default: sync)',\n        )\n        parser.add_argument(\n            '--force',\n            action='store_true',\n            help='Force update even if statistics already exist',\n        )\n    \n    def handle(self, *args, **options):\n        # Check if statistics already exist\n        existing_stats = UserStatistics.objects.count()\n        \n        if existing_stats > 0 and not options['force']:\n            self.stdout.write(\n                self.style.WARNING(\n                    f'Statistics cache already contains {existing_stats} entries. '\n                    'Use --force to update anyway.'\n                )\n            )\n            return\n        \n        # Check if there are users with ACL links\n        users_with_links = User.objects.filter(acl__isnull=False).distinct().count()\n        total_links = ACLLink.objects.count()\n        \n        self.stdout.write(\n            f'Found {users_with_links} users with {total_links} ACL links total'\n        )\n        \n        if total_links == 0:\n            self.stdout.write(\n                self.style.WARNING('No ACL links found. Nothing to process.')\n            )\n            return\n        \n        if options['async']:\n            # Run as async Celery task\n            try:\n                task = update_user_statistics.delay()\n                self.stdout.write(\n                    self.style.SUCCESS(\n                        f'Statistics update task started. Task ID: {task.id}'\n                    )\n                )\n                self.stdout.write(\n                    'Check admin panel Task Execution Logs for progress.'\n                )\n            except Exception as e:\n                self.stdout.write(\n                    self.style.ERROR(f'Failed to start async task: {e}')\n                )\n        else:\n            # Run synchronously\n            self.stdout.write('Starting synchronous statistics update...')\n            \n            try:\n                # Import and call the task function directly\n                from vpn.tasks import update_user_statistics\n                \n                # Create a mock Celery request object for the task\n                class MockRequest:\n                    id = f'manual-{timezone.now().isoformat()}'\n                    retries = 0\n                \n                # Create mock task instance\n                task_instance = type('MockTask', (), {\n                    'request': MockRequest(),\n                })()\n                \n                # Call the task function directly\n                result = update_user_statistics(task_instance)\n                \n                self.stdout.write(\n                    self.style.SUCCESS(f'Statistics update completed: {result}')\n                )\n                \n                # Show summary\n                final_stats = UserStatistics.objects.count()\n                self.stdout.write(\n                    self.style.SUCCESS(\n                        f'Statistics cache now contains {final_stats} entries'\n                    )\n                )\n                \n            except Exception as e:\n                self.stdout.write(\n                    self.style.ERROR(f'Statistics update failed: {e}')\n                )\n                import traceback\n                self.stdout.write(traceback.format_exc())\n
\ No newline at end of file
diff --git a/vpn/management/commands/simple_cleanup_logs.py b/vpn/management/commands/simple_cleanup_logs.py
deleted file mode 100644
index 393cb86..0000000
--- a/vpn/management/commands/simple_cleanup_logs.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.utils import timezone
-from datetime import timedelta
-from vpn.models import AccessLog
-
-
-class Command(BaseCommand):
-    help = 'Simple cleanup of AccessLog entries without acl_link_id using Django ORM'
-
-    def add_arguments(self, parser):
-        parser.add_argument(
-            '--days',
-            type=int,
-            default=30,
-            help='Delete logs older than this many days (default: 30)'
-        )
-
-    def handle(self, *args, **options):
-        days = options['days']
-        cutoff_date = timezone.now() - timedelta(days=days)
-        
-        # Count records to be deleted
-        old_logs = AccessLog.objects.filter(
-            acl_link_id__isnull=True,
-            timestamp__lt=cutoff_date
-        )
-        
-        # Also include empty string acl_link_id
-        empty_logs = AccessLog.objects.filter(
-            acl_link_id='',
-            timestamp__lt=cutoff_date
-        )
-        
-        total_old = old_logs.count()
-        total_empty = empty_logs.count()
-        total_to_delete = total_old + total_empty
-        
-        self.stdout.write(f"Found {total_to_delete:,} old logs without acl_link_id to delete")
-        
-        if total_to_delete == 0:
-            self.stdout.write("Nothing to delete.")
-            return
-        
-        # Delete in batches to avoid memory issues
-        self.stdout.write("Deleting old logs...")
-        
-        deleted_count = 0
-        deleted_count += old_logs._raw_delete(old_logs.db)
-        deleted_count += empty_logs._raw_delete(empty_logs.db)
-        
-        self.stdout.write(self.style.SUCCESS(f"Deleted {deleted_count:,} old AccessLog records"))
diff --git a/vpn/migrations/0001_initial.py b/vpn/migrations/0001_initial.py
deleted file mode 100644
index eac202c..0000000
--- a/vpn/migrations/0001_initial.py
+++ /dev/null
@@ -1,139 +0,0 @@
-# Initial migration
-
-from django.conf import settings
-from django.db import migrations, models
-import django.contrib.auth.models
-import django.contrib.auth.validators
-import django.db.models.deletion
-import django.utils.timezone
-import shortuuid
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('auth', '0012_alter_user_first_name_max_length'),
-        ('contenttypes', '0002_remove_content_type_name'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='User',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
-                ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
-                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
-                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
-                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
-                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
-                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('comment', models.TextField(blank=True, default='', help_text='Free form user comment')),
-                ('registration_date', models.DateTimeField(auto_now_add=True, verbose_name='Created')),
-                ('last_access', models.DateTimeField(blank=True, null=True)),
-                ('hash', models.CharField(help_text='Random user hash. It\'s using for client config generation.', max_length=64, unique=True)),
-                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
-                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
-            ],
-            options={
-                'verbose_name': 'user',
-                'verbose_name_plural': 'users',
-                'abstract': False,
-            },
-            managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
-            ],
-        ),
-        migrations.CreateModel(
-            name='AccessLog',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('user', models.CharField(blank=True, editable=False, max_length=256, null=True)),
-                ('server', models.CharField(blank=True, editable=False, max_length=256, null=True)),
-                ('action', models.CharField(editable=False, max_length=100)),
-                ('data', models.TextField(blank=True, default='', editable=False)),
-                ('timestamp', models.DateTimeField(auto_now_add=True)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Server',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(help_text='Server name', max_length=100)),
-                ('comment', models.TextField(blank=True, default='')),
-                ('registration_date', models.DateTimeField(auto_now_add=True, verbose_name='Created')),
-                ('server_type', models.CharField(choices=[('Outline', 'Outline'), ('Wireguard', 'Wireguard')], editable=False, max_length=50)),
-                ('polymorphic_ctype', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype')),
-            ],
-            options={
-                'verbose_name': 'Server',
-                'verbose_name_plural': 'Servers',
-                'permissions': [('access_server', 'Can view public status')],
-                'base_manager_name': 'objects',
-            },
-        ),
-        migrations.CreateModel(
-            name='OutlineServer',
-            fields=[
-                ('server_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='vpn.server')),
-                ('admin_url', models.URLField(help_text='Management URL')),
-                ('admin_access_cert', models.CharField(help_text='Fingerprint', max_length=255)),
-                ('client_hostname', models.CharField(help_text='Server address for clients', max_length=255)),
-                ('client_port', models.CharField(help_text='Server port for clients', max_length=5)),
-            ],
-            options={
-                'verbose_name': 'Outline',
-                'verbose_name_plural': 'Outline',
-                'base_manager_name': 'objects',
-            },
-            bases=('vpn.server',),
-        ),
-        migrations.CreateModel(
-            name='WireguardServer',
-            fields=[
-                ('server_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='vpn.server')),
-                ('address', models.CharField(max_length=100)),
-                ('port', models.IntegerField()),
-                ('client_private_key', models.CharField(max_length=255)),
-                ('server_publick_key', models.CharField(max_length=255)),
-            ],
-            options={
-                'verbose_name': 'Wireguard',
-                'verbose_name_plural': 'Wireguard',
-                'base_manager_name': 'objects',
-            },
-            bases=('vpn.server',),
-        ),
-        migrations.CreateModel(
-            name='ACL',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created')),
-                ('server', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vpn.server')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='ACLLink',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('comment', models.TextField(blank=True, default='', help_text='ACL link comment, device name, etc...')),
-                ('link', models.CharField(blank=True, default='', help_text='Access link to get dynamic configuration', max_length=1024, null=True, unique=True, verbose_name='Access link')),
-                ('acl', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='links', to='vpn.acl')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='servers',
-            field=models.ManyToManyField(blank=True, help_text='Servers user has access to', through='vpn.ACL', to='vpn.server'),
-        ),
-        migrations.AddConstraint(
-            model_name='acl',
-            constraint=models.UniqueConstraint(fields=('user', 'server'), name='unique_user_server'),
-        ),
-    ]
diff --git a/vpn/migrations/0002_taskexecutionlog.py b/vpn/migrations/0002_taskexecutionlog.py
deleted file mode 100644
index d9cba00..0000000
--- a/vpn/migrations/0002_taskexecutionlog.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Generated manually to fix migration issue
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RunSQL(
-            "DROP TABLE IF EXISTS vpn_taskexecutionlog CASCADE;",
-            reverse_sql="-- No reverse operation"
-        ),
-        migrations.CreateModel(
-            name='TaskExecutionLog',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('task_id', models.CharField(help_text='Celery task ID', max_length=255)),
-                ('task_name', models.CharField(help_text='Task name', max_length=100)),
-                ('action', models.CharField(help_text='Action performed', max_length=100)),
-                ('status', models.CharField(choices=[('STARTED', 'Started'), ('SUCCESS', 'Success'), ('FAILURE', 'Failure'), ('RETRY', 'Retry')], default='STARTED', max_length=20)),
-                ('message', models.TextField(help_text='Detailed execution message')),
-                ('execution_time', models.FloatField(blank=True, help_text='Execution time in seconds', null=True)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('server', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='vpn.server')),
-                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='vpn.user')),
-            ],
-            options={
-                'verbose_name': 'Task Execution Log',
-                'verbose_name_plural': 'Task Execution Logs',
-                'ordering': ['-created_at'],
-            },
-        ),
-        # Create indexes with safe SQL to avoid conflicts
-        migrations.RunSQL(
-            "CREATE INDEX IF NOT EXISTS vpn_taskexec_task_id_idx ON vpn_taskexecutionlog (task_id);",
-            reverse_sql="DROP INDEX IF EXISTS vpn_taskexec_task_id_idx;"
-        ),
-        migrations.RunSQL(
-            "CREATE INDEX IF NOT EXISTS vpn_taskexec_created_idx ON vpn_taskexecutionlog (created_at);",
-            reverse_sql="DROP INDEX IF EXISTS vpn_taskexec_created_idx;"
-        ),
-        migrations.RunSQL(
-            "CREATE INDEX IF NOT EXISTS vpn_taskexec_status_idx ON vpn_taskexecutionlog (status);",
-            reverse_sql="DROP INDEX IF EXISTS vpn_taskexec_status_idx;"
-        ),
-    ]
diff --git a/vpn/migrations/0003_acllink_last_access_time.py b/vpn/migrations/0003_acllink_last_access_time.py
deleted file mode 100644
index 7f206d2..0000000
--- a/vpn/migrations/0003_acllink_last_access_time.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated migration for adding last_access_time field
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0002_taskexecutionlog'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='acllink',
-            name='last_access_time',
-            field=models.DateTimeField(blank=True, help_text='Last time this link was accessed', null=True),
-        ),
-    ]
diff --git a/vpn/migrations/0003_alter_outlineserver_options_alter_server_options_and_more.py b/vpn/migrations/0003_alter_outlineserver_options_alter_server_options_and_more.py
deleted file mode 100644
index a159409..0000000
--- a/vpn/migrations/0003_alter_outlineserver_options_alter_server_options_and_more.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# Generated by Django 5.1.7 on 2025-07-21 01:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0002_taskexecutionlog'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='outlineserver',
-            options={'verbose_name': 'Outline', 'verbose_name_plural': 'Outline'},
-        ),
-        migrations.AlterModelOptions(
-            name='server',
-            options={'permissions': [('access_server', 'Can view public status')], 'verbose_name': 'Server', 'verbose_name_plural': 'Servers'},
-        ),
-        migrations.AlterModelOptions(
-            name='wireguardserver',
-            options={'verbose_name': 'Wireguard', 'verbose_name_plural': 'Wireguard'},
-        ),
-        migrations.AddIndex(
-            model_name='accesslog',
-            index=models.Index(fields=['user'], name='vpn_accessl_user_05a541_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='accesslog',
-            index=models.Index(fields=['server'], name='vpn_accessl_server_0865e6_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='accesslog',
-            index=models.Index(fields=['timestamp'], name='vpn_accessl_timesta_480a45_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='accesslog',
-            index=models.Index(fields=['action', 'timestamp'], name='vpn_accessl_action_898948_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='taskexecutionlog',
-            index=models.Index(fields=['task_id'], name='vpn_taskexe_task_id_e7e101_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='taskexecutionlog',
-            index=models.Index(fields=['created_at'], name='vpn_taskexe_created_b458ed_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='taskexecutionlog',
-            index=models.Index(fields=['status'], name='vpn_taskexe_status_2f0769_idx'),
-        ),
-    ]
diff --git a/vpn/migrations/0004_merge_20250721_1223.py b/vpn/migrations/0004_merge_20250721_1223.py
deleted file mode 100644
index bffcdb7..0000000
--- a/vpn/migrations/0004_merge_20250721_1223.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated by Django 5.1.7 on 2025-07-21 09:23
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0003_acllink_last_access_time'),
-        ('vpn', '0003_alter_outlineserver_options_alter_server_options_and_more'),
-    ]
-
-    operations = [
-    ]
diff --git a/vpn/migrations/0005_userstatistics.py b/vpn/migrations/0005_userstatistics.py
deleted file mode 100644
index 1127081..0000000
--- a/vpn/migrations/0005_userstatistics.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# Generated migration for UserStatistics model
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0004_merge_20250721_1223'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='UserStatistics',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('server_name', models.CharField(max_length=256)),
-                ('acl_link_id', models.CharField(blank=True, help_text='None for server-level stats', max_length=1024, null=True)),
-                ('total_connections', models.IntegerField(default=0)),
-                ('recent_connections', models.IntegerField(default=0)),
-                ('daily_usage', models.JSONField(default=list, help_text='Daily connection counts for last 30 days')),
-                ('max_daily', models.IntegerField(default=0)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'User Statistics',
-                'verbose_name_plural': 'User Statistics',
-            },
-        ),
-        migrations.AddIndex(
-            model_name='userstatistics',
-            index=models.Index(fields=['user', 'server_name'], name='vpn_usersta_user_id_1c7cd0_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='userstatistics',
-            index=models.Index(fields=['updated_at'], name='vpn_usersta_updated_8e6e9b_idx'),
-        ),
-        migrations.AlterUniqueTogether(
-            name='userstatistics',
-            unique_together={('user', 'server_name', 'acl_link_id')},
-        ),
-    ]
diff --git a/vpn/migrations/0006_accesslog_acl_link_id.py b/vpn/migrations/0006_accesslog_acl_link_id.py
deleted file mode 100644
index 17e4ffe..0000000
--- a/vpn/migrations/0006_accesslog_acl_link_id.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated migration for AccessLog acl_link_id field
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0005_userstatistics'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='accesslog',
-            name='acl_link_id',
-            field=models.CharField(blank=True, editable=False, help_text='ID of the ACL link used', max_length=1024, null=True),
-        ),
-        migrations.AddIndex(
-            model_name='accesslog',
-            index=models.Index(fields=['acl_link_id'], name='vpn_accessl_acl_lin_b23c6e_idx'),
-        ),
-    ]
diff --git a/vpn/migrations/0006_rename_vpn_usersta_user_id_1c7cd0_idx_vpn_usersta_user_id_512036_idx_and_more.py b/vpn/migrations/0006_rename_vpn_usersta_user_id_1c7cd0_idx_vpn_usersta_user_id_512036_idx_and_more.py
deleted file mode 100644
index 9aad9c6..0000000
--- a/vpn/migrations/0006_rename_vpn_usersta_user_id_1c7cd0_idx_vpn_usersta_user_id_512036_idx_and_more.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 5.1.7 on 2025-07-21 10:28
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0005_userstatistics'),
-    ]
-
-    operations = [
-        migrations.RenameIndex(
-            model_name='userstatistics',
-            new_name='vpn_usersta_user_id_512036_idx',
-            old_name='vpn_usersta_user_id_1c7cd0_idx',
-        ),
-        migrations.RenameIndex(
-            model_name='userstatistics',
-            new_name='vpn_usersta_updated_5ac650_idx',
-            old_name='vpn_usersta_updated_8e6e9b_idx',
-        ),
-    ]
diff --git a/vpn/migrations/0007_merge_20250721_1345.py b/vpn/migrations/0007_merge_20250721_1345.py
deleted file mode 100644
index dbc841c..0000000
--- a/vpn/migrations/0007_merge_20250721_1345.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated by Django 5.1.7 on 2025-07-21 10:45
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0006_accesslog_acl_link_id'),
-        ('vpn', '0006_rename_vpn_usersta_user_id_1c7cd0_idx_vpn_usersta_user_id_512036_idx_and_more'),
-    ]
-
-    operations = [
-    ]
diff --git a/vpn/migrations/0008_rename_vpn_accessl_acl_lin_b23c6e_idx_vpn_accessl_acl_lin_9f3bc5_idx.py b/vpn/migrations/0008_rename_vpn_accessl_acl_lin_b23c6e_idx_vpn_accessl_acl_lin_9f3bc5_idx.py
deleted file mode 100644
index 8eb1748..0000000
--- a/vpn/migrations/0008_rename_vpn_accessl_acl_lin_b23c6e_idx_vpn_accessl_acl_lin_9f3bc5_idx.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.1.7 on 2025-07-21 10:54
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0007_merge_20250721_1345'),
-    ]
-
-    operations = [
-        migrations.RenameIndex(
-            model_name='accesslog',
-            new_name='vpn_accessl_acl_lin_9f3bc5_idx',
-            old_name='vpn_accessl_acl_lin_b23c6e_idx',
-        ),
-    ]
diff --git a/vpn/migrations/0009_xraycoreserver_alter_server_server_type.py b/vpn/migrations/0009_xraycoreserver_alter_server_server_type.py
deleted file mode 100644
index 4371962..0000000
--- a/vpn/migrations/0009_xraycoreserver_alter_server_server_type.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Generated by Django 5.1.7 on 2025-07-27 17:42
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0008_rename_vpn_accessl_acl_lin_b23c6e_idx_vpn_accessl_acl_lin_9f3bc5_idx'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='XrayCoreServer',
-            fields=[
-                ('server_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='vpn.server')),
-                ('api_address', models.CharField(help_text='Xray Core API address (e.g., http://127.0.0.1:8080)', max_length=255)),
-                ('api_port', models.IntegerField(default=8080, help_text='API port for management interface')),
-                ('api_token', models.CharField(blank=True, help_text='API authentication token', max_length=255)),
-                ('server_address', models.CharField(help_text='Server address for clients to connect', max_length=255)),
-                ('server_port', models.IntegerField(default=443, help_text='Server port for client connections')),
-                ('protocol', models.CharField(choices=[('vless', 'VLESS'), ('vmess', 'VMess'), ('shadowsocks', 'Shadowsocks'), ('trojan', 'Trojan')], default='vless', help_text='Primary protocol for this server', max_length=20)),
-                ('security', models.CharField(choices=[('none', 'None'), ('tls', 'TLS'), ('reality', 'REALITY'), ('xtls', 'XTLS')], default='tls', help_text='Security layer configuration', max_length=20)),
-                ('transport', models.CharField(choices=[('tcp', 'TCP'), ('ws', 'WebSocket'), ('http', 'HTTP/2'), ('grpc', 'gRPC'), ('quic', 'QUIC')], default='tcp', help_text='Transport protocol', max_length=20)),
-                ('config_json', models.JSONField(blank=True, default=dict, help_text='Complete Xray configuration in JSON format')),
-                ('panel_url', models.CharField(blank=True, help_text='Web panel URL if using 3X-UI or similar management panel', max_length=255)),
-                ('panel_username', models.CharField(blank=True, help_text='Panel admin username', max_length=100)),
-                ('panel_password', models.CharField(blank=True, help_text='Panel admin password', max_length=100)),
-            ],
-            options={
-                'verbose_name': 'Xray Core Server',
-                'verbose_name_plural': 'Xray Core Servers',
-            },
-            bases=('vpn.server',),
-        ),
-        migrations.AlterField(
-            model_name='server',
-            name='server_type',
-            field=models.CharField(choices=[('Outline', 'Outline'), ('Wireguard', 'Wireguard'), ('xray_core', 'Xray Core')], editable=False, max_length=50),
-        ),
-    ]
diff --git a/vpn/migrations/0010_remove_xraycoreserver_api_address_and_more.py b/vpn/migrations/0010_remove_xraycoreserver_api_address_and_more.py
deleted file mode 100644
index 19d99b3..0000000
--- a/vpn/migrations/0010_remove_xraycoreserver_api_address_and_more.py
+++ /dev/null
@@ -1,137 +0,0 @@
-# Generated by Django 5.1.7 on 2025-07-28 22:34
-
-import django.contrib.postgres.fields
-import django.db.models.deletion
-import uuid
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0009_xraycoreserver_alter_server_server_type'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='api_address',
-        ),
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='api_port',
-        ),
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='api_token',
-        ),
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='config_json',
-        ),
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='panel_password',
-        ),
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='panel_url',
-        ),
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='panel_username',
-        ),
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='protocol',
-        ),
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='security',
-        ),
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='server_address',
-        ),
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='server_port',
-        ),
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='transport',
-        ),
-        migrations.AddField(
-            model_name='xraycoreserver',
-            name='default_protocol',
-            field=models.CharField(choices=[('vless', 'VLESS'), ('vmess', 'VMess'), ('trojan', 'Trojan'), ('shadowsocks', 'Shadowsocks')], default='vless', help_text='Default protocol for new inbounds', max_length=20),
-        ),
-        migrations.AddField(
-            model_name='xraycoreserver',
-            name='enable_stats',
-            field=models.BooleanField(default=True, help_text='Enable traffic statistics tracking'),
-        ),
-        migrations.AddField(
-            model_name='xraycoreserver',
-            name='grpc_address',
-            field=models.CharField(default='127.0.0.1', help_text='Xray Core gRPC API address', max_length=255),
-        ),
-        migrations.AddField(
-            model_name='xraycoreserver',
-            name='grpc_port',
-            field=models.IntegerField(default=10085, help_text='gRPC API port (usually 10085)'),
-        ),
-        migrations.CreateModel(
-            name='XrayInbound',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('tag', models.CharField(help_text='Unique identifier for this inbound', max_length=100)),
-                ('port', models.IntegerField(help_text='Port to listen on')),
-                ('listen', models.CharField(default='0.0.0.0', help_text='IP address to listen on', max_length=255)),
-                ('protocol', models.CharField(choices=[('vless', 'VLESS'), ('vmess', 'VMess'), ('trojan', 'Trojan'), ('shadowsocks', 'Shadowsocks')], max_length=20)),
-                ('enabled', models.BooleanField(default=True)),
-                ('is_default', models.BooleanField(default=False, help_text='Use this inbound for new users by default')),
-                ('network', models.CharField(choices=[('tcp', 'TCP'), ('ws', 'WebSocket'), ('http', 'HTTP/2'), ('grpc', 'gRPC'), ('quic', 'QUIC')], default='tcp', max_length=20)),
-                ('security', models.CharField(choices=[('none', 'None'), ('tls', 'TLS'), ('reality', 'REALITY')], default='none', max_length=20)),
-                ('server_address', models.CharField(blank=True, help_text='Public server address for client connections (if different from listen address)', max_length=255)),
-                ('ss_method', models.CharField(blank=True, default='chacha20-ietf-poly1305', help_text='Shadowsocks encryption method', max_length=50)),
-                ('ss_password', models.CharField(blank=True, help_text='Shadowsocks password (for single-user mode)', max_length=255)),
-                ('tls_cert_file', models.CharField(blank=True, max_length=255)),
-                ('tls_key_file', models.CharField(blank=True, max_length=255)),
-                ('tls_alpn', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=20), blank=True, default=list, size=None)),
-                ('stream_settings', models.JSONField(blank=True, default=dict)),
-                ('sniffing_settings', models.JSONField(blank=True, default=dict)),
-                ('server', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='inbounds', to='vpn.xraycoreserver')),
-            ],
-            options={
-                'ordering': ['port'],
-                'unique_together': {('server', 'port'), ('server', 'tag')},
-            },
-        ),
-        migrations.CreateModel(
-            name='XrayClient',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('uuid', models.UUIDField(default=uuid.uuid4, unique=True)),
-                ('email', models.CharField(help_text='Email for statistics', max_length=255)),
-                ('level', models.IntegerField(default=0)),
-                ('enable', models.BooleanField(default=True)),
-                ('flow', models.CharField(blank=True, help_text='VLESS flow control', max_length=50)),
-                ('alter_id', models.IntegerField(default=0, help_text='VMess alterId')),
-                ('password', models.CharField(blank=True, help_text='Password for Trojan/Shadowsocks', max_length=255)),
-                ('total_gb', models.IntegerField(blank=True, help_text='Traffic limit in GB', null=True)),
-                ('expiry_time', models.DateTimeField(blank=True, help_text='Account expiration time', null=True)),
-                ('up', models.BigIntegerField(default=0, help_text='Upload bytes')),
-                ('down', models.BigIntegerField(default=0, help_text='Download bytes')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('inbound', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='clients', to='vpn.xrayinbound')),
-            ],
-            options={
-                'ordering': ['created_at'],
-                'unique_together': {('inbound', 'user')},
-            },
-        ),
-    ]
diff --git a/vpn/migrations/0011_xrayinboundproxy_and_more.py b/vpn/migrations/0011_xrayinboundproxy_and_more.py
deleted file mode 100644
index aa1c8ca..0000000
--- a/vpn/migrations/0011_xrayinboundproxy_and_more.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by Django 5.1.7 on 2025-07-31 21:52
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0010_remove_xraycoreserver_api_address_and_more'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='XrayInboundProxy',
-            fields=[
-            ],
-            options={
-                'verbose_name': 'Xray Inbound (Server View)',
-                'verbose_name_plural': 'Xray Inbounds (Server View)',
-                'proxy': True,
-                'indexes': [],
-                'constraints': [],
-            },
-            bases=('vpn.xrayinbound',),
-        ),
-        migrations.RemoveField(
-            model_name='xraycoreserver',
-            name='default_protocol',
-        ),
-        migrations.RemoveField(
-            model_name='xrayinbound',
-            name='is_default',
-        ),
-    ]
diff --git a/vpn/migrations/0012_xrayinboundserver_delete_xrayinboundproxy.py b/vpn/migrations/0012_xrayinboundserver_delete_xrayinboundproxy.py
deleted file mode 100644
index fd70eb1..0000000
--- a/vpn/migrations/0012_xrayinboundserver_delete_xrayinboundproxy.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated by Django 5.1.7 on 2025-07-31 21:58
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0011_xrayinboundproxy_and_more'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='XrayInboundServer',
-            fields=[
-                ('server_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='vpn.server')),
-                ('xray_inbound', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='server_proxy', to='vpn.xrayinbound')),
-            ],
-            options={
-                'verbose_name': 'Xray Inbound Server',
-                'verbose_name_plural': 'Xray Inbound Servers',
-            },
-            bases=('vpn.server',),
-        ),
-        migrations.DeleteModel(
-            name='XrayInboundProxy',
-        ),
-    ]
diff --git a/vpn/migrations/0013_add_client_hostname.py b/vpn/migrations/0013_add_client_hostname.py
deleted file mode 100644
index d43de30..0000000
--- a/vpn/migrations/0013_add_client_hostname.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.1.7 on 2025-07-31 22:47
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0012_xrayinboundserver_delete_xrayinboundproxy'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='xraycoreserver',
-            name='client_hostname',
-            field=models.CharField(default='127.0.0.1', help_text='Hostname or IP address for client connections (what clients use to connect)', max_length=255),
-        ),
-    ]
diff --git a/vpn/migrations/0014_alter_xraycoreserver_client_hostname_and_more.py b/vpn/migrations/0014_alter_xraycoreserver_client_hostname_and_more.py
deleted file mode 100644
index 1d059dc..0000000
--- a/vpn/migrations/0014_alter_xraycoreserver_client_hostname_and_more.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-04 22:21
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0013_add_client_hostname'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='xraycoreserver',
-            name='client_hostname',
-            field=models.CharField(default='127.0.0.1', help_text='Hostname or IP address for client connections', max_length=255),
-        ),
-        migrations.AlterField(
-            model_name='xrayinbound',
-            name='server_address',
-            field=models.CharField(blank=True, help_text='Public server address for client connections', max_length=255),
-        ),
-    ]
diff --git a/vpn/migrations/0015_remove_old_xray_models.py b/vpn/migrations/0015_remove_old_xray_models.py
deleted file mode 100644
index 286e1f6..0000000
--- a/vpn/migrations/0015_remove_old_xray_models.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Generated manually to properly remove old Xray models
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0014_alter_xraycoreserver_client_hostname_and_more'),
-    ]
-
-    operations = [
-        # Remove unique_together first to avoid field reference issues
-        migrations.AlterUniqueTogether(
-            name='xrayinbound',
-            unique_together=None,
-        ),
-        
-        # Remove old models completely
-        migrations.DeleteModel(
-            name='XrayClient',
-        ),
-        migrations.DeleteModel(
-            name='XrayInbound',
-        ),
-        migrations.DeleteModel(
-            name='XrayInboundServer',
-        ),
-        migrations.DeleteModel(
-            name='XrayCoreServer',
-        ),
-    ]
\ No newline at end of file
diff --git a/vpn/migrations/0016_add_new_xray_models.py b/vpn/migrations/0016_add_new_xray_models.py
deleted file mode 100644
index 5f3ae33..0000000
--- a/vpn/migrations/0016_add_new_xray_models.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# Generated manually to add new Xray models
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0015_remove_old_xray_models'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='XrayConfiguration',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('grpc_address', models.CharField(default='127.0.0.1:10085', help_text='Xray gRPC API address (host:port)', max_length=255)),
-                ('default_client_hostname', models.CharField(help_text='Default hostname for client connections', max_length=255)),
-                ('stats_enabled', models.BooleanField(default=True, help_text='Enable traffic statistics')),
-                ('cert_renewal_days', models.IntegerField(default=60, help_text='Renew certificates X days before expiration')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-            ],
-            options={
-                'verbose_name': 'Xray Configuration',
-                'verbose_name_plural': 'Xray Configuration',
-            },
-        ),
-        migrations.CreateModel(
-            name='Credentials',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(help_text='Descriptive name for these credentials', max_length=100, unique=True)),
-                ('cred_type', models.CharField(choices=[('cloudflare', 'Cloudflare API'), ('dns_provider', 'DNS Provider'), ('email', 'Email SMTP'), ('other', 'Other')], help_text='Type of credentials', max_length=20)),
-                ('credentials', models.JSONField(help_text="Credentials data (e.g., {'api_token': '...', 'email': '...'})")),
-                ('description', models.TextField(blank=True, help_text='Description of what these credentials are used for')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-            ],
-            options={
-                'verbose_name': 'Credentials',
-                'verbose_name_plural': 'Credentials',
-                'ordering': ['cred_type', 'name'],
-            },
-        ),
-        migrations.CreateModel(
-            name='Certificate',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('domain', models.CharField(help_text='Domain name for this certificate', max_length=255, unique=True)),
-                ('certificate_pem', models.TextField(help_text='Certificate in PEM format')),
-                ('private_key_pem', models.TextField(help_text='Private key in PEM format')),
-                ('cert_type', models.CharField(choices=[('self_signed', 'Self-Signed'), ('letsencrypt', "Let's Encrypt"), ('custom', 'Custom')], help_text='Type of certificate', max_length=20)),
-                ('expires_at', models.DateTimeField(help_text='Certificate expiration date')),
-                ('auto_renew', models.BooleanField(default=True, help_text='Automatically renew certificate before expiration')),
-                ('last_renewed', models.DateTimeField(blank=True, help_text='Last renewal timestamp', null=True)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('credentials', models.ForeignKey(blank=True, help_text="Credentials for Let's Encrypt (Cloudflare API)", null=True, on_delete=django.db.models.deletion.SET_NULL, to='vpn.credentials')),
-            ],
-            options={
-                'verbose_name': 'Certificate',
-                'verbose_name_plural': 'Certificates',
-                'ordering': ['domain'],
-            },
-        ),
-        migrations.CreateModel(
-            name='Inbound',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(help_text='Unique identifier for this inbound', max_length=100, unique=True)),
-                ('protocol', models.CharField(choices=[('vless', 'VLESS'), ('vmess', 'VMess'), ('trojan', 'Trojan'), ('shadowsocks', 'Shadowsocks')], help_text='Protocol type', max_length=20)),
-                ('port', models.IntegerField(help_text='Port to listen on')),
-                ('network', models.CharField(choices=[('tcp', 'TCP'), ('ws', 'WebSocket'), ('grpc', 'gRPC'), ('http', 'HTTP/2'), ('quic', 'QUIC')], default='tcp', help_text='Transport protocol', max_length=20)),
-                ('security', models.CharField(choices=[('none', 'None'), ('tls', 'TLS'), ('reality', 'REALITY')], default='none', help_text='Security type', max_length=20)),
-                ('domain', models.CharField(blank=True, help_text='Client connection domain', max_length=255)),
-                ('full_config', models.JSONField(default=dict, help_text='Complete configuration for creating inbound on server')),
-                ('listen_address', models.CharField(default='0.0.0.0', help_text='IP address to listen on', max_length=45)),
-                ('enable_sniffing', models.BooleanField(default=True, help_text='Enable protocol sniffing')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('certificate', models.ForeignKey(blank=True, help_text='Certificate for TLS', null=True, on_delete=django.db.models.deletion.SET_NULL, to='vpn.certificate')),
-            ],
-            options={
-                'verbose_name': 'Inbound',
-                'verbose_name_plural': 'Inbounds',
-                'ordering': ['protocol', 'port'],
-                'unique_together': {('port', 'listen_address')},
-            },
-        ),
-        migrations.CreateModel(
-            name='SubscriptionGroup',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(help_text="Group name (e.g., 'VLESS Premium', 'VMess Basic')", max_length=100, unique=True)),
-                ('description', models.TextField(blank=True, help_text='Description of this subscription group')),
-                ('is_active', models.BooleanField(default=True, help_text='Whether this group is active')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('inbounds', models.ManyToManyField(blank=True, help_text='Inbounds included in this group', to='vpn.inbound')),
-            ],
-            options={
-                'verbose_name': 'Subscription Group',
-                'verbose_name_plural': 'Subscription Groups',
-                'ordering': ['name'],
-            },
-        ),
-        migrations.CreateModel(
-            name='UserSubscription',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('active', models.BooleanField(default=True, help_text='Whether this subscription is active')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('subscription_group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vpn.subscriptiongroup')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='xray_subscriptions', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'User Subscription',
-                'verbose_name_plural': 'User Subscriptions',
-                'ordering': ['user__username', 'subscription_group__name'],
-                'unique_together': {('user', 'subscription_group')},
-            },
-        ),
-    ]
\ No newline at end of file
diff --git a/vpn/migrations/0017_xrayserverv2_alter_server_server_type_serverinbound.py b/vpn/migrations/0017_xrayserverv2_alter_server_server_type_serverinbound.py
deleted file mode 100644
index 904176a..0000000
--- a/vpn/migrations/0017_xrayserverv2_alter_server_server_type_serverinbound.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-07 13:56
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0016_add_new_xray_models'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='XrayServerV2',
-            fields=[
-                ('server_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='vpn.server')),
-                ('client_hostname', models.CharField(help_text='Client connection hostname (what users see in their configs)', max_length=255)),
-                ('api_address', models.CharField(default='127.0.0.1:10085', help_text='Xray gRPC API address for management', max_length=255)),
-                ('api_enabled', models.BooleanField(default=True, help_text='Enable gRPC API for user management')),
-                ('stats_enabled', models.BooleanField(default=True, help_text='Enable traffic statistics collection')),
-            ],
-            options={
-                'verbose_name': 'Xray Server v2',
-                'verbose_name_plural': 'Xray Servers v2',
-            },
-            bases=('vpn.server',),
-        ),
-        migrations.AlterField(
-            model_name='server',
-            name='server_type',
-            field=models.CharField(choices=[('Outline', 'Outline'), ('Wireguard', 'Wireguard'), ('xray_core', 'Xray Core'), ('xray_v2', 'Xray Server v2')], editable=False, max_length=50),
-        ),
-        migrations.CreateModel(
-            name='ServerInbound',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('active', models.BooleanField(default=True, help_text='Whether this inbound is active on the server')),
-                ('deployed_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('deployment_config', models.JSONField(blank=True, default=dict, help_text='Server-specific deployment configuration')),
-                ('inbound', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deployed_servers', to='vpn.inbound')),
-                ('server', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deployed_inbounds', to='vpn.server')),
-            ],
-            options={
-                'verbose_name': 'Server Inbound Deployment',
-                'verbose_name_plural': 'Server Inbound Deployments',
-                'ordering': ['server__name', 'inbound__name'],
-                'unique_together': {('server', 'inbound')},
-            },
-        ),
-    ]
diff --git a/vpn/migrations/0018_alter_certificate_certificate_pem_and_more.py b/vpn/migrations/0018_alter_certificate_certificate_pem_and_more.py
deleted file mode 100644
index 345185a..0000000
--- a/vpn/migrations/0018_alter_certificate_certificate_pem_and_more.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-07 14:07
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0017_xrayserverv2_alter_server_server_type_serverinbound'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='certificate',
-            name='certificate_pem',
-            field=models.TextField(blank=True, help_text="Certificate in PEM format (auto-generated for Let's Encrypt)"),
-        ),
-        migrations.AlterField(
-            model_name='certificate',
-            name='expires_at',
-            field=models.DateTimeField(blank=True, help_text='Certificate expiration date (auto-filled after generation)', null=True),
-        ),
-        migrations.AlterField(
-            model_name='certificate',
-            name='private_key_pem',
-            field=models.TextField(blank=True, help_text="Private key in PEM format (auto-generated for Let's Encrypt)"),
-        ),
-    ]
diff --git a/vpn/migrations/0019_certificate_acme_email.py b/vpn/migrations/0019_certificate_acme_email.py
deleted file mode 100644
index 349f720..0000000
--- a/vpn/migrations/0019_certificate_acme_email.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-07 14:49
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0018_alter_certificate_certificate_pem_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='certificate',
-            name='acme_email',
-            field=models.EmailField(blank=True, help_text="Email address for ACME account registration (required for Let's Encrypt)", max_length=254),
-        ),
-    ]
diff --git a/vpn/migrations/0020_alter_inbound_full_config.py b/vpn/migrations/0020_alter_inbound_full_config.py
deleted file mode 100644
index 66248b8..0000000
--- a/vpn/migrations/0020_alter_inbound_full_config.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-07 15:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0019_certificate_acme_email'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='inbound',
-            name='full_config',
-            field=models.JSONField(blank=True, default=dict, help_text='Complete configuration for creating inbound on server (auto-generated if empty)'),
-        ),
-    ]
diff --git a/vpn/migrations/0021_remove_xray_configuration.py b/vpn/migrations/0021_remove_xray_configuration.py
deleted file mode 100644
index 5d3d225..0000000
--- a/vpn/migrations/0021_remove_xray_configuration.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-08 03:33
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0020_alter_inbound_full_config'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='XrayConfiguration',
-        ),
-    ]
diff --git a/vpn/migrations/0022_remove_inbound_domain_field.py b/vpn/migrations/0022_remove_inbound_domain_field.py
deleted file mode 100644
index 0d6f95f..0000000
--- a/vpn/migrations/0022_remove_inbound_domain_field.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-08 04:14
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0021_remove_xray_configuration'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='inbound',
-            options={'ordering': ['protocol', 'port'], 'verbose_name': 'Inbound Template', 'verbose_name_plural': 'Inbound Templates'},
-        ),
-        migrations.RemoveField(
-            model_name='inbound',
-            name='domain',
-        ),
-    ]
diff --git a/vpn/migrations/0023_alter_subscriptiongroup_options.py b/vpn/migrations/0023_alter_subscriptiongroup_options.py
deleted file mode 100644
index aec3148..0000000
--- a/vpn/migrations/0023_alter_subscriptiongroup_options.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-08 04:32
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0022_remove_inbound_domain_field'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='subscriptiongroup',
-            options={'ordering': ['name'], 'verbose_name': 'Subscriptions', 'verbose_name_plural': 'Subscriptions'},
-        ),
-    ]
diff --git a/vpn/migrations/0024_add_certificate_to_serverinbound.py b/vpn/migrations/0024_add_certificate_to_serverinbound.py
deleted file mode 100644
index 9711da7..0000000
--- a/vpn/migrations/0024_add_certificate_to_serverinbound.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-08 05:14
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0023_alter_subscriptiongroup_options'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='inbound',
-            name='certificate',
-        ),
-        migrations.AddField(
-            model_name='serverinbound',
-            name='certificate',
-            field=models.ForeignKey(blank=True, help_text='Certificate for TLS on this specific server (overrides automatic selection)', null=True, on_delete=django.db.models.deletion.SET_NULL, to='vpn.certificate'),
-        ),
-    ]
diff --git a/vpn/migrations/0025_user_telegram_first_name_user_telegram_last_name_and_more.py b/vpn/migrations/0025_user_telegram_first_name_user_telegram_last_name_and_more.py
deleted file mode 100644
index da5ea1c..0000000
--- a/vpn/migrations/0025_user_telegram_first_name_user_telegram_last_name_and_more.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-14 12:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0024_add_certificate_to_serverinbound'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='telegram_first_name',
-            field=models.CharField(blank=True, help_text='First name from Telegram', max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='telegram_last_name',
-            field=models.CharField(blank=True, help_text='Last name from Telegram', max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='telegram_phone',
-            field=models.CharField(blank=True, help_text='Phone number from Telegram (optional)', max_length=20, null=True),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='telegram_user_id',
-            field=models.BigIntegerField(blank=True, help_text='Telegram user ID', null=True, unique=True),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='telegram_username',
-            field=models.CharField(blank=True, help_text='Telegram username (without @)', max_length=255, null=True),
-        ),
-    ]
diff --git a/vpn/migrations/0026_alter_subscriptiongroup_options.py b/vpn/migrations/0026_alter_subscriptiongroup_options.py
deleted file mode 100644
index f120e19..0000000
--- a/vpn/migrations/0026_alter_subscriptiongroup_options.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 5.1.7 on 2025-08-15 00:23
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('vpn', '0025_user_telegram_first_name_user_telegram_last_name_and_more'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='subscriptiongroup',
-            options={'ordering': ['name'], 'verbose_name': 'XRay-core', 'verbose_name_plural': 'XRay-core'},
-        ),
-    ]
diff --git a/vpn/migrations/__init__.py b/vpn/migrations/__init__.py
deleted file mode 100644
index d170bcb..0000000
--- a/vpn/migrations/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# Migration package
\ No newline at end of file
diff --git a/vpn/models.py b/vpn/models.py
deleted file mode 100644
index db1a2ef..0000000
--- a/vpn/models.py
+++ /dev/null
@@ -1,208 +0,0 @@
-import uuid
-import logging
-from django.db import models
-from vpn.tasks import sync_user
-from django.db.models.signals import post_save, pre_delete
-from django.dispatch import receiver
-from .server_plugins import Server
-import shortuuid
-
-from django.contrib.auth.models import AbstractUser
-
-logger = logging.getLogger(__name__)
-
-class UserStatistics(models.Model):
-    user = models.ForeignKey('User', on_delete=models.CASCADE)
-    server_name = models.CharField(max_length=256)
-    acl_link_id = models.CharField(max_length=1024, null=True, blank=True, help_text="None for server-level stats")
-    
-    total_connections = models.IntegerField(default=0)
-    recent_connections = models.IntegerField(default=0)
-    daily_usage = models.JSONField(default=list, help_text="Daily connection counts for last 30 days")
-    max_daily = models.IntegerField(default=0)
-    
-    updated_at = models.DateTimeField(auto_now=True)
-    
-    class Meta:
-        unique_together = ['user', 'server_name', 'acl_link_id']
-        verbose_name = 'User Statistics'
-        verbose_name_plural = 'User Statistics'
-        indexes = [
-            models.Index(fields=['user', 'server_name']),
-            models.Index(fields=['updated_at']),
-        ]
-    
-    def __str__(self):
-        link_part = f" (link: {self.acl_link_id})" if self.acl_link_id else " (server total)"
-        return f"{self.user.username} - {self.server_name}{link_part}"
-
-class TaskExecutionLog(models.Model):
-    task_id = models.CharField(max_length=255, help_text="Celery task ID")
-    task_name = models.CharField(max_length=100, help_text="Task name")
-    server = models.ForeignKey('Server', on_delete=models.SET_NULL, null=True, blank=True)
-    user = models.ForeignKey('User', on_delete=models.SET_NULL, null=True, blank=True)
-    action = models.CharField(max_length=100, help_text="Action performed")
-    status = models.CharField(max_length=20, choices=[
-        ('STARTED', 'Started'),
-        ('SUCCESS', 'Success'),
-        ('FAILURE', 'Failure'),
-        ('RETRY', 'Retry'),
-    ], default='STARTED')
-    message = models.TextField(help_text="Detailed execution message")
-    execution_time = models.FloatField(null=True, blank=True, help_text="Execution time in seconds")
-    created_at = models.DateTimeField(auto_now_add=True)
-    
-    class Meta:
-        ordering = ['-created_at']
-        verbose_name = 'Task Execution Log'
-        verbose_name_plural = 'Task Execution Logs'
-        indexes = [
-            models.Index(fields=['task_id']),
-            models.Index(fields=['created_at']),
-            models.Index(fields=['status']),
-        ]
-    
-    def __str__(self):
-        return f"{self.task_name} - {self.action} ({self.status})"
-
-
-class AccessLog(models.Model):
-    user = models.CharField(max_length=256, blank=True, null=True, editable=False)
-    server = models.CharField(max_length=256, blank=True, null=True, editable=False)
-    acl_link_id = models.CharField(max_length=1024, blank=True, null=True, editable=False, help_text="ID of the ACL link used")
-    action = models.CharField(max_length=100, editable=False)
-    data = models.TextField(default="", blank=True, editable=False)
-    timestamp = models.DateTimeField(auto_now_add=True)
-
-    class Meta:
-        indexes = [
-            models.Index(fields=['user']),
-            models.Index(fields=['server']),
-            models.Index(fields=['acl_link_id']),
-            models.Index(fields=['timestamp']),
-            models.Index(fields=['action', 'timestamp']),
-        ]
-
-    def __str__(self):
-        link_part = f" (link: {self.acl_link_id})" if self.acl_link_id else ""
-        return f"{self.action} {self.user} request for {self.server}{link_part} at {self.timestamp}"
-
-class User(AbstractUser):
-    #is_active = False
-    comment = models.TextField(default="", blank=True, help_text="Free form user comment")
-    registration_date = models.DateTimeField(auto_now_add=True, verbose_name="Created")
-    servers = models.ManyToManyField('Server', through='ACL', blank=True, help_text="Servers user has access to")
-    last_access = models.DateTimeField(null=True, blank=True)
-    hash = models.CharField(max_length=64, unique=True, help_text="Random user hash. It's using for client config generation.")
-    
-    # Telegram fields
-    telegram_user_id = models.BigIntegerField(
-        null=True, 
-        blank=True, 
-        unique=True,
-        help_text="Telegram user ID"
-    )
-    telegram_username = models.CharField(
-        max_length=255, 
-        blank=True, 
-        null=True,
-        help_text="Telegram username (without @)"
-    )
-    telegram_first_name = models.CharField(
-        max_length=255, 
-        blank=True, 
-        null=True,
-        help_text="First name from Telegram"
-    )
-    telegram_last_name = models.CharField(
-        max_length=255, 
-        blank=True, 
-        null=True,
-        help_text="Last name from Telegram"
-    )
-    telegram_phone = models.CharField(
-        max_length=20, 
-        blank=True, 
-        null=True,
-        help_text="Phone number from Telegram (optional)"
-    )
-
-    def get_servers(self):
-        return Server.objects.filter(acl__user=self)
-
-    def save(self, *args, **kwargs):
-        if not self.hash:
-            self.hash = shortuuid.ShortUUID().random(length=16)
-        super().save(*args, **kwargs)
-
-    def __str__(self):
-        return self.username
-
-
-class ACL(models.Model):
-    user = models.ForeignKey('User', on_delete=models.CASCADE)
-    server = models.ForeignKey('Server', on_delete=models.CASCADE)
-    created_at = models.DateTimeField(auto_now_add=True, verbose_name="Created")
-
-    class Meta:
-        constraints = [
-            models.UniqueConstraint(fields=['user', 'server'], name='unique_user_server')
-        ]
-    
-    def __str__(self):
-        return f"{self.user.username} - {self.server.name}"
-    
-    def save(self, *args, **kwargs):
-        # Check if this is a new ACL and if auto_create_link should be enabled
-        is_new = self.pk is None
-        auto_create_link = kwargs.pop('auto_create_link', True)
-        
-        super().save(*args, **kwargs)
-        
-        # Only create default link for new ACLs when auto_create_link is True
-        # This happens when ACL is created through admin interface or initial user setup
-        if is_new and auto_create_link and not self.links.exists():
-            ACLLink.objects.create(acl=self, link=shortuuid.ShortUUID().random(length=16))
-
-@receiver(post_save, sender=ACL)
-def acl_created_or_updated(sender, instance, created, **kwargs):
-    try:
-        sync_user.delay_on_commit(instance.user.id, instance.server.id)
-        if created:
-            logger.info(f"Scheduled sync for new ACL: user {instance.user.username} on server {instance.server.name}")
-        else:
-            logger.info(f"Scheduled sync for updated ACL: user {instance.user.username} on server {instance.server.name}")
-    except Exception as e:
-        logger.error(f"Failed to schedule sync task for ACL {instance.id}: {e}")
-        # Don't raise exception to avoid blocking ACL creation/update
-
-@receiver(pre_delete, sender=ACL)
-def acl_deleted(sender, instance, **kwargs):
-    try:
-        sync_user.delay_on_commit(instance.user.id, instance.server.id)
-        logger.info(f"Scheduled sync for deleted ACL: user {instance.user.username} on server {instance.server.name}")
-    except Exception as e:
-        logger.error(f"Failed to schedule sync task for ACL deletion {instance.id}: {e}")
-        # Don't raise exception to avoid blocking ACL deletion
-
-
-class ACLLink(models.Model):
-    acl = models.ForeignKey(ACL, related_name='links', on_delete=models.CASCADE)
-    comment = models.TextField(default="", blank=True, help_text="ACL link comment, device name, etc...")
-    link = models.CharField(max_length=1024, default="", unique=True, blank=True, null=True, verbose_name="Access link", help_text="Access link to get dynamic configuration")
-    last_access_time = models.DateTimeField(null=True, blank=True, help_text="Last time this link was accessed")
-
-    def save(self, *args, **kwargs):
-        if self.link == "":
-            self.link = shortuuid.ShortUUID().random(length=16)
-        super().save(*args, **kwargs)
-
-    def __str__(self):
-        return self.link
-
-
-# Import new Xray models
-from .models_xray import (
-    Credentials, Certificate,
-    Inbound, SubscriptionGroup, UserSubscription
-)
diff --git a/vpn/models_xray.py b/vpn/models_xray.py
deleted file mode 100644
index 5a0d8ad..0000000
--- a/vpn/models_xray.py
+++ /dev/null
@@ -1,464 +0,0 @@
-"""
-New Xray models for flexible inbound and subscription management.
-"""
-
-import json
-import uuid
-from datetime import datetime, timedelta
-from django.db import models
-from django.core.exceptions import ValidationError
-from django.utils import timezone
-
-
-class Credentials(models.Model):
-    """Universal credentials storage for various services"""
-    CRED_TYPES = [
-        ('cloudflare', 'Cloudflare API'),
-        ('dns_provider', 'DNS Provider'),
-        ('email', 'Email SMTP'),
-        ('other', 'Other')
-    ]
-    
-    name = models.CharField(
-        max_length=100,
-        unique=True,
-        help_text="Descriptive name for these credentials"
-    )
-    cred_type = models.CharField(
-        max_length=20,
-        choices=CRED_TYPES,
-        help_text="Type of credentials"
-    )
-    credentials = models.JSONField(
-        help_text="Credentials data (e.g., {'api_token': '...', 'email': '...'})"
-    )
-    description = models.TextField(
-        blank=True,
-        help_text="Description of what these credentials are used for"
-    )
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-    
-    class Meta:
-        verbose_name = "Credentials"
-        verbose_name_plural = "Credentials"
-        ordering = ['cred_type', 'name']
-    
-    def __str__(self):
-        return f"{self.name} ({self.get_cred_type_display()})"
-    
-    def get_credential(self, key: str, default=None):
-        """Safely get credential value"""
-        return self.credentials.get(key, default)
-
-
-class Certificate(models.Model):
-    """SSL/TLS Certificate management"""
-    CERT_TYPES = [
-        ('self_signed', 'Self-Signed'),
-        ('letsencrypt', "Let's Encrypt"),
-        ('custom', 'Custom')
-    ]
-    
-    domain = models.CharField(
-        max_length=255,
-        unique=True,
-        help_text="Domain name for this certificate"
-    )
-    certificate_pem = models.TextField(
-        blank=True,
-        help_text="Certificate in PEM format (auto-generated for Let's Encrypt)"
-    )
-    private_key_pem = models.TextField(
-        blank=True,
-        help_text="Private key in PEM format (auto-generated for Let's Encrypt)"
-    )
-    cert_type = models.CharField(
-        max_length=20,
-        choices=CERT_TYPES,
-        help_text="Type of certificate"
-    )
-    expires_at = models.DateTimeField(
-        null=True,
-        blank=True,
-        help_text="Certificate expiration date (auto-filled after generation)"
-    )
-    credentials = models.ForeignKey(
-        Credentials,
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-        help_text="Credentials for Let's Encrypt (Cloudflare API)"
-    )
-    acme_email = models.EmailField(
-        blank=True,
-        help_text="Email address for ACME account registration (required for Let's Encrypt)"
-    )
-    auto_renew = models.BooleanField(
-        default=True,
-        help_text="Automatically renew certificate before expiration"
-    )
-    last_renewed = models.DateTimeField(
-        null=True,
-        blank=True,
-        help_text="Last renewal timestamp"
-    )
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-    
-    class Meta:
-        verbose_name = "Certificate"
-        verbose_name_plural = "Certificates"
-        ordering = ['domain']
-    
-    def __str__(self):
-        return f"{self.domain} ({self.get_cert_type_display()})"
-    
-    @property
-    def is_expired(self):
-        """Check if certificate is expired"""
-        if not self.expires_at:
-            return False
-        return timezone.now() > self.expires_at
-    
-    @property
-    def days_until_expiration(self):
-        """Days until certificate expires"""
-        if not self.expires_at:
-            return None
-        delta = self.expires_at - timezone.now()
-        return delta.days
-    
-    @property
-    def needs_renewal(self):
-        """Check if certificate needs renewal"""
-        if not self.auto_renew or not self.expires_at:
-            return False
-        
-        # Default renewal period
-        renewal_days = 60
-        
-        days_left = self.days_until_expiration
-        if days_left is None:
-            return False
-            
-        return days_left <= renewal_days
-
-
-class Inbound(models.Model):
-    """Independent inbound configuration"""
-    PROTOCOLS = [
-        ('vless', 'VLESS'),
-        ('vmess', 'VMess'),
-        ('trojan', 'Trojan'),
-        ('shadowsocks', 'Shadowsocks')
-    ]
-    
-    NETWORKS = [
-        ('tcp', 'TCP'),
-        ('ws', 'WebSocket'),
-        ('grpc', 'gRPC'),
-        ('http', 'HTTP/2'),
-        ('quic', 'QUIC')
-    ]
-    
-    SECURITIES = [
-        ('none', 'None'),
-        ('tls', 'TLS'),
-        ('reality', 'REALITY')
-    ]
-    
-    name = models.CharField(
-        max_length=100,
-        unique=True,
-        help_text="Unique identifier for this inbound"
-    )
-    protocol = models.CharField(
-        max_length=20,
-        choices=PROTOCOLS,
-        help_text="Protocol type"
-    )
-    port = models.IntegerField(
-        help_text="Port to listen on"
-    )
-    network = models.CharField(
-        max_length=20,
-        choices=NETWORKS,
-        default='tcp',
-        help_text="Transport protocol"
-    )
-    security = models.CharField(
-        max_length=20,
-        choices=SECURITIES,
-        default='none',
-        help_text="Security type"
-    )
-    
-    # Full configuration for Xray
-    full_config = models.JSONField(
-        default=dict,
-        blank=True,
-        help_text="Complete configuration for creating inbound on server (auto-generated if empty)"
-    )
-    
-    # Additional settings
-    listen_address = models.CharField(
-        max_length=45,
-        default="0.0.0.0",
-        help_text="IP address to listen on"
-    )
-    enable_sniffing = models.BooleanField(
-        default=True,
-        help_text="Enable protocol sniffing"
-    )
-    
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-    
-    class Meta:
-        verbose_name = "Inbound Template"
-        verbose_name_plural = "Inbound Templates"
-        ordering = ['protocol', 'port']
-        unique_together = [['port', 'listen_address']]
-    
-    def __str__(self):
-        return f"{self.name} ({self.protocol.upper()}:{self.port})"
-    
-    def generate_tag(self):
-        """Generate unique tag for inbound"""
-        return f"{self.protocol}-{self.port}-{uuid.uuid4().hex[:8]}"
-    
-    def build_config(self):
-        """Build full configuration for Xray"""
-        try:
-            # Build basic Xray inbound configuration
-            config = {
-                "tag": self.name,
-                "port": self.port,
-                "listen": self.listen_address,
-                "protocol": self.protocol,
-                "settings": self._build_protocol_settings(),
-                "streamSettings": self._build_stream_settings(),
-                "sniffing": {
-                    "enabled": self.enable_sniffing,
-                    "destOverride": ["http", "tls"]
-                } if self.enable_sniffing else {}
-            }
-            
-            # Store the built config
-            self.full_config = config
-            return self.full_config
-            
-        except Exception as e:
-            # Fallback to basic config if detailed build fails
-            import logging
-            logger = logging.getLogger(__name__)
-            logger.warning(f"Failed to build detailed config for {self.name}: {e}")
-            
-            self.full_config = {
-                "tag": self.name,
-                "port": self.port,
-                "listen": self.listen_address,
-                "protocol": self.protocol,
-                "settings": {},
-                "streamSettings": {}
-            }
-            return self.full_config
-    
-    def _build_protocol_settings(self):
-        """Build protocol-specific settings"""
-        settings = {}
-        
-        if self.protocol == 'vless':
-            settings = {
-                "clients": [],  # Will be populated when users are added
-                "decryption": "none"
-            }
-        elif self.protocol == 'vmess':
-            settings = {
-                "clients": []  # Will be populated when users are added
-            }
-        elif self.protocol == 'trojan':
-            settings = {
-                "clients": []  # Will be populated when users are added
-            }
-        elif self.protocol == 'shadowsocks':
-            settings = {
-                "method": "aes-128-gcm",  # Default method
-                "password": "",  # Will be set when configured
-                "network": "tcp,udp"
-            }
-        
-        return settings
-    
-    def _build_stream_settings(self):
-        """Build stream transport settings"""
-        stream_settings = {
-            "network": self.network
-        }
-        
-        # Add network-specific settings
-        if self.network == "ws":
-            stream_settings["wsSettings"] = {
-                "path": f"/{self.name}",
-                "headers": {}
-            }
-        elif self.network == "grpc":
-            stream_settings["grpcSettings"] = {
-                "serviceName": self.name
-            }
-        elif self.network == "http":
-            stream_settings["httpSettings"] = {
-                "path": f"/{self.name}",
-                "host": []  # Will be filled when deployed to server
-            }
-        
-        # Add security settings
-        if self.security == "tls":
-            stream_settings["security"] = "tls"
-            tls_settings = {
-                "serverName": "localhost",  # Will be replaced with server hostname when deployed
-                "alpn": ["h2", "http/1.1"]
-            }
-            
-            # Certificate will be set during deployment based on ServerInbound configuration
-            
-            stream_settings["tlsSettings"] = tls_settings
-        
-        elif self.security == "reality":
-            stream_settings["security"] = "reality"
-            # Reality settings would be configured here
-            stream_settings["realitySettings"] = {
-                "dest": "example.com:443",  # Will be replaced with server hostname when deployed
-                "serverNames": ["example.com"],  # Will be replaced with server hostname when deployed
-                "privateKey": "",  # Would be generated
-                "shortIds": [""]   # Would be generated
-            }
-        
-        return stream_settings
-
-
-class SubscriptionGroup(models.Model):
-    """Groups of inbounds for subscription management"""
-    name = models.CharField(
-        max_length=100,
-        unique=True,
-        help_text="Group name (e.g., 'VLESS Premium', 'VMess Basic')"
-    )
-    description = models.TextField(
-        blank=True,
-        help_text="Description of this subscription group"
-    )
-    inbounds = models.ManyToManyField(
-        Inbound,
-        blank=True,
-        help_text="Inbounds included in this group"
-    )
-    is_active = models.BooleanField(
-        default=True,
-        help_text="Whether this group is active"
-    )
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-    
-    class Meta:
-        verbose_name = "XRay-core"
-        verbose_name_plural = "XRay-core"
-        ordering = ['name']
-    
-    def __str__(self):
-        return self.name
-    
-    @property
-    def inbound_count(self):
-        """Number of inbounds in this group"""
-        return self.inbounds.count()
-    
-    @property
-    def user_count(self):
-        """Number of users subscribed to this group"""
-        return self.usersubscription_set.filter(active=True).count()
-
-
-class UserSubscription(models.Model):
-    """User subscriptions to groups"""
-    user = models.ForeignKey(
-        'User',
-        on_delete=models.CASCADE,
-        related_name='xray_subscriptions'
-    )
-    subscription_group = models.ForeignKey(
-        SubscriptionGroup,
-        on_delete=models.CASCADE
-    )
-    active = models.BooleanField(
-        default=True,
-        help_text="Whether this subscription is active"
-    )
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-    
-    class Meta:
-        verbose_name = "User Subscription"
-        verbose_name_plural = "User Subscriptions"
-        unique_together = ['user', 'subscription_group']
-        ordering = ['user__username', 'subscription_group__name']
-    
-    def __str__(self):
-        return f"{self.user.username} - {self.subscription_group.name}"
-
-
-class ServerInbound(models.Model):
-    """Many-to-many relationship between servers and inbounds to track deployment"""
-    server = models.ForeignKey('Server', on_delete=models.CASCADE, related_name='deployed_inbounds')
-    inbound = models.ForeignKey(Inbound, on_delete=models.CASCADE, related_name='deployed_servers')
-    active = models.BooleanField(default=True, help_text="Whether this inbound is active on the server")
-    
-    deployed_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-    
-    # Certificate for TLS on this specific server deployment
-    certificate = models.ForeignKey(
-        Certificate,
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-        help_text="Certificate for TLS on this specific server (overrides automatic selection)"
-    )
-    
-    # Store deployment-specific configuration if needed
-    deployment_config = models.JSONField(default=dict, blank=True, help_text="Server-specific deployment configuration")
-    
-    class Meta:
-        verbose_name = "Server Inbound Deployment"
-        verbose_name_plural = "Server Inbound Deployments"
-        ordering = ['server__name', 'inbound__name']
-        unique_together = [('server', 'inbound')]
-    
-    def __str__(self):
-        status = "Active" if self.active else "Inactive"
-        return f"{self.server.name} -> {self.inbound.name} ({status})"
-    
-    def get_certificate(self):
-        """Get certificate for this deployment with fallback logic"""
-        # 1. Use explicitly set certificate
-        if self.certificate:
-            return self.certificate
-            
-        # 2. Try to find certificate by server's client_hostname
-        if hasattr(self.server.get_real_instance(), 'client_hostname'):
-            server_hostname = self.server.get_real_instance().client_hostname
-            try:
-                return Certificate.objects.get(domain=server_hostname, cert_type='letsencrypt')
-            except Certificate.DoesNotExist:
-                try:
-                    return Certificate.objects.get(domain=server_hostname)
-                except Certificate.DoesNotExist:
-                    pass
-        
-        # 3. No certificate found
-        return None
-    
-    def requires_certificate(self):
-        """Check if this inbound requires a certificate"""
-        return self.inbound.security in ['tls'] or self.inbound.protocol == 'trojan'
\ No newline at end of file
diff --git a/vpn/server_plugins/__init__.py b/vpn/server_plugins/__init__.py
deleted file mode 100644
index b6fc15b..0000000
--- a/vpn/server_plugins/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from .generic import Server
-from .outline import OutlineServer, OutlineServerAdmin
-from .wireguard import WireguardServer, WireguardServerAdmin
-from .xray_v2 import XrayServerV2, XrayServerV2Admin
-from .urls import urlpatterns
\ No newline at end of file
diff --git a/vpn/server_plugins/generic.py b/vpn/server_plugins/generic.py
deleted file mode 100644
index a7ccf57..0000000
--- a/vpn/server_plugins/generic.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from polymorphic.models import PolymorphicModel
-from django.db import models
-
-
-class Server(PolymorphicModel):
-    SERVER_TYPE_CHOICES = (
-        ('Outline', 'Outline'),
-        ('Wireguard', 'Wireguard'),
-        ('xray_core', 'Xray Core'),
-        ('xray_v2', 'Xray Server v2'),
-    )
-
-    name = models.CharField(max_length=100, help_text="Server name")
-    comment = models.TextField(default="", blank=True)
-    registration_date = models.DateTimeField(auto_now_add=True, verbose_name="Created")
-    server_type = models.CharField(max_length=50, choices=SERVER_TYPE_CHOICES, editable=False)
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def save(self, *args, **kwargs):
-        # Only sync if the server actually exists and is valid
-        is_new = self.pk is None
-        super().save(*args, **kwargs)
-        
-        # Schedule sync task for existing servers only
-        if not is_new:
-            try:
-                from vpn.tasks import sync_server
-                sync_server.delay(self.id)
-            except Exception as e:
-                import logging
-                logger = logging.getLogger(__name__)
-                logger.error(f"Failed to schedule sync for server {self.name}: {e}")
-
-    def get_server_status(self, *args, **kwargs):
-        return {"name": self.name}
-
-    def sync(self, *args, **kwargs):
-        pass
-
-    def sync_users(self, *args, **kwargs):
-        pass
-
-    def add_user(self, *args, **kwargs):
-        pass
-
-    def get_user(self, *args, **kwargs):
-        pass
-
-    def delete_user(self, *args, **kwargs):
-        pass
-
-    class Meta:
-        verbose_name = "Server"
-        verbose_name_plural = "Servers"
-        permissions = [
-            ("access_server", "Can view public status"),
-        ]
-
-    def __str__(self):
-        return self.name
diff --git a/vpn/server_plugins/outline.py b/vpn/server_plugins/outline.py
deleted file mode 100644
index e2c8ca5..0000000
--- a/vpn/server_plugins/outline.py
+++ /dev/null
@@ -1,823 +0,0 @@
-import logging
-import json
-import requests
-from django.db import models
-from django.shortcuts import render, redirect
-from django.conf import settings
-from .generic import Server
-from urllib3 import PoolManager
-from outline_vpn.outline_vpn import OutlineVPN, OutlineServerErrorException
-from polymorphic.admin import PolymorphicChildModelAdmin
-from django.contrib import admin
-from django.utils.safestring import mark_safe
-from django.db.models import Count
-
-
-class OutlineConnectionError(Exception):
-    def __init__(self, message, original_exception=None):
-        super().__init__(message)
-        self.original_exception = original_exception
-
-class _FingerprintAdapter(requests.adapters.HTTPAdapter):
-	"""
-	This adapter injected into the requests session will check that the
-	fingerprint for the certificate matches for every request
-	"""
-
-	def __init__(self, fingerprint=None, **kwargs):
-		self.fingerprint = str(fingerprint)
-		super(_FingerprintAdapter, self).__init__(**kwargs)
-
-	def init_poolmanager(self, connections, maxsize, block=False):
-		self.poolmanager = PoolManager(
-			num_pools=connections,
-			maxsize=maxsize,
-			block=block,
-			assert_fingerprint=self.fingerprint,
-		)
-
-
-class OutlineServer(Server):
-    admin_url = models.URLField(help_text="Management URL")
-    admin_access_cert = models.CharField(max_length=255, help_text="Fingerprint")
-    client_hostname = models.CharField(max_length=255, help_text="Server address for clients")
-    client_port = models.CharField(max_length=5, help_text="Server port for clients")
-    
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.logger = logging.getLogger(__name__)
-    
-    class Meta:
-        verbose_name = 'Outline'
-        verbose_name_plural = 'Outline'
-
-    def save(self, *args, **kwargs):
-        self.server_type = 'Outline'
-        super().save(*args, **kwargs)
-
-    @property
-    def status(self):
-        return self.get_server_status(raw=True)
-    
-    @property
-    def client(self):
-        return OutlineVPN(api_url=self.admin_url, cert_sha256=self.admin_access_cert)
-
-
-    def __str__(self):
-        return f"{self.name} ({self.client_hostname}:{self.client_port})"
-    
-    def get_server_status(self, raw=False):
-        status = {}
-
-        try:
-            info = self.client.get_server_information()
-            if raw:
-                status = info
-            else:
-                keys = self.client.get_keys()
-                status.update(info)
-                status.update({"keys": len(keys)})
-                status["all_keys"] = []
-                for key in keys:
-                    status["all_keys"].append(key.key_id)
-        except Exception as e:
-            status.update({f"error": e})
-        return status
-    
-    def sync_users(self):
-        from vpn.models import User, ACL
-        logger = logging.getLogger(__name__)
-        logger.debug(f"[{self.name}] Sync all users")
-        
-        try:
-            keys = self.client.get_keys()
-        except Exception as e:
-            logger.error(f"[{self.name}] Failed to get keys from server: {e}")
-            return False
-            
-        acls = ACL.objects.filter(server=self)
-        acl_users = set(acl.user for acl in acls)
-
-        # Log user synchronization details
-        user_list = ", ".join([user.username for user in acl_users])
-        logger.info(f"[{self.name}] Syncing {len(acl_users)} users: {user_list[:200]}{'...' if len(user_list) > 200 else ''}")
-
-        for user in User.objects.all():
-            if user in acl_users:
-                try:
-                    result = self.add_user(user=user)
-                    logger.debug(f"[{self.name}] Added user {user.username}: {result}")
-                except Exception as e:
-                    logger.error(f"[{self.name}] Failed to add user {user.username}: {e}")
-            else:
-                try:
-                    result = self.delete_user(user=user)
-                    if result and 'status' in result and 'deleted' in result['status']:
-                        logger.debug(f"[{self.name}] Removed user {user.username}")
-                except Exception as e:
-                    logger.error(f"[{self.name}] Failed to remove user {user.username}: {e}")
-
-        return True
-
-    
-    def sync(self):
-        status = {}
-        try:
-            state = self.client.get_server_information()
-            if state["name"] != self.name:
-                self.client.set_server_name(self.name)
-                status["name"] = f"{state['name']} -> {self.name}"
-            elif state["hostnameForAccessKeys"] != self.client_hostname:
-                self.client.set_hostname(self.client_hostname)
-                status["hostnameForAccessKeys"] = f"{state['hostnameForAccessKeys']} -> {self.client_hostname}"
-            elif int(state["portForNewAccessKeys"]) != int(self.client_port):
-                self.client.set_port_new_for_access_keys(int(self.client_port))
-                status["portForNewAccessKeys"] = f"{state['portForNewAccessKeys']} -> {self.client_port}"
-            if len(status) == 0:
-                status = {"status": "Nothing to do"}
-            return status
-        except AttributeError as e:
-            raise OutlineConnectionError("Client error. Can't connect.", original_exception=e)
-
-    def _get_key(self, user):
-        logger = logging.getLogger(__name__)
-        logger.debug(f"[{self.name}] Looking for key for user {user.username}")
-        try:
-            # Try to get key by username first
-            result = self.client.get_key(str(user.username))
-            logger.debug(f"[{self.name}] Found key for user {user.username} by username")
-            return result
-        except OutlineServerErrorException:
-            # If not found by username, search by password (hash)
-            logger.debug(f"[{self.name}] Key not found by username, searching by password")
-            try:
-                keys = self.client.get_keys()
-                for key in keys:
-                    if key.password == user.hash:
-                        logger.debug(f"[{self.name}] Found key for user {user.username} by password match")
-                        return key
-                # No key found
-                logger.debug(f"[{self.name}] No key found for user {user.username}")
-                raise OutlineServerErrorException(f"Key not found for user {user.username}")
-            except Exception as e:
-                logger.error(f"[{self.name}] Error searching for key for user {user.username}: {e}")
-                raise OutlineServerErrorException(f"Error searching for key: {e}")
-
-    def get_user(self, user, raw=False):
-        try:
-            user_info = self._get_key(user)
-            if raw:
-                return user_info
-            else:
-                outline_key_dict = user_info.__dict__
-
-                outline_key_dict = {
-                    key: value 
-                    for key, value in user_info.__dict__.items() 
-                    if not key.startswith('_') and key not in [] # fields to mask
-                }
-                return outline_key_dict
-        except OutlineServerErrorException as e:
-            # If user key not found, try to create it automatically
-            if "Key not found" in str(e):
-                self.logger.warning(f"[{self.name}] Key not found for user {user.username}, attempting to create")
-                try:
-                    self.add_user(user)
-                    # Try to get the key again after creation
-                    user_info = self._get_key(user)
-                    if raw:
-                        return user_info
-                    else:
-                        outline_key_dict = {
-                            key: value 
-                            for key, value in user_info.__dict__.items() 
-                            if not key.startswith('_') and key not in []
-                        }
-                        return outline_key_dict
-                except Exception as create_error:
-                    self.logger.error(f"[{self.name}] Failed to create missing key for user {user.username}: {create_error}")
-                    raise OutlineServerErrorException(f"Failed to get credentials: {e}")
-            else:
-                raise
-        
-
-    def add_user(self, user):
-        logger = logging.getLogger(__name__)
-        try:
-            server_user = self._get_key(user)
-        except OutlineServerErrorException as e:
-            server_user = None
-        
-        logger.debug(f"[{self.name}] User {str(server_user)}")
-
-        result = {}
-        key = None
-
-        if server_user:
-            # Check if user needs update - but don't delete immediately
-            needs_update = (
-                server_user.method != "chacha20-ietf-poly1305" or 
-                server_user.name != user.username or 
-                server_user.password != user.hash
-                # Don't check port as Outline can assign different ports automatically
-            )
-            
-            if needs_update:
-                # Delete old key before creating new one
-                try:
-                    self.client.delete_key(server_user.key_id)
-                    logger.debug(f"[{self.name}] Deleted outdated key for user {user.username}")
-                except Exception as e:
-                    logger.warning(f"[{self.name}] Failed to delete old key for user {user.username}: {e}")
-                
-                # Create new key with correct parameters
-                try:
-                    key = self.client.create_key(
-                        key_id=user.username,
-                        name=user.username,
-                        method="chacha20-ietf-poly1305",
-                        password=user.hash,
-                        data_limit=None
-                        # Don't specify port - let server assign automatically
-                    )
-                    logger.info(f"[{self.name}] User {user.username} updated")
-                except OutlineServerErrorException as e:
-                    raise OutlineConnectionError(f"Failed to create updated key for user {user.username}", original_exception=e)
-            else:
-                # User exists and is up to date
-                key = server_user
-                logger.debug(f"[{self.name}] User {user.username} already up to date")
-        else:
-            # User doesn't exist, create new key
-            try:
-                key = self.client.create_key(
-                    key_id=user.username,
-                    name=user.username,
-                    method="chacha20-ietf-poly1305",
-                    password=user.hash,
-                    data_limit=None
-                    # Don't specify port - let server assign automatically
-                )
-                logger.info(f"[{self.name}] User {user.username} created")
-            except OutlineServerErrorException as e:
-                error_message = str(e)
-                if "code\":\"Conflict" in error_message:
-                    logger.warning(f"[{self.name}] Conflict for User {user.username}, trying to resolve. {error_message}")
-                    # Find conflicting key by password and remove it
-                    try:
-                        for existing_key in self.client.get_keys():
-                            if existing_key.password == user.hash:
-                                logger.warning(f"[{self.name}] Found conflicting key {existing_key.key_id} with same password")
-                                self.client.delete_key(existing_key.key_id)
-                                break
-                        # Try to create again after cleanup
-                        return self.add_user(user)
-                    except Exception as cleanup_error:
-                        logger.error(f"[{self.name}] Failed to resolve conflict for user {user.username}: {cleanup_error}")
-                        raise OutlineConnectionError(f"Conflict resolution failed for user {user.username}", original_exception=e)
-                else:
-                    raise OutlineConnectionError("API Error", original_exception=e)
-        
-        # Build result from key object
-        try:
-            if key:
-                result = {
-                    'key_id': key.key_id,
-                    'name': key.name,
-                    'method': key.method,
-                    'password': key.password,
-                    'data_limit': key.data_limit,
-                    'port': key.port
-                }
-            else:
-                result = {"error": "No key object returned"}
-        except Exception as e:
-            logger.error(f"[{self.name}] Error building result for user {user.username}: {e}")
-            result = {"error": str(e)}
-        
-        return result
-
-    def delete_user(self, user):
-        result = None
-        try:
-            server_user = self._get_key(user)
-        except OutlineServerErrorException as e:
-            return {"status": "User not found on server. Nothing to do."}
-
-        if server_user:
-            self.logger.info(f"Deleting key with key_id: {server_user.key_id}")
-            self.client.delete_key(server_user.key_id)
-            result = {"status": "User was deleted"}
-            self.logger.info(f"[{self.name}] User deleted: {user.username} on server {self.name}")
-
-        return result
-
-
-
-class OutlineServerAdmin(PolymorphicChildModelAdmin):
-    base_model = OutlineServer
-    show_in_index = False
-    list_display = (
-        'name',
-        'admin_url',
-        'admin_access_cert',
-        'client_hostname',
-        'client_port',
-        'user_count',
-        'server_status_inline',
-    )
-    readonly_fields = ('server_status_full', 'registration_date', 'export_configuration_display', 'server_statistics_display', 'recent_activity_display', 'json_import_field')
-    list_editable = ('admin_url', 'admin_access_cert', 'client_hostname', 'client_port',)
-    exclude = ('server_type',)
-    
-    def get_fieldsets(self, request, obj=None):
-        """Customize fieldsets based on whether object exists"""
-        if obj is None:  # Adding new server
-            return (
-                ('JSON Import', {
-                    'fields': ('json_import_field',),
-                    'description': 'Quick import from Outline server JSON configuration'
-                }),
-                ('Server Configuration', {
-                    'fields': ('name', 'comment', 'admin_url', 'admin_access_cert', 'client_hostname', 'client_port')
-                }),
-            )
-        else:  # Editing existing server
-            return (
-                ('Server Configuration', {
-                    'fields': ('name', 'comment', 'admin_url', 'admin_access_cert', 'client_hostname', 'client_port', 'registration_date')
-                }),
-                ('Server Status', {
-                    'fields': ('server_status_full',)
-                }),
-                ('Export Configuration', {
-                    'fields': ('export_configuration_display',)
-                }),
-                ('Statistics & Users', {
-                    'fields': ('server_statistics_display',),
-                    'classes': ('collapse',)
-                }),
-                ('Recent Activity', {
-                    'fields': ('recent_activity_display',),
-                    'classes': ('collapse',)
-                }),
-            )
-    
-    def get_urls(self):
-        from django.urls import path
-        urls = super().get_urls()
-        custom_urls = [
-            path('<int:object_id>/sync/', self.admin_site.admin_view(self.sync_server_view), name='outlineserver_sync'),
-        ]
-        return custom_urls + urls
-
-    @admin.display(description='Clients', ordering='user_count')
-    def user_count(self, obj):
-        return obj.user_count
-
-    def get_queryset(self, request):
-        qs = super().get_queryset(request)
-        qs = qs.annotate(user_count=Count('acl__user'))
-        return qs
-
-    def server_status_inline(self, obj):
-        status = obj.get_server_status()
-        if 'error' in status:
-            return mark_safe(f"<span style='color: red;'>Error: {status['error']}</span>")
-        # Преобразуем JSON в красивый формат
-        import json
-        pretty_status = json.dumps(status, indent=4)
-        return mark_safe(f"<pre>{pretty_status}</pre>")
-    server_status_inline.short_description = "Status"
-
-    def server_status_full(self, obj):
-        if obj and obj.pk:
-            status = obj.get_server_status()
-            if 'error' in status:
-                return mark_safe(f"<span style='color: red;'>Error: {status['error']}</span>")
-            import json
-            pretty_status = json.dumps(status, indent=4)
-            return mark_safe(f"<pre>{pretty_status}</pre>")
-        return "N/A"
-
-    server_status_full.short_description = "Server Status"
-
-    def sync_server_view(self, request, object_id):
-        """AJAX view to sync server settings"""
-        from django.http import JsonResponse
-        
-        if request.method == 'POST':
-            try:
-                server = OutlineServer.objects.get(pk=object_id)
-                result = server.sync()
-                
-                return JsonResponse({
-                    'success': True,
-                    'message': f'Server "{server.name}" synchronized successfully',
-                    'details': result
-                })
-                
-            except Exception as e:
-                return JsonResponse({
-                    'success': False,
-                    'error': str(e)
-                }, status=500)
-        
-        return JsonResponse({'error': 'Invalid request method'}, status=405)
-    
-    def add_view(self, request, form_url='', extra_context=None):
-        """Use the default Django admin add view"""
-        return super().add_view(request, form_url, extra_context)
-    
-    @admin.display(description='Import JSON Configuration')
-    def json_import_field(self, obj):
-        """Display JSON import field for new servers only"""
-        if obj and obj.pk:
-            # Hide for existing servers
-            return ''
-            
-        html = '''
-        <div style="width: 100%;">
-            <textarea id="import-json-config" class="vLargeTextField" rows="8" 
-                      placeholder='{
-  "apiUrl": "https://your-server:port/path",
-  "certSha256": "your-certificate-hash",
-  "serverName": "My Outline Server",
-  "clientHostname": "your-server.com",
-  "clientPort": 1257,
-  "comment": "Server description"
-}' style="font-family: 'Courier New', monospace; font-size: 0.875rem; width: 100%;"></textarea>
-            <div class="help" style="margin-top: 0.5rem;">
-                Paste JSON configuration from your Outline server setup to automatically fill the fields below.
-            </div>
-            <div style="margin-top: 1rem;">
-                <button type="button" id="import-json-btn" class="btn btn-primary" onclick="importJsonConfig()">Import Configuration</button>
-            </div>
-            <script>
-            function importJsonConfig() {
-                const textarea = document.getElementById('import-json-config');
-                try {
-                    const jsonText = textarea.value.trim();
-                    if (!jsonText) {
-                        alert('Please enter JSON configuration');
-                        return;
-                    }
-                    
-                    const config = JSON.parse(jsonText);
-                    
-                    // Validate required fields
-                    if (!config.apiUrl || !config.certSha256) {
-                        alert('Invalid JSON format. Required fields: apiUrl, certSha256');
-                        return;
-                    }
-                    
-                    // Parse apiUrl to extract components
-                    const url = new URL(config.apiUrl);
-                    
-                    // Fill form fields
-                    const adminUrlField = document.getElementById('id_admin_url');
-                    const adminCertField = document.getElementById('id_admin_access_cert');
-                    const clientHostnameField = document.getElementById('id_client_hostname');
-                    const clientPortField = document.getElementById('id_client_port');
-                    const nameField = document.getElementById('id_name');
-                    const commentField = document.getElementById('id_comment');
-                    
-                    if (adminUrlField) adminUrlField.value = config.apiUrl;
-                    if (adminCertField) adminCertField.value = config.certSha256;
-                    
-                    // Use provided hostname or extract from URL
-                    const hostname = config.clientHostname || config.hostnameForAccessKeys || url.hostname;
-                    if (clientHostnameField) clientHostnameField.value = hostname;
-                    
-                    // Use provided port or extract from various sources
-                    const clientPort = config.clientPort || config.portForNewAccessKeys || url.port || '1257';
-                    if (clientPortField) clientPortField.value = clientPort;
-                    
-                    // Generate server name if not provided and field is empty
-                    if (nameField && !nameField.value) {
-                        const serverName = config.serverName || config.name || 'Outline-' + hostname;
-                        nameField.value = serverName;
-                    }
-                    
-                    // Fill comment if provided and field exists
-                    if (commentField && config.comment) {
-                        commentField.value = config.comment;
-                    }
-                    
-                    // Clear the JSON input
-                    textarea.value = '';
-                    
-                    alert('Configuration imported successfully! Review the fields below and save.');
-                    
-                    // Click on Server Configuration tab if using Jazzmin
-                    const serverTab = document.querySelector('a[href="#server-configuration-tab"]');
-                    if (serverTab) {
-                        serverTab.click();
-                    }
-                    
-                } catch (error) {
-                    alert('Invalid JSON format: ' + error.message);
-                }
-            }
-            
-            // Add paste event listener
-            document.addEventListener('DOMContentLoaded', function() {
-                const textarea = document.getElementById('import-json-config');
-                if (textarea) {
-                    textarea.addEventListener('paste', function(e) {
-                        setTimeout(importJsonConfig, 100);
-                    });
-                }
-            });
-            </script>
-        </div>
-        '''
-        
-        return mark_safe(html)
-    
-    @admin.display(description='Server Statistics & Users')
-    def server_statistics_display(self, obj):
-        """Display server statistics and user management"""
-        if not obj or not obj.pk:
-            return mark_safe('<div style="color: #6c757d; font-style: italic;">Statistics will be available after saving</div>')
-        
-        try:
-            from vpn.models import ACL, AccessLog, UserStatistics
-            from django.utils import timezone
-            from datetime import timedelta
-            
-            # Get user statistics
-            user_count = ACL.objects.filter(server=obj).count()
-            total_links = 0
-            server_keys_count = 0
-            
-            try:
-                from vpn.models import ACLLink
-                total_links = ACLLink.objects.filter(acl__server=obj).count()
-                
-                # Try to get actual keys count from server
-                server_status = obj.get_server_status()
-                if 'keys' in server_status:
-                    server_keys_count = server_status['keys']
-            except Exception:
-                pass
-            
-            # Get active users count (last 30 days)
-            thirty_days_ago = timezone.now() - timedelta(days=30)
-            active_users_count = UserStatistics.objects.filter(
-                server_name=obj.name,
-                recent_connections__gt=0
-            ).values('user').distinct().count()
-            
-            html = '<div style="background: #f8f9fa; border: 1px solid #dee2e6; border-radius: 0.375rem; padding: 1rem;">'
-            
-            # Overall Statistics
-            html += '<div style="background: #e7f3ff; border-left: 4px solid #007cba; padding: 12px; margin-bottom: 16px; border-radius: 4px;">'
-            html += '<div style="display: flex; gap: 20px; margin-bottom: 8px; flex-wrap: wrap;">'
-            html += f'<div><strong>Total Users:</strong> {user_count}</div>'
-            html += f'<div><strong>Active Users (30d):</strong> {active_users_count}</div>'
-            html += f'<div><strong>Total Links:</strong> {total_links}</div>'
-            html += f'<div><strong>Server Keys:</strong> {server_keys_count}</div>'
-            html += '</div>'
-            html += '<div style="margin-top: 8px; font-size: 11px; color: #6c757d;">'
-            html += '📊 User activity data is from cached statistics for fast loading. Status indicators show usage patterns.'
-            html += '</div>'
-            html += '</div>'
-            
-            # Get users data with ACL information
-            acls = ACL.objects.filter(server=obj).select_related('user').prefetch_related('links')
-            
-            if acls:
-                html += '<h5 style="color: #495057; margin: 16px 0 8px 0;">👥 Users with Access</h5>'
-                
-                for acl in acls:
-                    user = acl.user
-                    links = list(acl.links.all())
-                    
-                    # Get last access time from any link
-                    last_access = None
-                    for link in links:
-                        if link.last_access_time:
-                            if last_access is None or link.last_access_time > last_access:
-                                last_access = link.last_access_time
-                    
-                    # Use cached statistics instead of live server check for performance
-                    user_stats = UserStatistics.objects.filter(user=user, server_name=obj.name)
-                    server_key_status = "unknown"
-                    total_user_connections = 0
-                    recent_user_connections = 0
-                    
-                    if user_stats.exists():
-                        # User has cached data, likely has server access
-                        total_user_connections = sum(stat.total_connections for stat in user_stats)
-                        recent_user_connections = sum(stat.recent_connections for stat in user_stats)
-                        
-                        if total_user_connections > 0:
-                            server_key_status = "cached_active"
-                        else:
-                            server_key_status = "cached_inactive"
-                    else:
-                        # No cached data - either new user or no access
-                        server_key_status = "no_cache"
-                    
-                    html += '<div style="background: #ffffff; border: 1px solid #e9ecef; border-radius: 0.25rem; padding: 0.75rem; margin-bottom: 0.5rem; display: flex; justify-content: space-between; align-items: center;">'
-                    
-                    # User info section
-                    html += '<div style="flex: 1;">'
-                    html += f'<div style="font-weight: 500; font-size: 14px; color: #495057;">{user.username}'
-                    if user.comment:
-                        html += f' <span style="color: #6c757d; font-size: 12px; font-weight: normal;">- {user.comment}</span>'
-                    html += '</div>'
-                    html += f'<div style="font-size: 12px; color: #6c757d;">{len(links)} link(s)'
-                    if last_access:
-                        from django.utils.timezone import localtime
-                        local_time = localtime(last_access)
-                        html += f' | Last access: {local_time.strftime("%Y-%m-%d %H:%M")}'
-                    else:
-                        html += ' | Never accessed'
-                    
-                    # Add usage statistics inside the same div
-                    if total_user_connections > 0:
-                        html += f' | {total_user_connections} total uses'
-                        if recent_user_connections > 0:
-                            html += f' ({recent_user_connections} recent)'
-                    
-                    html += '</div>'  # End user info
-                    html += '</div>'  # End flex-1 div
-                    
-                    # Status and actions section
-                    html += '<div style="display: flex; gap: 8px; align-items: center;">'
-                    
-                    # Status indicator based on cached data
-                    if server_key_status == "cached_active":
-                        html += '<span style="background: #d4edda; color: #155724; padding: 2px 6px; border-radius: 3px; font-size: 10px;">📊 Active User</span>'
-                    elif server_key_status == "cached_inactive":
-                        html += '<span style="background: #fff3cd; color: #856404; padding: 2px 6px; border-radius: 3px; font-size: 10px;">📊 Inactive</span>'
-                    else:
-                        html += '<span style="background: #f8d7da; color: #721c24; padding: 2px 6px; border-radius: 3px; font-size: 10px;">❓ No Data</span>'
-                    
-                    html += f'<a href="/admin/vpn/user/{user.id}/change/" class="btn btn-sm btn-outline-primary" style="padding: 0.25rem 0.5rem; font-size: 0.75rem; border-radius: 0.2rem; margin: 0 0.1rem;">👤 Edit</a>'
-                    html += '</div>'  # End actions div
-                    html += '</div>'  # End main user div
-            else:
-                html += '<div style="color: #6c757d; font-style: italic; text-align: center; padding: 20px; background: #f9fafb; border-radius: 6px;">'
-                html += 'No users assigned to this server'
-                html += '</div>'
-            
-            html += '</div>'
-            return mark_safe(html)
-            
-        except Exception as e:
-            return mark_safe(f'<div style="color: #dc3545;">Error loading statistics: {e}</div>')
-    
-    @admin.display(description='Export Configuration')
-    def export_configuration_display(self, obj):
-        """Display JSON export configuration"""
-        if not obj or not obj.pk:
-            return mark_safe('<div style="color: #6c757d; font-style: italic;">Export will be available after saving</div>')
-        
-        try:
-            # Build export data
-            export_data = {
-                'apiUrl': obj.admin_url,
-                'certSha256': obj.admin_access_cert,
-                'serverName': obj.name,
-                'clientHostname': obj.client_hostname,
-                'clientPort': int(obj.client_port),
-                'comment': obj.comment,
-                'serverType': 'outline',
-                'dateCreated': obj.registration_date.isoformat() if obj.registration_date else None,
-                'id': obj.id
-            }
-            
-            # Try to get server status
-            try:
-                server_status = obj.get_server_status()
-                if 'error' not in server_status:
-                    export_data['serverInfo'] = server_status
-            except Exception:
-                pass
-            
-            json_str = json.dumps(export_data, indent=2)
-            # Escape the JSON for HTML
-            from django.utils.html import escape
-            escaped_json = escape(json_str)
-            
-            html = '''
-            <div>
-                <textarea id="export-json-config" class="vLargeTextField" rows="10" readonly 
-                          style="font-family: 'Courier New', monospace; font-size: 0.875rem; background-color: #f8f9fa; width: 100%;">''' + escaped_json + '''</textarea>
-                <div class="help" style="margin-top: 0.5rem;">
-                    <strong>Includes:</strong> Server settings, connection details, live server info (if accessible), creation date, and comment.
-                </div>
-                <div style="padding-top: 1rem;">
-                    <button type="button" id="copy-export-btn" class="btn btn-sm btn-secondary" 
-                            onclick="var btn=this; document.getElementById('export-json-config').select(); document.execCommand('copy'); btn.innerHTML='✅ Copied!'; setTimeout(function(){btn.innerHTML='📋 Copy JSON';}, 2000);" 
-                            style="margin-right: 10px;">📋 Copy JSON</button>
-                    <button type="button" id="sync-server-btn" data-server-id="''' + str(obj.id) + '''" class="btn btn-sm btn-primary">🔄 Sync Server Settings</button>
-                    <span style="margin-left: 0.5rem; font-size: 0.875rem; color: #6c757d;">
-                        Synchronize server name, hostname, and port settings
-                    </span>
-                </div>
-            </div>
-            '''
-            
-            return mark_safe(html)
-            
-        except Exception as e:
-            return mark_safe(f'<div style="color: #dc3545;">Error generating export: {e}</div>')
-    
-    @admin.display(description='Recent Activity')
-    def recent_activity_display(self, obj):
-        """Display recent activity in admin-friendly format"""
-        if not obj or not obj.pk:
-            return mark_safe('<div style="color: #6c757d; font-style: italic;">Activity will be available after saving</div>')
-        
-        try:
-            from vpn.models import AccessLog
-            from django.utils.timezone import localtime
-            from datetime import timedelta
-            from django.utils import timezone
-            
-            # Get recent access logs for this server (last 7 days)
-            seven_days_ago = timezone.now() - timedelta(days=7)
-            recent_logs = AccessLog.objects.filter(
-                server=obj.name,
-                timestamp__gte=seven_days_ago
-            ).order_by('-timestamp')[:20]
-            
-            if not recent_logs:
-                return mark_safe('<div style="color: #6c757d; font-style: italic; padding: 12px; background: #f8f9fa; border-radius: 4px;">No recent activity (last 7 days)</div>')
-            
-            html = '<div style="background: #f8f9fa; border: 1px solid #dee2e6; border-radius: 4px; padding: 0; max-height: 300px; overflow-y: auto;">'
-            
-            # Header
-            html += '<div style="background: #e9ecef; padding: 8px 12px; border-bottom: 1px solid #dee2e6; font-weight: 600; font-size: 12px; color: #495057;">'
-            html += f'📊 Access Log ({recent_logs.count()} entries, last 7 days)'
-            html += '</div>'
-            
-            # Activity entries
-            for i, log in enumerate(recent_logs):
-                bg_color = '#ffffff' if i % 2 == 0 else '#f8f9fa'
-                local_time = localtime(log.timestamp)
-                
-                # Status icon and color
-                if log.action == 'Success':
-                    icon = '✅'
-                    status_color = '#28a745'
-                elif log.action == 'Failed':
-                    icon = '❌'
-                    status_color = '#dc3545'
-                else:
-                    icon = 'ℹ️'
-                    status_color = '#6c757d'
-                
-                html += f'<div style="display: flex; justify-content: space-between; align-items: center; padding: 6px 12px; border-bottom: 1px solid #f1f3f4; background: {bg_color};">'
-                
-                # Left side - user and link info
-                html += '<div style="display: flex; gap: 8px; align-items: center; flex: 1; min-width: 0;">'
-                html += f'<span style="color: {status_color}; font-size: 14px;">{icon}</span>'
-                html += '<div style="overflow: hidden;">'
-                html += f'<div style="font-weight: 500; font-size: 12px; color: #495057; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{log.user}</div>'
-                
-                if log.acl_link_id:
-                    link_short = log.acl_link_id[:12] + '...' if len(log.acl_link_id) > 12 else log.acl_link_id
-                    html += f'<div style="font-family: monospace; font-size: 10px; color: #6c757d;">{link_short}</div>'
-                
-                html += '</div></div>'
-                
-                # Right side - timestamp and status
-                html += '<div style="text-align: right; flex-shrink: 0;">'
-                html += f'<div style="font-size: 10px; color: #6c757d;">{local_time.strftime("%m-%d %H:%M")}</div>'
-                html += f'<div style="font-size: 9px; color: {status_color}; font-weight: 500;">{log.action}</div>'
-                html += '</div>'
-                
-                html += '</div>'
-            
-            # Footer with summary if there are more entries
-            total_recent = AccessLog.objects.filter(
-                server=obj.name,
-                timestamp__gte=seven_days_ago
-            ).count()
-            
-            if total_recent > 20:
-                html += f'<div style="background: #e9ecef; padding: 6px 12px; font-size: 11px; color: #6c757d; text-align: center;">'
-                html += f'Showing 20 of {total_recent} entries from last 7 days'
-                html += '</div>'
-            
-            html += '</div>'
-            return mark_safe(html)
-            
-        except Exception as e:
-            return mark_safe(f'<div style="color: #dc3545; font-size: 12px;">Error loading activity: {e}</div>')
-    
-    def get_model_perms(self, request):
-        """It disables display for sub-model"""
-        return {}
-    
-    class Media:
-        js = ('admin/js/generate_link.js',)
-        css = {'all': ('admin/css/vpn_admin.css',)}
-    
-admin.site.register(OutlineServer, OutlineServerAdmin)
diff --git a/vpn/server_plugins/urls.py b/vpn/server_plugins/urls.py
deleted file mode 100644
index b355df3..0000000
--- a/vpn/server_plugins/urls.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.urls import path
-from vpn.views import shadowsocks, xray_subscription
-
-urlpatterns = [
-    path('ss/<str:hash_value>/', shadowsocks, name='shadowsocks'),
-    path('xray/<str:user_hash>/', xray_subscription, name='xray_subscription'),
-]
\ No newline at end of file
diff --git a/vpn/server_plugins/wireguard.py b/vpn/server_plugins/wireguard.py
deleted file mode 100644
index a9556e8..0000000
--- a/vpn/server_plugins/wireguard.py
+++ /dev/null
@@ -1,83 +0,0 @@
-from .generic import Server
-from django.db import models
-from polymorphic.admin import (
-    PolymorphicChildModelAdmin,
-)
-from django.contrib import admin
-from django.db.models import Count
-from django.utils.safestring import mark_safe
-
-class WireguardServer(Server):
-    address = models.CharField(max_length=100)
-    port = models.IntegerField()
-    client_private_key = models.CharField(max_length=255)
-    server_publick_key = models.CharField(max_length=255)
-
-    class Meta:
-        verbose_name = 'Wireguard'
-        verbose_name_plural = 'Wireguard'
-
-    def save(self, *args, **kwargs):
-        self.server_type = 'Wireguard'
-        super().save(*args, **kwargs)
-
-    def __str__(self):
-        return f"{self.name} ({self.address})"
-
-    def get_server_status(self):
-        status = super().get_server_status()
-        status.update({
-            "address": self.address,
-            "port": self.port,
-            "client_private_key": self.client_private_key,
-            "server_publick_key": self.server_publick_key,
-        })
-        return status
-    
-class WireguardServerAdmin(PolymorphicChildModelAdmin):
-    base_model = WireguardServer
-    show_in_index = False  # Не отображать в главном списке админки
-    list_display = (
-        'name',
-        'address',
-        'port',
-        'server_publick_key',
-        'client_private_key',
-        'server_status_inline',
-        'user_count',
-        'registration_date'
-    )
-    readonly_fields = ('server_status_full', )
-    exclude = ('server_type',)
-
-    @admin.display(description='Clients', ordering='user_count')
-    def user_count(self, obj):
-        return obj.user_count
-
-    def get_queryset(self, request):
-        qs = super().get_queryset(request)
-        qs = qs.annotate(user_count=Count('acl__user'))
-        return qs
-
-    def server_status_inline(self, obj):
-        status = obj.get_server_status()
-        if 'error' in status:
-            return mark_safe(f"<span style='color: red;'>Error: {status['error']}</span>")
-        return mark_safe(f"<pre>{status}</pre>")
-    server_status_inline.short_description = "Server Status"
-
-    def server_status_full(self, obj):
-        if obj and obj.pk:
-            status = obj.get_server_status()
-            if 'error' in status:
-                return mark_safe(f"<span style='color: red;'>Error: {status['error']}</span>")
-            return mark_safe(f"<pre>{status}</pre>")
-        return "N/A"
-
-    server_status_full.short_description = "Server Status"
-
-    def get_model_perms(self, request):
-        """It disables display for sub-model"""
-        return {}
-    
-admin.site.register(WireguardServer, WireguardServerAdmin)
\ No newline at end of file
diff --git a/vpn/server_plugins/xray_v2.py b/vpn/server_plugins/xray_v2.py
deleted file mode 100644
index 3d0be6c..0000000
--- a/vpn/server_plugins/xray_v2.py
+++ /dev/null
@@ -1,966 +0,0 @@
-import logging
-from django.db import models
-from django.contrib import admin
-from polymorphic.admin import PolymorphicChildModelAdmin
-from .generic import Server
-from vpn.models_xray import Inbound, UserSubscription
-
-logger = logging.getLogger(__name__)
-
-
-class XrayServerV2(Server):
-    """
-    New Xray server that works with subscription groups and inbounds.
-    This server can host multiple inbounds and users access them through subscription groups.
-    """
-    client_hostname = models.CharField(
-        max_length=255, 
-        help_text="Client connection hostname (what users see in their configs)"
-    )
-    api_address = models.CharField(
-        max_length=255, 
-        default="127.0.0.1:10085",
-        help_text="Xray gRPC API address for management"
-    )
-    api_enabled = models.BooleanField(
-        default=True,
-        help_text="Enable gRPC API for user management"
-    )
-    stats_enabled = models.BooleanField(
-        default=True,
-        help_text="Enable traffic statistics collection"
-    )
-    
-    class Meta:
-        verbose_name = "Xray Server v2"
-        verbose_name_plural = "Xray Servers v2"
-    
-    def save(self, *args, **kwargs):
-        if not self.server_type:
-            self.server_type = 'xray_v2'
-        super().save(*args, **kwargs)
-    
-    def get_server_status(self):
-        """Get server status including active inbounds"""
-        try:
-            # Get basic server information
-            active_inbounds = self.get_active_inbounds()
-            
-            # Try to connect to Xray API if enabled
-            api_status = False
-            api_error = None
-            api_stats = {}
-            
-            if self.api_enabled:
-                try:
-                    # Try different methods to check server status
-                    import socket
-                    import json
-                    
-                    # Parse API address
-                    host, port = self.api_address.split(':')
-                    port = int(port)
-                    
-                    # Test basic connection
-                    logger.info(f"Testing connection to Xray API at {host}:{port}")
-                    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                    sock.settimeout(5)
-                    result = sock.connect_ex((host, port))
-                    sock.close()
-                    
-                    if result == 0:
-                        api_status = True
-                        logger.info(f"Successfully connected to Xray API at {self.api_address}")
-                        
-                        # Try to get stats if library is available
-                        try:
-                            from vpn.xray_api_v2.server_manager import ServerManager
-                            manager = ServerManager(self.api_address)
-                            api_stats = manager.get_server_stats()
-                            logger.info(f"Got server stats: {api_stats}")
-                        except ImportError:
-                            logger.info("Xray API v2 library not available, but connection successful")
-                            api_stats = {"connection": "ok", "library": "not_available"}
-                        except Exception as stats_e:
-                            logger.warning(f"Connection OK but stats failed: {stats_e}")
-                            api_stats = {"connection": "ok", "stats_error": str(stats_e)}
-                    else:
-                        api_error = f"Connection failed to {host}:{port}"
-                        logger.warning(f"Failed to connect to Xray API at {self.api_address}: {api_error}")
-                        
-                except Exception as e:
-                    api_error = f"Connection test failed: {str(e)}"
-                    logger.warning(f"Failed to test connection to Xray API for server {self.name}: {e}")
-            else:
-                api_error = "API disabled in server settings"
-                logger.info(f"API disabled for server {self.name}")
-            
-            # Build status response
-            status = {
-                'server_name': self.name,
-                'server_type': 'Xray Server v2',
-                'client_hostname': self.client_hostname,
-                'api_address': self.api_address,
-                'api_enabled': self.api_enabled,
-                'api_connected': api_status,
-                'api_error': api_error,
-                'api_stats': api_stats,
-                'stats_enabled': self.stats_enabled,
-                'total_inbounds': active_inbounds.count(),
-                'inbound_ports': [],  # Will be populated when ServerInbound model is fully implemented
-                'accessible': api_status if self.api_enabled else True,  # Consider accessible if API disabled
-                'status': 'Connected' if api_status else 'API Issue' if self.api_enabled else 'No API Check'
-            }
-            
-            logger.info(f"Server status for {self.name}: {status['status']}")
-            return status
-            
-        except Exception as e:
-            logger.error(f"Failed to get status for Xray server {self.name}: {e}")
-            return {
-                'error': str(e),
-                'server_name': self.name,
-                'server_type': 'Xray Server v2',
-                'accessible': False,
-                'status': 'Error'
-            }
-    
-    def get_active_inbounds(self):
-        """Get all inbounds that are deployed on this server"""
-        try:
-            from vpn.models_xray import ServerInbound
-            return ServerInbound.objects.filter(server=self, active=True).select_related('inbound')
-        except ImportError:
-            # ServerInbound model doesn't exist yet, return empty queryset
-            from django.db.models import QuerySet
-            from vpn.models_xray import Inbound
-            return Inbound.objects.none()
-        except Exception as e:
-            logger.warning(f"Error getting active inbounds for server {self.name}: {e}")
-            from vpn.models_xray import Inbound
-            return Inbound.objects.none()
-    
-    def sync_users(self):
-        """Sync all users who have subscription groups containing inbounds on this server"""
-        try:
-            from vpn.tasks import sync_server_users
-            task = sync_server_users.delay(self.id)
-            logger.info(f"Scheduled user sync for Xray server {self.name} - task ID: {task.id}")
-            # Return success to indicate task was scheduled
-            return {"status": "scheduled", "task_id": str(task.id)}
-        except Exception as e:
-            logger.error(f"Failed to schedule user sync for server {self.name}: {e}")
-            return {"status": "failed", "error": str(e)}
-    
-    def sync_inbounds(self, auto_sync_users=True):
-        """Deploy all required inbounds on this server based on subscription groups"""
-        try:
-            from vpn.tasks import sync_server_inbounds
-            task = sync_server_inbounds.delay(self.id, auto_sync_users)
-            logger.info(f"Scheduled inbound sync for Xray server {self.name} - task ID: {task.id}")
-            return {"task_id": str(task.id), "auto_sync_users": auto_sync_users}
-        except Exception as e:
-            logger.error(f"Failed to schedule inbound sync for server {self.name}: {e}")
-            return {"error": str(e)}
-    
-    def deploy_inbound(self, inbound, users=None, server_inbound=None):
-        """Deploy a specific inbound on this server with optional users"""
-        try:
-            from vpn.xray_api_v2.client import XrayClient
-            import uuid
-            
-            logger.info(f"Deploying inbound {inbound.name} with protocol {inbound.protocol} on port {inbound.port}")
-            client = XrayClient(server=self.api_address)
-            
-            # Build user configs if users are provided
-            user_configs = []
-            if users:
-                for user in users:
-                    user_uuid = str(uuid.uuid5(uuid.NAMESPACE_DNS, f"{user.username}-{inbound.name}"))
-                    
-                    if inbound.protocol == 'vless':
-                        user_config = {
-                            "email": f"{user.username}@{self.name}",
-                            "id": user_uuid,
-                            "level": 0
-                        }
-                    elif inbound.protocol == 'vmess':
-                        user_config = {
-                            "email": f"{user.username}@{self.name}",
-                            "id": user_uuid,
-                            "level": 0,
-                            "alterId": 0
-                        }
-                    elif inbound.protocol == 'trojan':
-                        user_config = {
-                            "email": f"{user.username}@{self.name}",
-                            "password": user_uuid,
-                            "level": 0
-                        }
-                    else:
-                        logger.warning(f"Unsupported protocol {inbound.protocol} for user {user.username}")
-                        continue
-                    
-                    user_configs.append(user_config)
-                    logger.debug(f"Added user {user.username} to inbound config")
-            
-            # Build proper inbound configuration based on protocol
-            if inbound.full_config:
-                inbound_config = inbound.full_config.copy()  # Make a copy to modify
-                logger.info(f"Using existing full_config for inbound {inbound.name}")
-                
-                # Add users to the config if provided
-                if user_configs:
-                    if 'settings' not in inbound_config:
-                        inbound_config['settings'] = {}
-                    inbound_config['settings']['clients'] = user_configs
-                    logger.debug(f"Added {len(user_configs)} users to full_config")
-                
-                # Get certificate from ServerInbound or auto-select
-                certificate = None
-                if server_inbound:
-                    certificate = server_inbound.get_certificate()
-                
-                # If certificate found, update the config to use inline certificates
-                if certificate and certificate.certificate_pem:
-                    logger.info(f"Updating full_config with inline certificate for {certificate.domain}")
-                    
-                    # Convert PEM to lines for Xray format
-                    cert_lines = certificate.certificate_pem.strip().split('\n')
-                    key_lines = certificate.private_key_pem.strip().split('\n')
-                    
-                    # Update streamSettings if it exists
-                    if "streamSettings" in inbound_config and "tlsSettings" in inbound_config["streamSettings"]:
-                        # Remove any existing certificate file paths
-                        tls_settings = inbound_config["streamSettings"]["tlsSettings"]
-                        if "certificateFile" in tls_settings:
-                            del tls_settings["certificateFile"]
-                        if "keyFile" in tls_settings:
-                            del tls_settings["keyFile"]
-                        
-                        # Set inline certificates
-                        inbound_config["streamSettings"]["tlsSettings"]["certificates"] = [{
-                            "certificate": cert_lines,
-                            "key": key_lines,
-                            "usage": "encipherment"
-                        }]
-                        logger.debug("Updated existing tlsSettings with inline certificate and removed file paths")
-            else:
-                # Build full config based on protocol
-                inbound_config = {
-                    "tag": inbound.name,
-                    "port": inbound.port,
-                    "protocol": inbound.protocol,
-                    "listen": inbound.listen_address or "0.0.0.0",
-                }
-                
-                # Add protocol-specific settings
-                if inbound.protocol == 'vless':
-                    inbound_config["settings"] = {
-                        "clients": user_configs,  # Add users during creation
-                        "decryption": "none"
-                    }
-                    if inbound.network == 'ws':
-                        inbound_config["streamSettings"] = {
-                            "network": "ws",
-                            "wsSettings": {
-                                "path": f"/{inbound.name}"
-                            }
-                        }
-                    elif inbound.network == 'tcp':
-                        inbound_config["streamSettings"] = {
-                            "network": "tcp"
-                        }
-                elif inbound.protocol == 'vmess':
-                    inbound_config["settings"] = {
-                        "clients": user_configs  # Add users during creation
-                    }
-                    if inbound.network == 'ws':
-                        inbound_config["streamSettings"] = {
-                            "network": "ws",
-                            "wsSettings": {
-                                "path": f"/{inbound.name}"
-                            }
-                        }
-                    elif inbound.network == 'tcp':
-                        inbound_config["streamSettings"] = {
-                            "network": "tcp"
-                        }
-                elif inbound.protocol == 'trojan':
-                    inbound_config["settings"] = {
-                        "clients": user_configs  # Add users during creation
-                    }
-                    inbound_config["streamSettings"] = {
-                        "network": "tcp",
-                        "security": "tls"
-                    }
-                    
-                    # Get certificate for Trojan (always required)
-                    certificate = None
-                    if server_inbound:
-                        certificate = server_inbound.get_certificate()
-                    
-                    if certificate and certificate.certificate_pem:
-                        logger.info(f"Using certificate for Trojan inbound on domain {certificate.domain}")
-                        # Convert PEM to lines for Xray format
-                        cert_lines = certificate.certificate_pem.strip().split('\n')
-                        key_lines = certificate.private_key_pem.strip().split('\n')
-                        
-                        inbound_config["streamSettings"]["tlsSettings"] = {
-                            "certificates": [{
-                                "certificate": cert_lines,
-                                "key": key_lines,
-                                "usage": "encipherment"
-                            }]
-                        }
-                    else:
-                        logger.error(f"Trojan protocol requires certificate, but none found for inbound {inbound.name}!")
-                        inbound_config["streamSettings"]["tlsSettings"] = {
-                            "certificates": []
-                        }
-                
-                # Add TLS if specified
-                if inbound.security == 'tls' and inbound.protocol != 'trojan':
-                    if "streamSettings" not in inbound_config:
-                        inbound_config["streamSettings"] = {}
-                    inbound_config["streamSettings"]["security"] = "tls"
-                    
-                    # Get certificate for TLS
-                    certificate = None
-                    if server_inbound:
-                        certificate = server_inbound.get_certificate()
-                    
-                    if certificate and certificate.certificate_pem:
-                        logger.info(f"Using certificate for domain {certificate.domain}")
-                        # Convert PEM to lines for Xray format
-                        cert_lines = certificate.certificate_pem.strip().split('\n')
-                        key_lines = certificate.private_key_pem.strip().split('\n')
-                        
-                        inbound_config["streamSettings"]["tlsSettings"] = {
-                            "certificates": [{
-                                "certificate": cert_lines,
-                                "key": key_lines,
-                                "usage": "encipherment"
-                            }]
-                        }
-                    else:
-                        logger.warning(f"No certificate found for inbound {inbound.name}, TLS will not work!")
-                        inbound_config["streamSettings"]["tlsSettings"] = {
-                            "certificates": []
-                        }
-            
-            logger.debug(f"Inbound config for {inbound.name}: {len(str(inbound_config))} chars")
-            
-            # Check if inbound already exists
-            existing_inbounds = client.list_inbounds()
-            inbound_exists = any(ib.get('tag') == inbound.name for ib in existing_inbounds)
-            
-            if inbound_exists:
-                # Inbound already exists, update it instead of recreating
-                logger.info(f"Inbound {inbound.name} already exists, updating it")
-                # First remove the old one
-                client.remove_inbound(inbound.name)
-                # Then add the updated one
-                result = client.add_inbound(inbound_config)
-            else:
-                # Add new inbound
-                logger.info(f"Creating new inbound {inbound.name}")
-                result = client.add_inbound(inbound_config)
-            
-            logger.info(f"Deploy inbound result: {result}")
-            
-            # Check if command was successful
-            if result is not None and not (isinstance(result, dict) and 'error' in result):
-                # Mark as deployed on this server
-                from vpn.models_xray import ServerInbound
-                ServerInbound.objects.update_or_create(
-                    server=self,
-                    inbound=inbound,
-                    defaults={'active': True}
-                )
-                logger.info(f"Successfully deployed inbound {inbound.name} on server {self.name}")
-                return True
-            else:
-                logger.error(f"Failed to deploy inbound {inbound.name} on server {self.name}. Result: {result}")
-                return False
-            
-        except Exception as e:
-            logger.error(f"Error deploying inbound {inbound.name} on server {self.name}: {e}")
-            return False
-    
-    def add_user_to_inbound(self, user, inbound):
-        """Add a user to a specific inbound on this server using inbound recreation approach"""
-        try:
-            from vpn.xray_api_v2.client import XrayClient
-            from vpn.models_xray import ServerInbound
-            import uuid
-            
-            logger.info(f"Adding user {user.username} to inbound {inbound.name} using inbound recreation")
-            client = XrayClient(server=self.api_address)
-            
-            # Get ServerInbound object for certificate access
-            try:
-                server_inbound = ServerInbound.objects.get(server=self, inbound=inbound)
-            except ServerInbound.DoesNotExist:
-                logger.warning(f"ServerInbound not found for {self.name} -> {inbound.name}, creating one")
-                server_inbound = ServerInbound.objects.create(server=self, inbound=inbound, active=True)
-            
-            # Generate user UUID based on username and inbound
-            user_uuid = str(uuid.uuid5(uuid.NAMESPACE_DNS, f"{user.username}-{inbound.name}"))
-            logger.debug(f"Generated UUID for user {user.username}: {user_uuid}")
-            
-            # Build user config based on protocol
-            if inbound.protocol == 'vless':
-                user_config = {
-                    "email": f"{user.username}@{self.name}",
-                    "id": user_uuid,
-                    "level": 0
-                }
-            elif inbound.protocol == 'vmess':
-                user_config = {
-                    "email": f"{user.username}@{self.name}",
-                    "id": user_uuid,
-                    "level": 0,
-                    "alterId": 0
-                }
-            elif inbound.protocol == 'trojan':
-                user_config = {
-                    "email": f"{user.username}@{self.name}",
-                    "password": user_uuid,
-                    "level": 0
-                }
-            else:
-                logger.error(f"Unsupported protocol: {inbound.protocol}")
-                return False
-            
-            try:
-                # Get all users who should have access to this inbound from database
-                from vpn.models_xray import UserSubscription
-                
-                # Find all users who have subscriptions that include this inbound
-                users_with_access = set()
-                subscriptions = UserSubscription.objects.filter(
-                    active=True,
-                    subscription_group__inbounds=inbound,
-                    subscription_group__is_active=True
-                ).select_related('user')
-                
-                for subscription in subscriptions:
-                    users_with_access.add(subscription.user)
-                
-                logger.info(f"Found {len(users_with_access)} users with database access to inbound {inbound.name}")
-                
-                # Build user configs for all users who should have access
-                existing_users = []
-                user_already_exists = False
-                
-                for db_user in users_with_access:
-                    # Generate user UUID and config
-                    import uuid
-                    db_user_uuid = str(uuid.uuid5(uuid.NAMESPACE_DNS, f"{db_user.username}-{inbound.name}"))
-                    
-                    if db_user.username == user.username:
-                        user_already_exists = True
-                    
-                    if inbound.protocol == 'vless':
-                        db_user_config = {
-                            "email": f"{db_user.username}@{self.name}",
-                            "id": db_user_uuid,
-                            "level": 0
-                        }
-                    elif inbound.protocol == 'vmess':
-                        db_user_config = {
-                            "email": f"{db_user.username}@{self.name}",
-                            "id": db_user_uuid,
-                            "level": 0,
-                            "alterId": 0
-                        }
-                    elif inbound.protocol == 'trojan':
-                        db_user_config = {
-                            "email": f"{db_user.username}@{self.name}",
-                            "password": db_user_uuid,
-                            "level": 0
-                        }
-                    else:
-                        continue
-                    
-                    existing_users.append(db_user_config)
-                
-                if user_already_exists:
-                    logger.info(f"User {user.username} already has database access to inbound {inbound.name}")
-                    # Still proceed to ensure inbound is deployed with all users
-                
-                logger.info(f"Creating inbound with {len(existing_users)} users from database including {user.username}")
-                
-                # Remove the old inbound
-                logger.info(f"Removing old inbound {inbound.name}")
-                client.remove_inbound(inbound.name)
-                
-                # Recreate inbound with updated user list
-                if inbound.full_config:
-                    inbound_config = inbound.full_config.copy()
-                    if 'settings' not in inbound_config:
-                        inbound_config['settings'] = {}
-                    inbound_config['settings']['clients'] = existing_users
-                    
-                    # Handle certificate embedding if needed
-                    certificate = None
-                    if server_inbound:
-                        certificate = server_inbound.get_certificate()
-                        
-                    if certificate and certificate.certificate_pem:
-                        cert_lines = certificate.certificate_pem.strip().split('\n')
-                        key_lines = certificate.private_key_pem.strip().split('\n')
-                        
-                        if "streamSettings" in inbound_config and "tlsSettings" in inbound_config["streamSettings"]:
-                            # Remove any existing certificate file paths
-                            tls_settings = inbound_config["streamSettings"]["tlsSettings"]
-                            if "certificateFile" in tls_settings:
-                                del tls_settings["certificateFile"]
-                            if "keyFile" in tls_settings:
-                                del tls_settings["keyFile"]
-                                
-                            inbound_config["streamSettings"]["tlsSettings"]["certificates"] = [{
-                                "certificate": cert_lines,
-                                "key": key_lines,
-                                "usage": "encipherment"
-                            }]
-                else:
-                    # Build config from scratch with the users
-                    inbound_config = {
-                        "tag": inbound.name,
-                        "port": inbound.port,
-                        "protocol": inbound.protocol,
-                        "listen": inbound.listen_address or "0.0.0.0",
-                        "settings": {}
-                    }
-                    
-                    if inbound.protocol in ['vless', 'vmess']:
-                        inbound_config["settings"]["clients"] = existing_users
-                        if inbound.protocol == 'vless':
-                            inbound_config["settings"]["decryption"] = "none"
-                    elif inbound.protocol == 'trojan':
-                        inbound_config["settings"]["clients"] = existing_users
-                
-                logger.info(f"Deploying inbound with users: {[u.get('email') for u in existing_users]}")
-                result = client.add_inbound(inbound_config)
-                
-                if result is not None and not (isinstance(result, dict) and 'error' in result):
-                    if user_already_exists:
-                        logger.info(f"Successfully ensured user {user.username} exists in inbound {inbound.name}")
-                    else:
-                        logger.info(f"Successfully added user {user.username} to inbound {inbound.name} via inbound recreation")
-                    return True
-                else:
-                    logger.error(f"Failed to recreate inbound {inbound.name} with users. Result: {result}")
-                    return False
-                    
-            except Exception as cmd_error:
-                logger.error(f"Error during inbound recreation: {cmd_error}")
-                return False
-            
-        except Exception as e:
-            logger.error(f"Error adding user {user.username} to inbound {inbound.name} on server {self.name}: {e}")
-            return False
-    
-    def remove_user_from_inbound(self, user, inbound):
-        """Remove a user from a specific inbound on this server"""
-        try:
-            from vpn.xray_api_v2.client import XrayClient
-            
-            client = XrayClient(server=self.api_address)
-            
-            # Remove user using the client's remove_users method
-            user_email = f"{user.username}@{self.name}"
-            logger.info(f"Removing user {user_email} from inbound {inbound.name}")
-            
-            result = client.remove_users(inbound.name, user_email)
-            logger.info(f"Remove user result: {result}")
-            
-            if result is not None and not (isinstance(result, dict) and 'error' in result):
-                logger.info(f"Successfully removed user {user.username} from inbound {inbound.name} on server {self.name}")
-                return True
-            else:
-                logger.error(f"Failed to remove user {user.username} from inbound {inbound.name} on server {self.name}. Result: {result}")
-                return False
-            
-        except Exception as e:
-            logger.error(f"Error removing user {user.username} from inbound {inbound.name} on server {self.name}: {e}")
-            return False
-    
-    def get_user_configs(self, user):
-        """Generate all connection configs for a user on this server"""
-        configs = []
-        
-        try:
-            # Get all subscription groups for this user
-            user_subscriptions = UserSubscription.objects.filter(
-                user=user,
-                active=True,
-                subscription_group__is_active=True
-            ).select_related('subscription_group').prefetch_related('subscription_group__inbounds')
-            
-            for subscription in user_subscriptions:
-                group = subscription.subscription_group
-                
-                # Check which inbounds from this group are active on this server
-                active_inbounds = self.get_active_inbounds().filter(
-                    inbound__in=group.inbounds.all()
-                )
-                
-                for server_inbound in active_inbounds:
-                    inbound = server_inbound.inbound
-                    
-                    try:
-                        # Generate connection string directly
-                        from vpn.views import generate_xray_connection_string
-                        connection_string = generate_xray_connection_string(user, inbound, self.name, self.client_hostname)
-                        
-                        if connection_string:
-                            configs.append({
-                                'protocol': inbound.protocol,
-                                'inbound_name': inbound.name,
-                                'group_name': group.name,
-                                'connection_string': connection_string,
-                                'port': inbound.port,
-                                'network': inbound.network,
-                                'security': inbound.security
-                            })
-                    
-                    except Exception as e:
-                        logger.warning(f"Failed to generate config for user {user.username} on inbound {inbound.name}: {e}")
-                        continue
-            
-            logger.info(f"Generated {len(configs)} configs for user {user.username} on server {self.name}")
-            return configs
-            
-        except Exception as e:
-            logger.error(f"Error generating user configs for {user.username} on server {self.name}: {e}")
-            return []
-    
-    def sync(self):
-        """Sync server configuration and users"""
-        try:
-            self.sync_inbounds()
-            self.sync_users()
-            logger.info(f"Full sync completed for server {self.name}")
-        except Exception as e:
-            logger.error(f"Sync failed for server {self.name}: {e}")
-    
-    def add_user(self, user, **kwargs):
-        """Add user to server - implemented through subscription groups"""
-        try:
-            from vpn.xray_api_v2.client import XrayClient
-            client = XrayClient(server=self.api_address)
-            
-            # Users are added through subscription groups in the new architecture
-            subscriptions = user.xray_subscriptions.filter(active=True)
-            added_count = 0
-            
-            logger.info(f"User {user.username} has {subscriptions.count()} active subscriptions")
-            
-            if subscriptions.count() == 0:
-                logger.warning(f"User {user.username} has no active Xray subscriptions - cannot add to server")
-                return False
-            
-            # Get all inbounds that this user should have access to
-            inbounds_to_process = []
-            for subscription in subscriptions:
-                logger.info(f"Processing subscription group: {subscription.subscription_group.name}")
-                for inbound in subscription.subscription_group.inbounds.all():
-                    if inbound not in inbounds_to_process:
-                        inbounds_to_process.append(inbound)
-                        logger.info(f"Added inbound {inbound.name} to processing list")
-            
-            # Get existing inbounds on server
-            try:
-                existing_result = client.execute_command('lsi')  # List inbounds
-                existing_inbound_tags = set()
-                if existing_result and 'inbounds' in existing_result:
-                    existing_inbound_tags = {ib.get('tag') for ib in existing_result['inbounds'] if ib.get('tag')}
-                logger.info(f"Existing inbound tags on server: {existing_inbound_tags}")
-            except Exception as e:
-                logger.warning(f"Failed to list inbounds: {e}")
-                existing_inbound_tags = set()
-            
-            # Process each inbound
-            for inbound in inbounds_to_process:
-                logger.info(f"Processing inbound: {inbound.name} (protocol: {inbound.protocol})")
-                
-                # Check if inbound exists on server
-                if inbound.name not in existing_inbound_tags:
-                    logger.info(f"Inbound {inbound.name} doesn't exist on server, creating with all authorized users")
-                    
-                    # Get all users who should have access to this inbound from database
-                    from vpn.models_xray import ServerInbound, UserSubscription
-                    server_inbound_obj, created = ServerInbound.objects.get_or_create(
-                        server=self, inbound=inbound, defaults={'active': True}
-                    )
-                    
-                    # Find all users who have subscriptions that include this inbound
-                    users_with_access = set()
-                    subscriptions_for_inbound = UserSubscription.objects.filter(
-                        active=True,
-                        subscription_group__inbounds=inbound,
-                        subscription_group__is_active=True
-                    ).select_related('user')
-                    
-                    for subscription in subscriptions_for_inbound:
-                        users_with_access.add(subscription.user)
-                    
-                    logger.info(f"Creating inbound {inbound.name} with {len(users_with_access)} authorized users")
-                    
-                    # Create the inbound with all authorized users
-                    if self.deploy_inbound(inbound, users=list(users_with_access), server_inbound=server_inbound_obj):
-                        logger.info(f"Successfully created inbound {inbound.name} with {len(users_with_access)} users")
-                        added_count += 1
-                        existing_inbound_tags.add(inbound.name)
-                    else:
-                        logger.error(f"Failed to create inbound {inbound.name} with users")
-                        continue
-                else:
-                    # Inbound exists, skip individual user addition to avoid constant recreation
-                    # User will be added during the next full inbound sync
-                    logger.info(f"Inbound {inbound.name} exists, user {user.username} will be added during next sync")
-                    added_count += 1
-            
-            logger.info(f"Added user {user.username} to {added_count} inbounds on server {self.name}")
-            return added_count > 0
-            
-        except Exception as e:
-            logger.error(f"Failed to add user {user.username} to server {self.name}: {e}")
-            return False
-    
-    def get_user(self, user, raw=False):
-        """Get user configurations from server"""
-        try:
-            configs = self.get_user_configs(user)
-            if raw:
-                return {
-                    'configs': configs,
-                    'total_configs': len(configs)
-                }
-            return configs
-            
-        except Exception as e:
-            logger.error(f"Failed to get user {user.username} from server {self.name}: {e}")
-            return [] if not raw else {'error': str(e)}
-    
-    def delete_user(self, user):
-        """Remove user from server"""
-        try:
-            removed_count = 0
-            subscriptions = user.xray_subscriptions.filter(active=True)
-            
-            for subscription in subscriptions:
-                for inbound in subscription.subscription_group.inbounds.all():
-                    if self.remove_user_from_inbound(user, inbound):
-                        removed_count += 1
-            
-            logger.info(f"Removed user {user.username} from {removed_count} inbounds on server {self.name}")
-            return removed_count > 0
-            
-        except Exception as e:
-            logger.error(f"Failed to remove user {user.username} from server {self.name}: {e}")
-            return False
-    
-    def __str__(self):
-        return f"Xray Server v2: {self.name}"
-
-
-class ServerInboundInline(admin.TabularInline):
-    """Inline for managing inbound templates on a server"""
-    from vpn.models_xray import ServerInbound
-    model = ServerInbound
-    extra = 0
-    fields = ('inbound', 'certificate', 'active')
-    verbose_name = "Inbound Template"
-    verbose_name_plural = "Inbound Templates"
-    
-    def formfield_for_foreignkey(self, db_field, request, **kwargs):
-        """Filter certificates for inbound selection"""
-        if db_field.name == 'certificate':
-            from vpn.models_xray import Certificate
-            kwargs['queryset'] = Certificate.objects.filter(cert_type__in=['letsencrypt', 'custom'])
-            kwargs['empty_label'] = "Auto-select by server hostname"
-        return super().formfield_for_foreignkey(db_field, request, **kwargs)
-
-
-class XrayServerV2Admin(PolymorphicChildModelAdmin):
-    base_model = XrayServerV2
-    show_in_index = False
-    list_display = ['name', 'client_hostname', 'api_address', 'api_enabled', 'stats_enabled', 'registration_date']
-    list_filter = ['api_enabled', 'stats_enabled', 'registration_date']
-    search_fields = ['name', 'client_hostname', 'comment']
-    readonly_fields = ['server_type', 'registration_date', 'traffic_statistics']
-    inlines = [ServerInboundInline]
-    
-    def has_module_permission(self, request):
-        """Hide this model from the main admin index"""
-        return False
-    
-    fieldsets = [
-        ('Basic Information', {
-            'fields': ('name', 'comment', 'server_type')
-        }),
-        ('Connection Settings', {
-            'fields': ('client_hostname', 'api_address')
-        }),
-        ('API Settings', {
-            'fields': ('api_enabled', 'stats_enabled')
-        }),
-        ('Traffic Statistics', {
-            'fields': ('traffic_statistics',),
-            'description': 'Real-time traffic statistics from Xray server'
-        }),
-        ('Timestamps', {
-            'fields': ('registration_date',),
-            'classes': ('collapse',)
-        })
-    ]
-    
-    actions = ['sync_users', 'sync_inbounds', 'get_status']
-    
-    def sync_users(self, request, queryset):
-        from vpn.tasks import sync_server_users
-        scheduled_count = 0
-        for server in queryset:
-            # Directly schedule the task instead of calling server.sync_users() 
-            # to avoid potential recursion issues
-            sync_server_users.delay(server.id)
-            scheduled_count += 1
-        self.message_user(request, f"Scheduled user sync for {scheduled_count} servers")
-    sync_users.short_description = "Sync users for selected servers"
-    
-    def sync_inbounds(self, request, queryset):
-        for server in queryset:
-            server.sync_inbounds()
-        self.message_user(request, f"Scheduled inbound sync for {queryset.count()} servers")
-    sync_inbounds.short_description = "Sync inbounds for selected servers"
-    
-    def get_status(self, request, queryset):
-        statuses = []
-        for server in queryset:
-            status = server.get_server_status()
-            statuses.append(f"{server.name}: {status.get('accessible', 'Unknown')}")
-        self.message_user(request, f"Server statuses: {', '.join(statuses)}")
-    get_status.short_description = "Check status of selected servers"
-    
-    def traffic_statistics(self, obj):
-        """Display traffic statistics for this server"""
-        from django.utils.safestring import mark_safe
-        from django.utils.html import format_html
-        
-        if not obj.pk:
-            return "Save server first to see statistics"
-        
-        if not obj.api_enabled or not obj.stats_enabled:
-            return "Statistics are disabled. Enable API and stats to see traffic data."
-        
-        try:
-            from vpn.xray_api_v2.client import XrayClient
-            from vpn.xray_api_v2.stats import StatsManager
-            
-            client = XrayClient(server=obj.api_address)
-            stats_manager = StatsManager(client)
-            
-            # Get traffic summary
-            traffic_summary = stats_manager.get_traffic_summary()
-            
-            # Format bytes
-            def format_bytes(bytes_val):
-                for unit in ['B', 'KB', 'MB', 'GB', 'TB']:
-                    if bytes_val < 1024.0:
-                        return f"{bytes_val:.1f}{unit}"
-                    bytes_val /= 1024.0
-                return f"{bytes_val:.1f}PB"
-            
-            html = '<div style="background: #f8f9fa; padding: 15px; border-radius: 5px;">'
-            
-            # User statistics
-            users = traffic_summary.get('users', {})
-            if users:
-                html += '<h4 style="margin: 0 0 15px 0; color: #495057;">👥 User Traffic</h4>'
-                html += '<table style="width: 100%; border-collapse: collapse; margin-bottom: 20px;">'
-                html += '<thead><tr style="background: #e9ecef;">'
-                html += '<th style="padding: 8px; text-align: left; border: 1px solid #dee2e6;">User</th>'
-                html += '<th style="padding: 8px; text-align: right; border: 1px solid #dee2e6;">Upload</th>'
-                html += '<th style="padding: 8px; text-align: right; border: 1px solid #dee2e6;">Download</th>'
-                html += '<th style="padding: 8px; text-align: right; border: 1px solid #dee2e6;">Total</th>'
-                html += '</tr></thead><tbody>'
-                
-                # Sort users by total traffic
-                sorted_users = sorted(users.items(), 
-                                    key=lambda x: x[1].get('uplink', 0) + x[1].get('downlink', 0), 
-                                    reverse=True)
-                
-                total_up = 0
-                total_down = 0
-                
-                for email, stats in sorted_users[:20]:  # Show top 20 users
-                    up = stats.get('uplink', 0)
-                    down = stats.get('downlink', 0)
-                    total = up + down
-                    total_up += up
-                    total_down += down
-                    
-                    html += '<tr>'
-                    html += f'<td style="padding: 6px; border: 1px solid #dee2e6;">{email}</td>'
-                    html += f'<td style="padding: 6px; text-align: right; border: 1px solid #dee2e6;">↑ {format_bytes(up)}</td>'
-                    html += f'<td style="padding: 6px; text-align: right; border: 1px solid #dee2e6;">↓ {format_bytes(down)}</td>'
-                    html += f'<td style="padding: 6px; text-align: right; border: 1px solid #dee2e6; font-weight: bold;">{format_bytes(total)}</td>'
-                    html += '</tr>'
-                
-                if len(users) > 20:
-                    html += f'<tr><td colspan="4" style="padding: 6px; text-align: center; border: 1px solid #dee2e6; color: #6c757d;">... and {len(users) - 20} more users</td></tr>'
-                
-                # Total row
-                html += '<tr style="background: #e9ecef; font-weight: bold;">'
-                html += f'<td style="padding: 8px; border: 1px solid #dee2e6;">Total ({len(users)} users)</td>'
-                html += f'<td style="padding: 8px; text-align: right; border: 1px solid #dee2e6;">↑ {format_bytes(total_up)}</td>'
-                html += f'<td style="padding: 8px; text-align: right; border: 1px solid #dee2e6;">↓ {format_bytes(total_down)}</td>'
-                html += f'<td style="padding: 8px; text-align: right; border: 1px solid #dee2e6;">{format_bytes(total_up + total_down)}</td>'
-                html += '</tr>'
-                
-                html += '</tbody></table>'
-            else:
-                html += '<p style="color: #6c757d;">No user traffic data available</p>'
-            
-            # Inbound statistics
-            inbounds = traffic_summary.get('inbounds', {})
-            if inbounds:
-                html += '<h4 style="margin: 20px 0 15px 0; color: #495057;">📡 Inbound Traffic</h4>'
-                html += '<table style="width: 100%; border-collapse: collapse;">'
-                html += '<thead><tr style="background: #e9ecef;">'
-                html += '<th style="padding: 8px; text-align: left; border: 1px solid #dee2e6;">Inbound</th>'
-                html += '<th style="padding: 8px; text-align: right; border: 1px solid #dee2e6;">Upload</th>'
-                html += '<th style="padding: 8px; text-align: right; border: 1px solid #dee2e6;">Download</th>'
-                html += '<th style="padding: 8px; text-align: right; border: 1px solid #dee2e6;">Total</th>'
-                html += '</tr></thead><tbody>'
-                
-                for tag, stats in inbounds.items():
-                    up = stats.get('uplink', 0)
-                    down = stats.get('downlink', 0)
-                    total = up + down
-                    
-                    html += '<tr>'
-                    html += f'<td style="padding: 6px; border: 1px solid #dee2e6;">{tag}</td>'
-                    html += f'<td style="padding: 6px; text-align: right; border: 1px solid #dee2e6;">↑ {format_bytes(up)}</td>'
-                    html += f'<td style="padding: 6px; text-align: right; border: 1px solid #dee2e6;">↓ {format_bytes(down)}</td>'
-                    html += f'<td style="padding: 6px; text-align: right; border: 1px solid #dee2e6; font-weight: bold;">{format_bytes(total)}</td>'
-                    html += '</tr>'
-                
-                html += '</tbody></table>'
-            
-            html += '</div>'
-            
-            return format_html(html)
-            
-        except Exception as e:
-            return f"Error fetching statistics: {str(e)}"
-    
-    traffic_statistics.short_description = 'Traffic Statistics'
-
-
-# Register the admin class
-admin.site.register(XrayServerV2, XrayServerV2Admin)
\ No newline at end of file
diff --git a/vpn/signals.py b/vpn/signals.py
deleted file mode 100644
index 357eef7..0000000
--- a/vpn/signals.py
+++ /dev/null
@@ -1,357 +0,0 @@
-"""
-Django signals for automatic Xray server synchronization
-"""
-import logging
-from django.db.models.signals import post_save, post_delete, m2m_changed
-from django.dispatch import receiver
-from django.db import transaction
-from celery import group
-
-from .models_xray import (
-    Inbound, 
-    SubscriptionGroup, 
-    UserSubscription, 
-    Certificate,
-    ServerInbound
-)
-from .server_plugins.xray_v2 import XrayServerV2
-
-logger = logging.getLogger(__name__)
-
-
-def get_active_xray_servers():
-    """Get all active Xray servers"""
-    from .server_plugins import Server
-    return [
-        server.get_real_instance() 
-        for server in Server.objects.all() 
-        if hasattr(server.get_real_instance(), 'api_enabled') and 
-           server.get_real_instance().api_enabled
-    ]
-
-
-def schedule_inbound_sync_for_servers(inbound, servers=None):
-    """Schedule inbound deployment on servers"""
-    if servers is None:
-        servers = get_active_xray_servers()
-    
-    if not servers:
-        logger.warning("No active Xray servers found for inbound sync")
-        return
-    
-    logger.info(f"Scheduling inbound {inbound.name} deployment on {len(servers)} servers")
-    
-    # Schedule deployment tasks
-    from .tasks import deploy_inbound_on_server
-    tasks = []
-    for server in servers:
-        task = deploy_inbound_on_server.s(server.id, inbound.id)
-        tasks.append(task)
-    
-    # Execute all deployments in parallel
-    job = group(tasks)
-    result = job.apply_async()
-    
-    logger.info(f"Scheduled inbound deployment tasks: {result}")
-    return result
-
-
-def schedule_user_sync_for_servers(servers=None):
-    """Schedule user sync on servers after inbound changes"""
-    if servers is None:
-        servers = get_active_xray_servers()
-    
-    if not servers:
-        logger.warning("No active Xray servers found for user sync")
-        return
-    
-    logger.info(f"Scheduling user sync on {len(servers)} servers")
-    
-    # Schedule user sync tasks
-    from .tasks import sync_server_users
-    tasks = []
-    for server in servers:
-        task = sync_server_users.s(server.id)
-        tasks.append(task)
-    
-    # Execute all user syncs in parallel with delay to allow inbound sync to complete
-    job = group(tasks)
-    result = job.apply_async(countdown=10)  # 10 second delay
-    
-    logger.info(f"Scheduled user sync tasks: {result}")
-    return result
-
-
-@receiver(post_save, sender=Inbound)
-def inbound_created_or_updated(sender, instance, created, **kwargs):
-    """
-    When an inbound is created or updated, deploy it to all servers
-    where subscription groups contain this inbound
-    """
-    if created:
-        logger.info(f"New inbound {instance.name} created, will deploy when added to groups")
-    else:
-        logger.info(f"Inbound {instance.name} updated, scheduling redeployment")
-        
-        # Get all subscription groups that contain this inbound
-        groups = instance.subscriptiongroup_set.filter(is_active=True)
-        
-        if groups.exists():
-            # Get all servers that should have this inbound
-            servers = get_active_xray_servers()
-            
-            # Schedule redeployment
-            transaction.on_commit(lambda: schedule_inbound_sync_for_servers(instance, servers))
-            
-            # Schedule user sync after inbound update
-            transaction.on_commit(lambda: schedule_user_sync_for_servers(servers))
-
-
-@receiver(post_delete, sender=Inbound)
-def inbound_deleted(sender, instance, **kwargs):
-    """
-    When an inbound is deleted, remove it from all servers
-    """
-    logger.info(f"Inbound {instance.name} deleted, scheduling removal from servers")
-    
-    # Schedule removal from all servers
-    from .tasks import remove_inbound_from_server
-    servers = get_active_xray_servers()
-    tasks = []
-    
-    for server in servers:
-        task = remove_inbound_from_server.s(server.id, instance.name)
-        tasks.append(task)
-    
-    if tasks:
-        job = group(tasks)
-        transaction.on_commit(lambda: job.apply_async())
-
-
-@receiver(m2m_changed, sender=SubscriptionGroup.inbounds.through)
-def subscription_group_inbounds_changed(sender, instance, action, pk_set, **kwargs):
-    """
-    When inbounds are added/removed from subscription groups,
-    automatically deploy/remove them on servers
-    """
-    if action in ['post_add', 'post_remove']:
-        logger.info(f"Subscription group {instance.name} inbounds changed: {action}")
-        
-        if action == 'post_add' and pk_set:
-            # Inbounds were added to the group - deploy them
-            inbounds = Inbound.objects.filter(pk__in=pk_set)
-            servers = get_active_xray_servers()
-            
-            for inbound in inbounds:
-                logger.info(f"Deploying inbound {inbound.name} (added to group {instance.name})")
-                transaction.on_commit(
-                    lambda inb=inbound: schedule_inbound_sync_for_servers(inb, servers)
-                )
-            
-            # Schedule user sync after all inbounds are deployed
-            transaction.on_commit(lambda: schedule_user_sync_for_servers(servers))
-            
-        elif action == 'post_remove' and pk_set:
-            # Inbounds were removed from the group
-            inbounds = Inbound.objects.filter(pk__in=pk_set)
-            
-            for inbound in inbounds:
-                # Check if inbound is still used by other active groups
-                other_groups = inbound.subscriptiongroup_set.filter(is_active=True).exclude(id=instance.id)
-                
-                if not other_groups.exists():
-                    # Inbound is not used by any other group - remove from servers
-                    logger.info(f"Removing inbound {inbound.name} from servers (no longer in any group)")
-                    from .tasks import remove_inbound_from_server
-                    servers = get_active_xray_servers()
-                    tasks = []
-                    
-                    for server in servers:
-                        task = remove_inbound_from_server.s(server.id, inbound.name)
-                        tasks.append(task)
-                    
-                    if tasks:
-                        job = group(tasks)
-                        transaction.on_commit(lambda: job.apply_async())
-
-
-@receiver(post_save, sender=ServerInbound)
-def server_inbound_created_or_updated(sender, instance, created, **kwargs):
-    """
-    When ServerInbound is created or updated, immediately deploy the inbound
-    template to the server (not wait for subscription group changes)
-    """
-    logger.info(f"ServerInbound {instance.inbound.name} {'created' if created else 'updated'} for server {instance.server.name}")
-    
-    if instance.active:
-        # Deploy inbound immediately
-        servers = [instance.server.get_real_instance()]
-        transaction.on_commit(
-            lambda: schedule_inbound_sync_for_servers(instance.inbound, servers)
-        )
-        
-        # Schedule user sync after inbound deployment
-        transaction.on_commit(lambda: schedule_user_sync_for_servers(servers))
-    else:
-        # Remove inbound from server if deactivated
-        logger.info(f"Removing inbound {instance.inbound.name} from server {instance.server.name} (deactivated)")
-        from .tasks import remove_inbound_from_server
-        task = remove_inbound_from_server.s(instance.server.id, instance.inbound.name)
-        transaction.on_commit(lambda: task.apply_async())
-
-
-@receiver(post_delete, sender=ServerInbound)
-def server_inbound_deleted(sender, instance, **kwargs):
-    """
-    When ServerInbound is deleted, remove the inbound from the server
-    """
-    logger.info(f"ServerInbound {instance.inbound.name} deleted from server {instance.server.name}")
-    
-    from .tasks import remove_inbound_from_server
-    task = remove_inbound_from_server.s(instance.server.id, instance.inbound.name)
-    transaction.on_commit(lambda: task.apply_async())
-
-
-@receiver(post_save, sender=UserSubscription)
-def user_subscription_created_or_updated(sender, instance, created, **kwargs):
-    """
-    When user subscription is created or updated, sync the user to servers
-    """
-    if created:
-        logger.info(f"New subscription created for user {instance.user.username} in group {instance.subscription_group.name}")
-    else:
-        logger.info(f"Subscription updated for user {instance.user.username} in group {instance.subscription_group.name}")
-    
-    if instance.active:
-        # Schedule user sync on all servers
-        servers = get_active_xray_servers()
-        transaction.on_commit(lambda: schedule_user_sync_for_servers(servers))
-
-
-@receiver(post_delete, sender=UserSubscription)
-def user_subscription_deleted(sender, instance, **kwargs):
-    """
-    When user subscription is deleted, remove user from servers if no other subscriptions
-    """
-    logger.info(f"Subscription deleted for user {instance.user.username} in group {instance.subscription_group.name}")
-    
-    # Check if user has other active subscriptions
-    other_subscriptions = UserSubscription.objects.filter(
-        user=instance.user,
-        active=True
-    ).exclude(id=instance.id).exists()
-    
-    if not other_subscriptions:
-        # User has no more subscriptions - remove from all servers
-        logger.info(f"User {instance.user.username} has no more subscriptions, removing from servers")
-        from .tasks import remove_user_from_server
-        servers = get_active_xray_servers()
-        tasks = []
-        
-        for server in servers:
-            task = remove_user_from_server.s(server.id, instance.user.id)
-            tasks.append(task)
-        
-        if tasks:
-            job = group(tasks)
-            transaction.on_commit(lambda: job.apply_async())
-
-
-@receiver(post_save, sender=Certificate)
-def certificate_updated(sender, instance, created, **kwargs):
-    """
-    When certificate is updated, redeploy all inbounds that use it
-    """
-    if not created and instance.certificate_pem:  # Only on updates when cert is available
-        logger.info(f"Certificate {instance.domain} updated, redeploying dependent inbounds")
-        
-        # Find all ServerInbound deployments that use this certificate
-        from vpn.models_xray import ServerInbound
-        server_inbounds = ServerInbound.objects.filter(certificate=instance).select_related('server', 'inbound')
-        
-        # Group by server for efficient syncing
-        servers_to_sync = set()
-        for server_inbound in server_inbounds:
-            servers_to_sync.add(server_inbound.server)
-        
-        # Schedule sync for each affected server
-        for server in servers_to_sync:
-            # Only sync if server has sync_inbounds method (Xray servers)
-            real_server = server.get_real_instance()
-            if hasattr(real_server, 'sync_inbounds'):
-                transaction.on_commit(
-                    lambda srv=real_server: srv.sync_inbounds()
-                )
-            else:
-                logger.debug(f"Server {server.name} does not support inbound sync")
-
-
-@receiver(post_save, sender=SubscriptionGroup)
-def subscription_group_updated(sender, instance, created, **kwargs):
-    """
-    When subscription group is created/updated, sync its state
-    """
-    if created:
-        logger.info(f"New subscription group {instance.name} created")
-    else:
-        logger.info(f"Subscription group {instance.name} updated")
-        
-        if not instance.is_active:
-            # Group was deactivated - remove its inbounds from servers if not used elsewhere
-            logger.info(f"Subscription group {instance.name} deactivated, checking inbounds")
-            
-            for inbound in instance.inbounds.all():
-                # Check if inbound is used by other active groups
-                other_groups = inbound.subscriptiongroup_set.filter(is_active=True).exclude(id=instance.id)
-                
-                if not other_groups.exists():
-                    # Remove inbound from servers
-                    logger.info(f"Removing inbound {inbound.name} from servers (group deactivated)")
-                    from .tasks import remove_inbound_from_server
-                    servers = get_active_xray_servers()
-                    tasks = []
-                    
-                    for server in servers:
-                        task = remove_inbound_from_server.s(server.id, inbound.name)
-                        tasks.append(task)
-                    
-                    if tasks:
-                        job = group(tasks)
-                        transaction.on_commit(lambda: job.apply_async())
-
-
-@receiver(post_save, sender=ServerInbound)
-def server_inbound_created_or_updated(sender, instance, created, **kwargs):
-    """
-    When ServerInbound is created or updated, immediately deploy the inbound
-    template to the server (not wait for subscription group changes)
-    """
-    logger.info(f"ServerInbound {instance.inbound.name} {'created' if created else 'updated'} for server {instance.server.name}")
-    
-    if instance.active:
-        # Deploy inbound immediately
-        servers = [instance.server.get_real_instance()]
-        transaction.on_commit(
-            lambda: schedule_inbound_sync_for_servers(instance.inbound, servers)
-        )
-        
-        # Schedule user sync after inbound deployment
-        transaction.on_commit(lambda: schedule_user_sync_for_servers(servers))
-    else:
-        # Remove inbound from server if deactivated
-        logger.info(f"Removing inbound {instance.inbound.name} from server {instance.server.name} (deactivated)")
-        from .tasks import remove_inbound_from_server
-        task = remove_inbound_from_server.s(instance.server.id, instance.inbound.name)
-        transaction.on_commit(lambda: task.apply_async())
-
-
-@receiver(post_delete, sender=ServerInbound)
-def server_inbound_deleted(sender, instance, **kwargs):
-    """
-    When ServerInbound is deleted, remove the inbound from the server
-    """
-    logger.info(f"ServerInbound {instance.inbound.name} deleted from server {instance.server.name}")
-    
-    from .tasks import remove_inbound_from_server
-    task = remove_inbound_from_server.s(instance.server.id, instance.inbound.name)
-    transaction.on_commit(lambda: task.apply_async())
\ No newline at end of file
diff --git a/vpn/tasks.py b/vpn/tasks.py
deleted file mode 100644
index 2519ed9..0000000
--- a/vpn/tasks.py
+++ /dev/null
@@ -1,1192 +0,0 @@
-import logging
-import time
-from datetime import datetime, timedelta
-from celery import group, shared_task
-from celery.exceptions import Retry
-
-logger = logging.getLogger(__name__)
-
-def create_task_log(task_id, task_name, action, status='STARTED', server=None, user=None, message='', execution_time=None):
-    """Helper function to create task execution log"""
-    try:
-        from .models import TaskExecutionLog
-        TaskExecutionLog.objects.create(
-            task_id=task_id,
-            task_name=task_name,
-            server=server,
-            user=user,
-            action=action,
-            status=status,
-            message=message,
-            execution_time=execution_time
-        )
-    except Exception as e:
-        # Don't fail tasks if logging fails - just log to console
-        logger.error(f"Failed to create task log (task_id: {task_id}, action: {action}): {e}")
-        # If table doesn't exist, just continue without logging to DB
-        if "does not exist" in str(e):
-            logger.info(f"TaskExecutionLog table not found - run migrations. Task: {task_name}, Action: {action}, Status: {status}")
-
-@shared_task(name="cleanup_task_logs")
-def cleanup_task_logs():
-    """Clean up old task execution logs (older than 30 days)"""
-    from .models import TaskExecutionLog
-    
-    try:
-        cutoff_date = datetime.now() - timedelta(days=30)
-        old_logs = TaskExecutionLog.objects.filter(created_at__lt=cutoff_date)
-        count = old_logs.count()
-        
-        if count > 0:
-            old_logs.delete()
-            logger.info(f"Cleaned up {count} old task execution logs")
-            return f"Cleaned up {count} old task execution logs"
-        else:
-            logger.info("No old task execution logs to clean up")
-            return "No old task execution logs to clean up"
-            
-    except Exception as e:
-        logger.error(f"Error cleaning up task logs: {e}")
-        return f"Error cleaning up task logs: {e}"
-
-
-@shared_task(name="sync_xray_inbounds", bind=True, autoretry_for=(Exception,), retry_kwargs={'max_retries': 3, 'countdown': 30})
-def sync_xray_inbounds(self, server_id):
-    """Stage 1: Sync inbounds for Xray server."""
-    from vpn.server_plugins import Server
-    from vpn.server_plugins.xray_v2 import XrayServerV2
-    
-    start_time = time.time()
-    task_id = self.request.id
-    server = None
-    
-    try:
-        server = Server.objects.get(id=server_id)
-        
-        if not isinstance(server.get_real_instance(), XrayServerV2):
-            error_message = f"Server {server.name} is not an Xray server"
-            logger.error(error_message)
-            create_task_log(task_id, "sync_xray_inbounds", "Wrong server type", 'FAILURE', server=server, message=error_message, execution_time=time.time() - start_time)
-            return {"error": error_message}
-        
-        create_task_log(task_id, "sync_xray_inbounds", f"Starting inbound sync for {server.name}", 'STARTED', server=server)
-        logger.info(f"Starting inbound sync for Xray server {server.name}")
-        
-        real_server = server.get_real_instance()
-        inbound_result = real_server.sync_inbounds()
-        
-        success_message = f"Successfully synced inbounds for {server.name}"
-        logger.info(f"{success_message}. Result: {inbound_result}")
-        
-        create_task_log(task_id, "sync_xray_inbounds", "Inbound sync completed", 'SUCCESS', server=server, message=f"{success_message}. Result: {inbound_result}", execution_time=time.time() - start_time)
-        
-        return inbound_result
-        
-    except Server.DoesNotExist:
-        error_message = f"Server with id {server_id} not found"
-        logger.error(error_message)
-        create_task_log(task_id, "sync_xray_inbounds", "Server not found", 'FAILURE', message=error_message, execution_time=time.time() - start_time)
-        return {"error": error_message}
-    except Exception as e:
-        error_message = f"Error syncing inbounds for {server.name if server else server_id}: {e}"
-        logger.error(error_message)
-        
-        if self.request.retries < 3:
-            retry_message = f"Retrying inbound sync for {server.name if server else server_id} (attempt {self.request.retries + 1})"
-            logger.info(retry_message)
-            create_task_log(task_id, "sync_xray_inbounds", "Retrying inbound sync", 'RETRY', server=server, message=retry_message)
-            raise self.retry(countdown=30)
-        
-        create_task_log(task_id, "sync_xray_inbounds", "Inbound sync failed after retries", 'FAILURE', server=server, message=error_message, execution_time=time.time() - start_time)
-        return {"error": error_message}
-
-
-@shared_task(name="sync_xray_users", bind=True, autoretry_for=(Exception,), retry_kwargs={'max_retries': 3, 'countdown': 30})
-def sync_xray_users(self, server_id):
-    """Stage 2: Sync users for Xray server."""
-    from vpn.server_plugins import Server
-    from vpn.server_plugins.xray_v2 import XrayServerV2
-    
-    start_time = time.time()
-    task_id = self.request.id
-    server = None
-    
-    try:
-        server = Server.objects.get(id=server_id)
-        
-        if not isinstance(server.get_real_instance(), XrayServerV2):
-            error_message = f"Server {server.name} is not an Xray server"
-            logger.error(error_message)
-            create_task_log(task_id, "sync_xray_users", "Wrong server type", 'FAILURE', server=server, message=error_message, execution_time=time.time() - start_time)
-            return {"error": error_message}
-        
-        create_task_log(task_id, "sync_xray_users", f"Starting user sync for {server.name}", 'STARTED', server=server)
-        logger.info(f"Starting user sync for Xray server {server.name}")
-        
-        # Don't call sync_users() which would create another task - directly perform the sync
-        from vpn.models import User
-        from vpn.models_xray import UserSubscription
-        
-        # Get all users who should have access to this server
-        users_to_sync = User.objects.filter(
-            xray_subscriptions__active=True,
-            xray_subscriptions__subscription_group__is_active=True
-        ).distinct()
-        
-        real_server = server.get_real_instance()
-        
-        added_count = 0
-        failed_count = 0
-        for user in users_to_sync:
-            try:
-                if real_server.add_user(user):
-                    added_count += 1
-            except Exception as e:
-                failed_count += 1
-                logger.error(f"Failed to sync user {user.username} on server {server.name}: {e}")
-        
-        user_result = {"users_added": added_count, "total_users": users_to_sync.count(), "failed": failed_count}
-        
-        success_message = f"Successfully synced {user_result.get('users_added', 0)} users for {server.name}"
-        logger.info(f"{success_message}. Result: {user_result}")
-        
-        create_task_log(task_id, "sync_xray_users", "User sync completed", 'SUCCESS', server=server, message=f"{success_message}. Result: {user_result}", execution_time=time.time() - start_time)
-        
-        return user_result
-        
-    except Server.DoesNotExist:
-        error_message = f"Server with id {server_id} not found"
-        logger.error(error_message)
-        create_task_log(task_id, "sync_xray_users", "Server not found", 'FAILURE', message=error_message, execution_time=time.time() - start_time)
-        return {"error": error_message}
-    except Exception as e:
-        error_message = f"Error syncing users for {server.name if server else server_id}: {e}"
-        logger.error(error_message)
-        
-        if self.request.retries < 3:
-            retry_message = f"Retrying user sync for {server.name if server else server_id} (attempt {self.request.retries + 1})"
-            logger.info(retry_message)
-            create_task_log(task_id, "sync_xray_users", "Retrying user sync", 'RETRY', server=server, message=retry_message)
-            raise self.retry(countdown=30)
-        
-        create_task_log(task_id, "sync_xray_users", "User sync failed after retries", 'FAILURE', server=server, message=error_message, execution_time=time.time() - start_time)
-        return {"error": error_message}
-
-class TaskFailedException(Exception):
-    def __init__(self, message=""):
-        self.message = message
-        super().__init__(f"{self.message}")
-
-
-@shared_task(name="sync_all_servers", bind=True, autoretry_for=(Exception,), retry_kwargs={'max_retries': 3, 'countdown': 60})
-def sync_all_users(self):
-    from vpn.server_plugins import Server
-    
-    start_time = time.time()
-    task_id = self.request.id
-    
-    create_task_log(task_id, "sync_all_servers", "Starting sync all servers", 'STARTED')
-    
-    try:
-        servers = Server.objects.all()
-        
-        if not servers.exists():
-            message = "No servers found for synchronization"
-            logger.warning(message)
-            create_task_log(task_id, "sync_all_servers", "No servers to sync", 'SUCCESS', message=message, execution_time=time.time() - start_time)
-            return message
-        
-        # Filter out servers that might not exist anymore
-        valid_servers = []
-        for server in servers:
-            try:
-                # Test basic server access
-                server.get_server_status()
-                valid_servers.append(server)
-            except Exception as e:
-                logger.warning(f"Skipping server {server.name} (ID: {server.id}) due to connection issues: {e}")
-                create_task_log(task_id, "sync_all_servers", f"Skipped server {server.name}", 'STARTED', server=server, message=f"Connection failed: {e}")
-        
-        # Log all servers that will be synced
-        server_list = ", ".join([s.name for s in valid_servers])
-        if valid_servers:
-            create_task_log(task_id, "sync_all_servers", f"Found {len(valid_servers)} valid servers", 'STARTED', message=f"Servers: {server_list}")
-            
-            tasks = group(sync_users.s(server.id) for server in valid_servers)
-            result = tasks.apply_async()
-            
-            success_message = f"Initiated sync for {len(valid_servers)} servers: {server_list}"
-        else:
-            success_message = "No valid servers found for synchronization"
-        
-        create_task_log(task_id, "sync_all_servers", "Sync initiated", 'SUCCESS', message=success_message, execution_time=time.time() - start_time)
-        
-        return success_message
-        
-    except Exception as e:
-        error_message = f"Error initiating sync: {e}"
-        logger.error(error_message)
-        create_task_log(task_id, "sync_all_servers", "Sync failed", 'FAILURE', message=error_message, execution_time=time.time() - start_time)
-        raise
-
-@shared_task(name="sync_all_users_on_server", bind=True, autoretry_for=(Exception,), retry_kwargs={'max_retries': 3, 'countdown': 60})
-def sync_users(self, server_id):
-    from vpn.server_plugins import Server
-    
-    start_time = time.time()
-    task_id = self.request.id
-    server = None
-    
-    try:
-        try:
-            server = Server.objects.get(id=server_id)
-        except Server.DoesNotExist:
-            error_message = f"Server with id {server_id} not found - may have been deleted"
-            logger.warning(error_message)
-            create_task_log(task_id, "sync_all_users_on_server", "Server not found", 'SUCCESS', message=error_message, execution_time=time.time() - start_time)
-            return error_message  # Don't raise exception for deleted servers
-        
-        # Test server connectivity before proceeding
-        try:
-            server.get_server_status()
-        except Exception as e:
-            error_message = f"Server {server.name} is not accessible: {e}"
-            logger.warning(error_message)
-            create_task_log(task_id, "sync_all_users_on_server", "Server not accessible", 'FAILURE', server=server, message=error_message, execution_time=time.time() - start_time)
-            return error_message  # Don't retry for connectivity issues
-        
-        create_task_log(task_id, "sync_all_users_on_server", f"Starting user sync for server {server.name}", 'STARTED', server=server)
-        logger.info(f"Starting user sync for server {server.name}")
-        
-        # Get all users for this server
-        from .models import ACL
-        acls = ACL.objects.filter(server=server).select_related('user')
-        user_count = acls.count()
-        user_list = ", ".join([acl.user.username for acl in acls[:10]])  # First 10 users
-        if user_count > 10:
-            user_list += f" and {user_count - 10} more"
-        
-        create_task_log(task_id, "sync_all_users_on_server", f"Found {user_count} users to sync", 'STARTED', server=server, message=f"Users: {user_list}")
-        
-        # For Xray servers, use the sync_server_users task to avoid recursion
-        from vpn.server_plugins.xray_v2 import XrayServerV2
-        if isinstance(server.get_real_instance(), XrayServerV2):
-            logger.info(f"Using XrayServerV2 sync for server {server.name}")
-            # Call sync_server_users directly to perform the actual sync
-            # Avoid calling server.sync_users() which would create another task
-            from vpn.models import User
-            from vpn.models_xray import UserSubscription
-            
-            # Get all users who should have access to this server
-            users_to_sync = User.objects.filter(
-                xray_subscriptions__active=True,
-                xray_subscriptions__subscription_group__is_active=True
-            ).distinct()
-            
-            added_count = 0
-            failed_count = 0
-            for user in users_to_sync:
-                try:
-                    if server.add_user(user):
-                        added_count += 1
-                except Exception as e:
-                    failed_count += 1
-                    logger.error(f"Failed to sync user {user.username} on server {server.name}: {e}")
-            
-            sync_result = {"users_added": added_count, "total_users": users_to_sync.count(), "failed": failed_count}
-            logger.info(f"Directly synced {added_count} users for Xray server {server.name}")
-        else:
-            # For non-Xray servers, sync users directly (non-Xray servers should not create tasks)
-            real_server = server.get_real_instance()
-            sync_result = real_server.sync_users()
-        
-        # Check if sync was successful (can be boolean or dict/string)
-        sync_successful = bool(sync_result) and (
-            sync_result is not False and 
-            (isinstance(sync_result, str) and "failed" not in sync_result.lower()) or
-            isinstance(sync_result, dict) or 
-            sync_result is True
-        )
-        
-        if sync_successful:
-            success_message = f"Successfully synced {user_count} users for server {server.name}"
-            if isinstance(sync_result, (str, dict)):
-                success_message += f". Details: {sync_result}"
-            logger.info(success_message)
-            create_task_log(task_id, "sync_all_users_on_server", "User sync completed", 'SUCCESS', server=server, message=success_message, execution_time=time.time() - start_time)
-            return success_message
-        else:
-            error_message = f"Sync failed for server {server.name}. Result: {sync_result}"
-            create_task_log(task_id, "sync_all_users_on_server", "User sync failed", 'FAILURE', server=server, message=error_message, execution_time=time.time() - start_time)
-            raise TaskFailedException(error_message)
-    
-    except TaskFailedException:
-        # Don't retry TaskFailedException
-        raise
-    except Exception as e:
-        error_message = f"Error syncing users for server {server.name if server else server_id}: {e}"
-        logger.error(error_message)
-        
-        if self.request.retries < 3:
-            retry_message = f"Retrying sync for server {server.name if server else server_id} (attempt {self.request.retries + 1})"
-            logger.info(retry_message)
-            create_task_log(task_id, "sync_all_users_on_server", "Retrying user sync", 'RETRY', server=server, message=retry_message)
-            raise self.retry(countdown=60)
-        
-        create_task_log(task_id, "sync_all_users_on_server", "User sync failed after retries", 'FAILURE', server=server, message=error_message, execution_time=time.time() - start_time)
-        raise TaskFailedException(error_message)
-
-@shared_task(name="sync_server_info", bind=True, autoretry_for=(Exception,), retry_kwargs={'max_retries': 3, 'countdown': 30})
-def sync_server(self, id):
-    from vpn.server_plugins import Server
-    
-    start_time = time.time()
-    task_id = self.request.id
-    server = None
-    
-    try:
-        server = Server.objects.get(id=id)
-        
-        create_task_log(task_id, "sync_server_info", f"Starting server info sync for {server.name}", 'STARTED', server=server)
-        logger.info(f"Starting server info sync for {server.name}")
-        
-        sync_result = server.sync()
-        
-        success_message = f"Successfully synced server info for {server.name}"
-        result_details = f"Sync result: {sync_result}"
-        logger.info(f"{success_message}. {result_details}")
-        
-        create_task_log(task_id, "sync_server_info", "Server info synced", 'SUCCESS', server=server, message=f"{success_message}. {result_details}", execution_time=time.time() - start_time)
-        
-        return {"status": sync_result, "server": server.name}
-        
-    except Server.DoesNotExist:
-        error_message = f"Server with id {id} not found"
-        logger.error(error_message)
-        create_task_log(task_id, "sync_server_info", "Server not found", 'FAILURE', message=error_message, execution_time=time.time() - start_time)
-        return {"error": error_message}
-    except Exception as e:
-        error_message = f"Error syncing server info for {server.name if server else id}: {e}"
-        logger.error(error_message)
-        
-        if self.request.retries < 3:
-            retry_message = f"Retrying server sync for {server.name if server else id} (attempt {self.request.retries + 1})"
-            logger.info(retry_message)
-            create_task_log(task_id, "sync_server_info", "Retrying server sync", 'RETRY', server=server, message=retry_message)
-            raise self.retry(countdown=30)
-        
-        create_task_log(task_id, "sync_server_info", "Server sync failed after retries", 'FAILURE', server=server, message=error_message, execution_time=time.time() - start_time)
-        return {"error": error_message}
-
-@shared_task(name="update_user_statistics", bind=True, autoretry_for=(Exception,), retry_kwargs={'max_retries': 3, 'countdown': 60})
-def update_user_statistics(self):
-    """Update cached user statistics from AccessLog data"""
-    from .models import User, AccessLog, UserStatistics, ACLLink
-    from django.utils import timezone
-    from datetime import timedelta
-    from django.db.models import Count, Q
-    from django.db import transaction
-    
-    start_time = time.time()
-    task_id = self.request.id
-    
-    create_task_log(task_id, "update_user_statistics", "Starting statistics update", 'STARTED')
-    
-    try:
-        now = timezone.now()
-        thirty_days_ago = now - timedelta(days=30)
-        
-        # Get all users with ACL links
-        users_with_links = User.objects.filter(acl__isnull=False).distinct()
-        total_users = users_with_links.count()
-        
-        create_task_log(task_id, "update_user_statistics", f"Found {total_users} users to process", 'STARTED')
-        logger.info(f"Updating statistics for {total_users} users")
-        
-        updated_count = 0
-        
-        with transaction.atomic():
-            for user in users_with_links:
-                logger.debug(f"Processing user {user.username}")
-                
-                # Get all ACL links for this user
-                acl_links = ACLLink.objects.filter(acl__user=user).select_related('acl__server')
-                
-                for link in acl_links:
-                    server_name = link.acl.server.name
-                    
-                    # Calculate total connections for this specific link (all time)
-                    total_connections = AccessLog.objects.filter(
-                        user=user.username,
-                        server=server_name,
-                        acl_link_id=link.link,
-                        action='Success'
-                    ).count()
-                    
-                    # Calculate recent connections (last 30 days)
-                    recent_connections = AccessLog.objects.filter(
-                        user=user.username,
-                        server=server_name,
-                        acl_link_id=link.link,
-                        action='Success',
-                        timestamp__gte=thirty_days_ago
-                    ).count()
-                    
-                    # Generate daily usage data for the last 30 days
-                    daily_usage = []
-                    max_daily = 0
-                    
-                    for i in range(30):
-                        day_start = (now - timedelta(days=29-i)).replace(hour=0, minute=0, second=0, microsecond=0)
-                        day_end = day_start + timedelta(days=1)
-                        
-                        day_connections = AccessLog.objects.filter(
-                            user=user.username,
-                            server=server_name,
-                            acl_link_id=link.link,
-                            action='Success',
-                            timestamp__gte=day_start,
-                            timestamp__lt=day_end
-                        ).count()
-                        
-                        daily_usage.append(day_connections)
-                        max_daily = max(max_daily, day_connections)
-                    
-                    # Update or create statistics for this link
-                    stats, created = UserStatistics.objects.update_or_create(
-                        user=user,
-                        server_name=server_name,
-                        acl_link_id=link.link,
-                        defaults={
-                            'total_connections': total_connections,
-                            'recent_connections': recent_connections,
-                            'daily_usage': daily_usage,
-                            'max_daily': max_daily,
-                        }
-                    )
-                    
-                    action = "created" if created else "updated"
-                    logger.debug(f"{action} stats for {user.username} on {server_name} (link: {link.link}): {total_connections} total, {recent_connections} recent")
-                    
-                    updated_count += 1
-                
-                logger.debug(f"Completed processing user {user.username}")
-        
-        success_message = f"Successfully updated statistics for {updated_count} user-server-link combinations"
-        logger.info(success_message)
-        
-        create_task_log(
-            task_id, 
-            "update_user_statistics", 
-            "Statistics update completed", 
-            'SUCCESS', 
-            message=success_message, 
-            execution_time=time.time() - start_time
-        )
-        
-        return success_message
-        
-    except Exception as e:
-        error_message = f"Error updating user statistics: {e}"
-        logger.error(error_message, exc_info=True)
-        
-        if self.request.retries < 3:
-            retry_message = f"Retrying statistics update (attempt {self.request.retries + 1})"
-            logger.info(retry_message)
-            create_task_log(task_id, "update_user_statistics", "Retrying statistics update", 'RETRY', message=retry_message)
-            raise self.retry(countdown=60)
-        
-        create_task_log(
-            task_id, 
-            "update_user_statistics", 
-            "Statistics update failed after retries", 
-            'FAILURE', 
-            message=error_message, 
-            execution_time=time.time() - start_time
-        )
-        raise
-
-@shared_task(name="sync_user_on_server", bind=True, autoretry_for=(Exception,), retry_kwargs={'max_retries': 5, 'countdown': 30})
-def sync_user(self, user_id, server_id):
-    from .models import User, ACL
-    from vpn.server_plugins import Server
-    
-    start_time = time.time()
-    task_id = self.request.id
-    errors = {}
-    result = {}
-    user = None
-    server = None
-    
-    try:
-        user = User.objects.get(id=user_id)
-        server = Server.objects.get(id=server_id)
-        
-        create_task_log(task_id, "sync_user_on_server", f"Starting user sync for {user.username} on {server.name}", 'STARTED', server=server, user=user)
-        logger.info(f"Syncing user {user.username} on server {server.name}")
-        
-        # Check if ACL exists
-        acl_exists = ACL.objects.filter(user=user, server=server).exists()
-        
-        if acl_exists:
-            # User should exist on server
-            action_message = f"Adding/updating user {user.username} on server {server.name}"
-            create_task_log(task_id, "sync_user_on_server", action_message, 'STARTED', server=server, user=user)
-            
-            result[server.name] = server.add_user(user)
-            
-            success_message = f"Successfully added/updated user {user.username} on server {server.name}"
-            logger.info(success_message)
-            create_task_log(task_id, "sync_user_on_server", "User added/updated", 'SUCCESS', server=server, user=user, message=f"{success_message}. Result: {result[server.name]}", execution_time=time.time() - start_time)
-        else:
-            # User should be removed from server
-            action_message = f"Removing user {user.username} from server {server.name}"
-            create_task_log(task_id, "sync_user_on_server", action_message, 'STARTED', server=server, user=user)
-            
-            result[server.name] = server.delete_user(user)
-            
-            success_message = f"Successfully removed user {user.username} from server {server.name}"
-            logger.info(success_message)
-            create_task_log(task_id, "sync_user_on_server", "User removed", 'SUCCESS', server=server, user=user, message=f"{success_message}. Result: {result[server.name]}", execution_time=time.time() - start_time)
-            
-    except User.DoesNotExist:
-        error_msg = f"User with id {user_id} not found"
-        logger.error(error_msg)
-        errors["user"] = error_msg
-        create_task_log(task_id, "sync_user_on_server", "User not found", 'FAILURE', message=error_msg, execution_time=time.time() - start_time)
-    except Server.DoesNotExist:
-        error_msg = f"Server with id {server_id} not found"
-        logger.error(error_msg)
-        errors["server"] = error_msg
-        create_task_log(task_id, "sync_user_on_server", "Server not found", 'FAILURE', message=error_msg, execution_time=time.time() - start_time)
-    except Exception as e:
-        error_msg = f"Error syncing user {user.username if user else user_id} on server {server.name if server else server_id}: {e}"
-        logger.error(error_msg)
-        errors[f"server_{server_id}"] = error_msg
-        
-        # Retry on failure unless it's a permanent error
-        if self.request.retries < 5:
-            retry_message = f"Retrying user sync for user {user.username if user else user_id} on server {server.name if server else server_id} (attempt {self.request.retries + 1})"
-            logger.info(retry_message)
-            create_task_log(task_id, "sync_user_on_server", "Retrying user sync", 'RETRY', server=server, user=user, message=retry_message)
-            raise self.retry(countdown=30)
-        
-        create_task_log(task_id, "sync_user_on_server", "User sync failed after retries", 'FAILURE', server=server, user=user, message=error_msg, execution_time=time.time() - start_time)
-    
-    if errors:
-        raise TaskFailedException(message=f"Errors during task: {errors}")
-    
-    return result
-
-
-@shared_task(name="sync_user_xray_access", bind=True)
-def sync_user_xray_access(self, user_id, server_id):
-    """
-    Sync user's Xray access based on subscription groups.
-    Creates inbounds on server if needed and adds user to them.
-    """
-    from .models import User, Server
-    from .models_xray import SubscriptionGroup, Inbound
-    from vpn.xray_api_v2.client import XrayClient
-    from vpn.server_plugins.xray_v2 import XrayServerV2
-    
-    start_time = time.time()
-    task_id = self.request.id
-    
-    try:
-        user = User.objects.get(id=user_id)
-        server = Server.objects.get(id=server_id)
-        
-        # Get server instance
-        real_server = server.get_real_instance()
-        if not isinstance(real_server, XrayServerV2):
-            raise ValueError(f"Server {server.name} is not an Xray v2 server")
-        
-        create_task_log(
-            task_id, "sync_user_xray_access", 
-            f"Starting Xray sync for {user.username} on {server.name}", 
-            'STARTED', server=server, user=user
-        )
-        
-        # Get user's active subscription groups
-        user_groups = SubscriptionGroup.objects.filter(
-            usersubscription__user=user,
-            usersubscription__active=True,
-            is_active=True
-        ).prefetch_related('inbounds')
-        
-        if not user_groups.exists():
-            logger.info(f"User {user.username} has no active subscriptions")
-            return {"status": "No active subscriptions"}
-        
-        # Collect all inbounds from user's groups
-        user_inbounds = Inbound.objects.filter(
-            subscriptiongroup__in=user_groups
-        ).distinct()
-        
-        logger.info(f"User {user.username} has access to {user_inbounds.count()} inbounds")
-        
-        # Connect to Xray server
-        client = XrayClient(real_server.api_address)
-        
-        # Get existing inbounds on server
-        try:
-            existing_result = client.execute_command('lsi')  # List inbounds
-            existing_inbounds = existing_result.get('inbounds', []) if existing_result else []
-            existing_tags = {ib.get('tag') for ib in existing_inbounds if ib.get('tag')}
-        except Exception as e:
-            logger.warning(f"Failed to list existing inbounds: {e}")
-            existing_tags = set()
-        
-        results = {
-            'inbounds_created': [],
-            'users_added': [],
-            'errors': []
-        }
-        
-        # Process each inbound
-        for inbound in user_inbounds:
-            try:
-                # Check if inbound exists on server
-                if inbound.name not in existing_tags:
-                    logger.info(f"Creating inbound {inbound.name} on server")
-                    
-                    # Build inbound configuration
-                    if not inbound.full_config:
-                        inbound.build_config()
-                        inbound.save()
-                    
-                    # Add inbound to server
-                    client.execute_command('adi', json_files=[inbound.full_config])
-                    results['inbounds_created'].append(inbound.name)
-                
-                # Add user to inbound
-                logger.info(f"Adding user {user.username} to inbound {inbound.name}")
-                
-                # Create user config based on protocol
-                import uuid
-                
-                # Generate user UUID based on username and inbound
-                user_uuid = str(uuid.uuid5(uuid.NAMESPACE_DNS, f"{user.username}-{inbound.name}"))
-                
-                if inbound.protocol == 'vless':
-                    user_config = {
-                        "email": f"{user.username}@{server.name}",
-                        "id": user_uuid,
-                        "level": 0
-                    }
-                elif inbound.protocol == 'vmess':
-                    user_config = {
-                        "email": f"{user.username}@{server.name}",
-                        "id": user_uuid,
-                        "level": 0,
-                        "alterId": 0
-                    }
-                elif inbound.protocol == 'trojan':
-                    user_config = {
-                        "email": f"{user.username}@{server.name}",
-                        "password": user_uuid,
-                        "level": 0
-                    }
-                else:
-                    logger.warning(f"Unsupported protocol: {inbound.protocol}")
-                    continue
-                
-                # Add user to inbound
-                add_request = {
-                    "inboundTag": inbound.name,
-                    "user": user_config
-                }
-                
-                client.execute_command('adu', json_files=[add_request])
-                results['users_added'].append(f"{user.username} -> {inbound.name}")
-                
-            except Exception as e:
-                error_msg = f"Error processing inbound {inbound.name}: {e}"
-                logger.error(error_msg)
-                results['errors'].append(error_msg)
-        
-        # Log results
-        success_msg = (
-            f"Xray sync completed for {user.username}: "
-            f"Created {len(results['inbounds_created'])} inbounds, "
-            f"Added user to {len(results['users_added'])} inbounds"
-        )
-        
-        create_task_log(
-            task_id, "sync_user_xray_access", 
-            "Xray sync completed", 'SUCCESS', 
-            server=server, user=user, 
-            message=success_msg,
-            execution_time=time.time() - start_time
-        )
-        
-        return results
-        
-    except Exception as e:
-        error_msg = f"Error in Xray sync: {e}"
-        logger.error(error_msg, exc_info=True)
-        
-        create_task_log(
-            task_id, "sync_user_xray_access", 
-            "Xray sync failed", 'FAILURE', 
-            message=error_msg,
-            execution_time=time.time() - start_time
-        )
-        
-        raise
-
-
-@shared_task(name="sync_server_users", bind=True)
-def sync_server_users(self, server_id):
-    """
-    Sync all users for a specific Xray server.
-    This is called by XrayServerV2.sync_users()
-    """
-    from vpn.server_plugins import Server
-    from vpn.models import User, ACL
-    from vpn.models_xray import UserSubscription
-    
-    start_time = datetime.now()
-    task_id = self.request.id
-    
-    try:
-        server = Server.objects.get(id=server_id)
-        real_server = server.get_real_instance()
-        
-        # Create initial log entry
-        create_task_log(
-            task_id=task_id,
-            task_name='sync_server_users',
-            action=f'Starting user sync for server {server.name}',
-            status='STARTED',
-            server=server
-        )
-        
-        # Get all users who should have access to this server
-        # For Xray v2, users access through subscription groups
-        users_to_sync = User.objects.filter(
-            xray_subscriptions__active=True,
-            xray_subscriptions__subscription_group__is_active=True
-        ).distinct()
-        
-        logger.info(f"Syncing {users_to_sync.count()} users for Xray server {server.name}")
-        
-        added_count = 0
-        failed_count = 0
-        for user in users_to_sync:
-            try:
-                if real_server.add_user(user):
-                    added_count += 1
-            except Exception as e:
-                failed_count += 1
-                logger.error(f"Failed to sync user {user.username} on server {server.name}: {e}")
-        
-        # Calculate execution time
-        execution_time = (datetime.now() - start_time).total_seconds()
-        
-        # Create success log
-        create_task_log(
-            task_id=task_id,
-            task_name='sync_server_users',
-            action=f'Completed user sync for server {server.name}',
-            status='SUCCESS',
-            server=server,
-            message=f'Synced {added_count} of {users_to_sync.count()} users. Failed: {failed_count}',
-            execution_time=execution_time
-        )
-        
-        logger.info(f"Successfully synced {added_count} users for server {server.name}")
-        return {"users_added": added_count, "total_users": users_to_sync.count(), "failed": failed_count}
-        
-    except Exception as e:
-        # Calculate execution time
-        execution_time = (datetime.now() - start_time).total_seconds()
-        
-        # Create failure log
-        create_task_log(
-            task_id=task_id,
-            task_name='sync_server_users',
-            action=f'Failed to sync users for server {server_id}',
-            status='FAILURE',
-            message=str(e),
-            execution_time=execution_time
-        )
-        
-        logger.error(f"Error syncing users for server {server_id}: {e}")
-        raise
-
-
-@shared_task(name="sync_server_inbounds", bind=True)
-def sync_server_inbounds(self, server_id, auto_sync_users=True):
-    """
-    Sync all inbounds for a specific Xray server.
-    This is called by XrayServerV2.sync_inbounds()
-    """
-    from vpn.server_plugins import Server
-    from vpn.models_xray import SubscriptionGroup, ServerInbound, UserSubscription
-    
-    try:
-        server = Server.objects.get(id=server_id)
-        real_server = server.get_real_instance()
-        
-        # Get all subscription groups
-        groups = SubscriptionGroup.objects.filter(is_active=True).prefetch_related('inbounds')
-        
-        deployed_count = 0
-        for group in groups:
-            for inbound in group.inbounds.all():
-                try:
-                    # Get users for this inbound
-                    users_with_access = []
-                    group_users = [
-                        sub.user for sub in 
-                        UserSubscription.objects.filter(
-                            subscription_group=group,
-                            active=True
-                        ).select_related('user')
-                    ]
-                    users_with_access.extend(group_users)
-                    
-                    # Remove duplicates
-                    users_with_access = list(set(users_with_access))
-                    
-                    # Deploy inbound with users
-                    if real_server.deploy_inbound(inbound, users=users_with_access):
-                        deployed_count += 1
-                        
-                        # Mark as deployed
-                        ServerInbound.objects.update_or_create(
-                            server=server,
-                            inbound=inbound,
-                            defaults={'active': True}
-                        )
-                        
-                        logger.info(f"Deployed inbound {inbound.name} with {len(users_with_access)} users on server {server.name}")
-                    else:
-                        logger.error(f"Failed to deploy inbound {inbound.name} on server {server.name}")
-                except Exception as e:
-                    logger.error(f"Failed to deploy inbound {inbound.name} on server {server.name}: {e}")
-        
-        logger.info(f"Successfully deployed {deployed_count} inbounds on server {server.name}")
-        
-        # Don't automatically sync users to avoid loops
-        # Users are already added when deploying inbounds
-        logger.info(f"Inbound sync completed for server {server.name}, users were already synced during deployment")
-        
-        return {"inbounds_deployed": deployed_count, "auto_sync_users": auto_sync_users}
-        
-    except Exception as e:
-        logger.error(f"Error syncing inbounds for server {server_id}: {e}")
-        raise
-
-
-@shared_task(name="deploy_inbound_on_server", bind=True)
-def deploy_inbound_on_server(self, server_id, inbound_id):
-    """
-    Deploy a specific inbound on a specific server
-    """
-    from vpn.server_plugins import Server
-    from vpn.models_xray import Inbound
-    
-    try:
-        server = Server.objects.get(id=server_id)
-        real_server = server.get_real_instance()
-        inbound = Inbound.objects.get(id=inbound_id)
-        
-        logger.info(f"Deploying inbound {inbound.name} on server {server.name}")
-        
-        # Get all users that should have access to this inbound
-        from vpn.models_xray import UserSubscription
-        users_with_access = []
-        
-        # Find users through subscription groups
-        for group in inbound.subscriptiongroup_set.filter(is_active=True):
-            group_users = [
-                sub.user for sub in 
-                UserSubscription.objects.filter(
-                    subscription_group=group,
-                    active=True
-                ).select_related('user')
-            ]
-            users_with_access.extend(group_users)
-        
-        # Remove duplicates
-        users_with_access = list(set(users_with_access))
-        
-        logger.info(f"Deploying inbound {inbound.name} with {len(users_with_access)} users")
-        
-        # Deploy inbound with users
-        if real_server.deploy_inbound(inbound, users=users_with_access):
-            # Mark as deployed
-            from vpn.models_xray import ServerInbound
-            ServerInbound.objects.update_or_create(
-                server=server,
-                inbound=inbound,
-                defaults={'active': True}
-            )
-            logger.info(f"Successfully deployed inbound {inbound.name} on server {server.name}")
-            return {"success": True, "inbound": inbound.name, "server": server.name, "users": len(users_with_access)}
-        else:
-            logger.error(f"Failed to deploy inbound {inbound.name} on server {server.name}")
-            return {"success": False, "inbound": inbound.name, "server": server.name, "error": "Deployment failed"}
-            
-    except Exception as e:
-        logger.error(f"Error deploying inbound {inbound_id} on server {server_id}: {e}")
-        return {"success": False, "error": str(e)}
-
-
-@shared_task(name="remove_inbound_from_server", bind=True)
-def remove_inbound_from_server(self, server_id, inbound_name):
-    """
-    Remove a specific inbound from a specific server
-    """
-    from vpn.server_plugins import Server
-    from vpn.xray_api_v2.client import XrayClient
-    
-    try:
-        server = Server.objects.get(id=server_id)
-        real_server = server.get_real_instance()
-        
-        logger.info(f"Removing inbound {inbound_name} from server {server.name}")
-        
-        # Remove inbound using Xray API
-        client = XrayClient(server=real_server.api_address)
-        result = client.remove_inbound(inbound_name)
-        
-        # Remove from ServerInbound tracking
-        from vpn.models_xray import ServerInbound, Inbound
-        try:
-            inbound = Inbound.objects.get(name=inbound_name)
-            ServerInbound.objects.filter(server=server, inbound=inbound).delete()
-        except Inbound.DoesNotExist:
-            pass  # Inbound was already deleted from Django
-        
-        logger.info(f"Successfully removed inbound {inbound_name} from server {server.name}")
-        return {"success": True, "inbound": inbound_name, "server": server.name}
-        
-    except Exception as e:
-        logger.error(f"Error removing inbound {inbound_name} from server {server_id}: {e}")
-        return {"success": False, "error": str(e)}
-
-
-@shared_task(name="remove_user_from_server", bind=True)
-def remove_user_from_server(self, server_id, user_id):
-    """
-    Remove a specific user from a specific server
-    """
-    from vpn.server_plugins import Server
-    from vpn.models import User
-    
-    try:
-        server = Server.objects.get(id=server_id)
-        real_server = server.get_real_instance()
-        user = User.objects.get(id=user_id)
-        
-        logger.info(f"Removing user {user.username} from server {server.name}")
-        
-        result = real_server.delete_user(user)
-        
-        if result:
-            logger.info(f"Successfully removed user {user.username} from server {server.name}")
-            return {"success": True, "user": user.username, "server": server.name}
-        else:
-            logger.warning(f"Failed to remove user {user.username} from server {server.name}")
-            return {"success": False, "user": user.username, "server": server.name, "error": "Removal failed"}
-            
-    except Exception as e:
-        logger.error(f"Error removing user {user_id} from server {server_id}: {e}")
-        return {"success": False, "error": str(e)}
-
-
-@shared_task(name="generate_certificate_task", bind=True)
-def generate_certificate_task(self, certificate_id):
-    """
-    Generate Let's Encrypt certificate for a domain
-    """
-    from .models_xray import Certificate
-    from vpn.letsencrypt.letsencrypt_dns import get_certificate_for_domain
-    from django.utils import timezone
-    from datetime import timedelta
-    
-    start_time = time.time()
-    task_id = self.request.id
-    
-    try:
-        cert = Certificate.objects.get(id=certificate_id)
-        
-        create_task_log(
-            task_id, "generate_certificate_task", 
-            f"Starting certificate generation for {cert.domain}", 
-            'STARTED'
-        )
-        
-        # Check if we have credentials
-        if not cert.credentials:
-            raise ValueError(f"No credentials configured for {cert.domain}")
-        
-        # Get Cloudflare token from credentials
-        cf_token = cert.credentials.get_credential('api_token')
-        if not cf_token:
-            raise ValueError(f"No Cloudflare API token found for {cert.domain}")
-        
-        logger.info(f"Generating certificate for {cert.domain} using email {cert.acme_email}")
-        
-        # Request certificate using the library function
-        cert_pem, key_pem = get_certificate_for_domain(
-            domain=cert.domain,
-            email=cert.acme_email,
-            cloudflare_token=cf_token,
-            staging=False  # Production certificate
-        )
-        
-        # Update certificate object
-        cert.certificate_pem = cert_pem
-        cert.private_key_pem = key_pem
-        cert.expires_at = timezone.now() + timedelta(days=90)  # Let's Encrypt certs are valid for 90 days
-        cert.last_renewed = timezone.now()
-        cert.save()
-        
-        success_msg = f"Certificate for {cert.domain} generated successfully"
-        logger.info(success_msg)
-        
-        create_task_log(
-            task_id, "generate_certificate_task", 
-            "Certificate generated", 'SUCCESS', 
-            message=success_msg,
-            execution_time=time.time() - start_time
-        )
-        
-        return {"status": "success", "domain": cert.domain}
-        
-    except Certificate.DoesNotExist:
-        error_msg = f"Certificate with id {certificate_id} not found"
-        logger.error(error_msg)
-        
-        create_task_log(
-            task_id, "generate_certificate_task", 
-            "Certificate not found", 'FAILURE', 
-            message=error_msg,
-            execution_time=time.time() - start_time
-        )
-        raise
-        
-    except Exception as e:
-        error_msg = f"Failed to generate certificate: {e}"
-        logger.error(error_msg, exc_info=True)
-        
-        create_task_log(
-            task_id, "generate_certificate_task", 
-            "Certificate generation failed", 'FAILURE', 
-            message=error_msg,
-            execution_time=time.time() - start_time
-        )
-        raise
-
-
-@shared_task(name="renew_certificates", bind=True)
-def renew_certificates(self):
-    """
-    Check and renew certificates that are about to expire.
-    """
-    from .models_xray import Certificate
-    from .letsencrypt import get_certificate_for_domain
-    from datetime import datetime
-    
-    start_time = time.time()
-    task_id = self.request.id
-    
-    create_task_log(task_id, "renew_certificates", "Starting certificate renewal check", 'STARTED')
-    
-    try:
-        # Get certificates that need renewal
-        certs_to_renew = Certificate.objects.filter(
-            auto_renew=True,
-            cert_type='letsencrypt'
-        )
-        
-        renewed_count = 0
-        errors = []
-        
-        for cert in certs_to_renew:
-            if not cert.needs_renewal:
-                continue
-                
-            try:
-                logger.info(f"Renewing certificate for {cert.domain}")
-                
-                # Check if we have credentials
-                if not cert.credentials:
-                    logger.warning(f"No credentials configured for {cert.domain}")
-                    continue
-                
-                # Get Cloudflare token from credentials
-                cf_token = cert.credentials.get_credential('api_token')
-                cf_email = cert.credentials.get_credential('email', 'admin@example.com')
-                
-                if not cf_token:
-                    logger.error(f"No Cloudflare API token found for {cert.domain}")
-                    continue
-                
-                # Renew certificate
-                cert_pem, key_pem = get_certificate_for_domain(
-                    domain=cert.domain,
-                    email=cf_email,
-                    cloudflare_token=cf_token,
-                    staging=False  # Production certificate
-                )
-                
-                # Update certificate
-                cert.certificate_pem = cert_pem
-                cert.private_key_pem = key_pem
-                cert.last_renewed = datetime.now()
-                cert.expires_at = datetime.now() + timedelta(days=90)  # Let's Encrypt certs are valid for 90 days
-                cert.save()
-                
-                renewed_count += 1
-                logger.info(f"Successfully renewed certificate for {cert.domain}")
-                
-            except Exception as e:
-                error_msg = f"Failed to renew certificate for {cert.domain}: {e}"
-                logger.error(error_msg)
-                errors.append(error_msg)
-        
-        # Summary
-        if renewed_count > 0 or errors:
-            summary = f"Renewed {renewed_count} certificates"
-            if errors:
-                summary += f", {len(errors)} errors"
-            
-            create_task_log(
-                task_id, "renew_certificates", 
-                "Certificate renewal completed", 
-                'SUCCESS' if not errors else 'PARTIAL', 
-                message=summary,
-                execution_time=time.time() - start_time
-            )
-        else:
-            create_task_log(
-                task_id, "renew_certificates", 
-                "No certificates need renewal", 
-                'SUCCESS',
-                execution_time=time.time() - start_time
-            )
-        
-        return {
-            'renewed': renewed_count,
-            'errors': errors
-        }
-        
-    except Exception as e:
-        error_msg = f"Certificate renewal task failed: {e}"
-        logger.error(error_msg, exc_info=True)
-        
-        create_task_log(
-            task_id, "renew_certificates", 
-            "Certificate renewal failed", 
-            'FAILURE', 
-            message=error_msg,
-            execution_time=time.time() - start_time
-        )
-        
-        raise
\ No newline at end of file
diff --git a/vpn/templates/admin/base_site.html b/vpn/templates/admin/base_site.html
deleted file mode 100644
index df1d8dd..0000000
--- a/vpn/templates/admin/base_site.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "admin/base.html" %}
-
-{% block title %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
-
-{% block branding %}
-<h1 id="site-name"><a href="{% url 'admin:index' %}">{{ site_header|default:_('Django administration') }}</a></h1>
-{% endblock %}
-
-{% block footer %}
-<div id="footer" style="margin-top: 20px; padding: 10px; border-top: 1px solid #ccc; font-size: 12px; color: #666;">
-    <div style="display: flex; justify-content: space-between; align-items: center;">
-        <div>
-            <strong>OutFleet VPN Manager</strong>
-        </div>
-        <div style="text-align: right;">
-            {% if VERSION_INFO %}
-                <div>
-                    <strong>Version:</strong> 
-                    <code>{{ VERSION_INFO.git_commit_short }}</code>
-                    {% if VERSION_INFO.is_development %}
-                        <span style="color: #e74c3c;">(Development)</span>
-                    {% endif %}
-                </div>
-                {% if not VERSION_INFO.is_development %}
-                    <div style="margin-top: 2px;">
-                        <strong>Built:</strong> {{ VERSION_INFO.build_date }}
-                    </div>
-                    <div style="margin-top: 2px;">
-                        <strong>Commit:</strong> 
-                        <code style="font-size: 10px;">{{ VERSION_INFO.git_commit }}</code>
-                    </div>
-                {% endif %}
-            {% endif %}
-        </div>
-    </div>
-</div>
-{% endblock %}
diff --git a/vpn/templates/admin/move_clients.html b/vpn/templates/admin/move_clients.html
deleted file mode 100644
index a49ffa3..0000000
--- a/vpn/templates/admin/move_clients.html
+++ /dev/null
@@ -1,499 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-
-{% block title %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
-
-{% block content %}
-<div class="content-main">
-    <h1>{{ title }}</h1>
-    
-    <div class="alert alert-info" style="margin: 10px 0; padding: 10px; border-radius: 4px; background-color: #d1ecf1; border: 1px solid #bee5eb; color: #0c5460;">
-        <strong>Note:</strong> This operation only affects the database and works even if servers are unreachable. 
-        Server connectivity is not required for moving links between servers.
-    </div>
-    
-    {% if messages %}
-        {% for message in messages %}
-            <div class="alert alert-{{ message.tags }}" style="margin: 10px 0; padding: 10px; border-radius: 4px; 
-                {% if message.tags == 'error' %}background-color: #f8d7da; border: 1px solid #f5c6cb; color: #721c24;
-                {% elif message.tags == 'success' %}background-color: #d4edda; border: 1px solid #c3e6cb; color: #155724;
-                {% elif message.tags == 'warning' %}background-color: #fff3cd; border: 1px solid #ffeaa7; color: #856404;
-                {% elif message.tags == 'info' %}background-color: #d1ecf1; border: 1px solid #bee5eb; color: #0c5460;
-                {% endif %}">
-                {{ message }}
-            </div>
-        {% endfor %}
-    {% endif %}
-
-    <form method="post" id="move-clients-form">
-        {% csrf_token %}
-        
-        <div class="form-row" style="margin-bottom: 20px;">
-            <div style="display: flex; gap: 20px;">
-                <div style="flex: 1;">
-                    <label for="source_server"><strong>Source Server:</strong></label>
-                    <select id="source_server" name="source_server" style="width: 100%; padding: 5px;" onchange="updateLinksList()">
-                        <option value="">-- Select Source Server --</option>
-                        {% for server in servers %}
-                            <option value="{{ server.id }}">{{ server.name }} ({{ server.server_type }})</option>
-                        {% endfor %}
-                    </select>
-                </div>
-                
-                <div style="flex: 1;">
-                    <label for="target_server"><strong>Target Server:</strong></label>
-                    <select id="target_server" name="target_server" style="width: 100%; padding: 5px;" onchange="updateSubmitButton()">
-                        <option value="">-- Select Target Server --</option>
-                        {% for server in all_servers %}
-                            <option value="{{ server.id }}">{{ server.name }} ({{ server.server_type }})</option>
-                        {% endfor %}
-                    </select>
-                </div>
-            </div>
-        </div>
-
-        <div id="links-list" style="margin-bottom: 20px;">
-            <h3>Select Client Links to Move:</h3>
-            <div id="links-container">
-                <p style="color: #666;">Please select a source server first.</p>
-            </div>
-        </div>
-
-        <div class="form-row" style="margin-bottom: 20px;">
-            <h3>Comment Transformation (Optional)</h3>
-            <div style="margin-bottom: 10px;">
-                <label for="comment_regex"><strong>Regular Expression Pattern:</strong></label>
-                <input type="text" id="comment_regex" name="comment_regex" 
-                       style="width: 100%; padding: 8px; font-family: monospace;" 
-                       placeholder="Example: ^(.*)$ -> [OLD_SERVER] $1"
-                       title="Use regex pattern -> replacement format">
-            </div>
-            
-            <div class="regex-help" style="background-color: #f8f9fa; padding: 10px; border-radius: 5px; border-left: 4px solid #007cba;">
-                <h4 style="margin: 0 0 10px 0; color: #007cba; font-size: 14px;">Regular Expression Help & Examples:</h4>
-                <div style="font-size: 13px;">
-                    <p style="margin: 0 0 8px 0;"><strong>Format:</strong> <code>pattern -> replacement</code></p>
-                    
-                    <div style="margin-bottom: 10px;">
-                        <h5 style="margin: 0 0 5px 0; font-size: 13px;">Common Examples:</h5>
-                        <ul style="margin: 0; padding-left: 15px; line-height: 1.4;">
-                            <li><code>^(.*)$ -> [FROM RU] $1</code> <small>- Add prefix to all comments</small></li>
-                            <li><code>^(.*)$ -> $1 (moved)</code> <small>- Add suffix to all comments</small></li>
-                            <li><code>^$ -> Default Device</code> <small>- Replace empty comments</small></li>
-                            <li><code>phone -> mobile</code> <small>- Replace specific word</small></li>
-                        </ul>
-                    </div>
-                    
-                    <div style="margin-bottom: 10px;">
-                        <h5 style="margin: 0 0 5px 0; font-size: 13px;">Advanced Examples:</h5>
-                        <ul style="margin: 0; padding-left: 15px; line-height: 1.4;">
-                            <li><code>^(.+) - (.+)$ -> $2: $1</code> <small>- Swap parts separated by " - "</small></li>
-                            <li><code>(\d{4})-(\d{2})-(\d{2}) -> $3/$2/$1</code> <small>- Change date format</small></li>
-                            <li><code>^(.{1,20}).*$ -> $1...</code> <small>- Truncate long comments</small></li>
-                        </ul>
-                    </div>
-                    
-                    <div style="padding: 8px; background-color: #fff3cd; border-radius: 3px; margin: 0;">
-                        <strong style="font-size: 12px;">Tips:</strong>
-                        <ul style="margin: 3px 0 0 0; padding-left: 15px; font-size: 12px; line-height: 1.3;">
-                            <li>Use <code>$1, $2, $3...</code> for captured groups (auto-converted to Python)</li>
-                            <li>Use <code>^</code> for start, <code>$</code> for end of string</li>
-                            <li>Preview shows result; leave empty to keep original comments</li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="submit-row">
-            <input type="submit" value="Move Selected Links" class="default" id="submit-btn" disabled>
-            <a href="{% url 'admin:vpn_server_changelist' %}" class="button cancel">Cancel</a>
-        </div>
-    </form>
-</div>
-
-<script>
-// Client links data for each server
-var linksByServer = {
-    {% for server, links in links_by_server.items %}
-        "{{ server.id }}": [
-            {% for link in links %}
-                {
-                    "id": {{ link.id }},
-                    "link": "{{ link.link|escapejs }}",
-                    "comment": "{{ link.comment|escapejs }}",
-                    "username": "{{ link.acl.user.username|escapejs }}",
-                    "user_comment": "{{ link.acl.user.comment|escapejs }}",
-                    "created_at": "{{ link.acl.created_at|date:'Y-m-d H:i' }}",
-                    "full_url": "{{ EXTERNAL_ADDRESS }}/ss/{{ link.link }}#{{ link.acl.server.name|escapejs }}"
-                },
-            {% endfor %}
-        ],
-    {% endfor %}
-};
-
-function updateLinksList() {
-    var sourceServerId = document.getElementById('source_server').value;
-    var linksContainer = document.getElementById('links-container');
-    var submitBtn = document.getElementById('submit-btn');
-    
-    if (!sourceServerId) {
-        linksContainer.innerHTML = '<p style="color: #666;">Please select a source server first.</p>';
-        submitBtn.disabled = true;
-        return;
-    }
-    
-    var links = linksByServer[sourceServerId] || [];
-    
-    if (links.length === 0) {
-        linksContainer.innerHTML = '<p style="color: #666;">No client links found for this server.</p>';
-        submitBtn.disabled = true;
-        return;
-    }
-    
-    // Group links by user for better organization
-    var linksByUser = {};
-    links.forEach(function(link) {
-        if (!linksByUser[link.username]) {
-            linksByUser[link.username] = {
-                user_comment: link.user_comment,
-                created_at: link.created_at,
-                links: []
-            };
-        }
-        linksByUser[link.username].links.push(link);
-    });
-    
-    var html = '<div style="max-height: 500px; overflow-y: auto; border: 1px solid #ddd; padding: 10px;">';
-    html += '<div style="margin-bottom: 10px;">';
-    html += '<button type="button" onclick="toggleAllLinks()" style="padding: 5px 10px; margin-right: 10px;">Select All</button>';
-    html += '<button type="button" onclick="toggleAllLinks(false)" style="padding: 5px 10px;">Deselect All</button>';
-    html += '</div>';
-    
-    html += '<table style="width: 100%; border-collapse: collapse;">';
-    html += '<thead><tr style="background-color: #f5f5f5;">';
-    html += '<th style="padding: 8px; border: 1px solid #ddd; width: 50px;">Select</th>';
-    html += '<th style="padding: 8px; border: 1px solid #ddd;">Username</th>';
-    html += '<th style="padding: 8px; border: 1px solid #ddd;">Link Comment</th>';
-    html += '<th style="padding: 8px; border: 1px solid #ddd;">Link ID</th>';
-    html += '<th style="padding: 8px; border: 1px solid #ddd;">User Comment</th>';
-    html += '<th style="padding: 8px; border: 1px solid #ddd;">Created</th>';
-    html += '</tr></thead><tbody>';
-    
-    // Sort users alphabetically
-    var sortedUsers = Object.keys(linksByUser).sort();
-    
-    sortedUsers.forEach(function(username) {
-        var userData = linksByUser[username];
-        var userLinks = userData.links;
-        
-        // Add user row header if user has multiple links
-        if (userLinks.length > 1) {
-            html += '<tr style="background-color: #f9f9f9;">';
-            html += '<td style="padding: 8px; border: 1px solid #ddd; text-align: center;">';
-            html += '<input type="checkbox" class="user-checkbox" data-username="' + username + '" onchange="toggleUserLinks(\'' + username + '\')">';
-            html += '</td>';
-            html += '<td colspan="5" style="padding: 8px; border: 1px solid #ddd;"><strong>' + username + '</strong> (' + userLinks.length + ' links)</td>';
-            html += '</tr>';
-        }
-        
-        // Add individual link rows
-        userLinks.forEach(function(link) {
-            html += '<tr class="link-row" data-username="' + username + '">';
-            html += '<td style="padding: 8px; border: 1px solid #ddd; text-align: center;">';
-            html += '<input type="checkbox" name="selected_links" value="' + link.id + '" class="link-checkbox" data-username="' + username + '" onchange="updateSubmitButton(); updateUserCheckbox(\'' + username + '\')">';
-            html += '</td>';
-            html += '<td style="padding: 8px; border: 1px solid #ddd;">' + (userLinks.length === 1 ? '<strong>' + username + '</strong>' : '↳') + '</td>';
-            html += '<td style="padding: 8px; border: 1px solid #ddd;">' + (link.comment || '<em>No comment</em>') + '</td>';
-            html += '<td style="padding: 8px; border: 1px solid #ddd; font-family: monospace; font-size: 12px;">' + link.link + '</td>';
-            html += '<td style="padding: 8px; border: 1px solid #ddd;">' + (userData.user_comment || '') + '</td>';
-            html += '<td style="padding: 8px; border: 1px solid #ddd;">' + userData.created_at + '</td>';
-            html += '</tr>';
-        });
-    });
-    
-    html += '</tbody></table></div>';
-    linksContainer.innerHTML = html;
-    
-    updateSubmitButton();
-}
-
-function toggleAllLinks(selectAll = true) {
-    var checkboxes = document.getElementsByName('selected_links');
-    var userCheckboxes = document.getElementsByClassName('user-checkbox');
-    
-    for (var i = 0; i < checkboxes.length; i++) {
-        checkboxes[i].checked = selectAll;
-    }
-    
-    for (var i = 0; i < userCheckboxes.length; i++) {
-        userCheckboxes[i].checked = selectAll;
-    }
-    
-    updateSubmitButton();
-}
-
-function toggleUserLinks(username) {
-    var userCheckbox = document.querySelector('.user-checkbox[data-username="' + username + '"]');
-    var userLinkCheckboxes = document.querySelectorAll('.link-checkbox[data-username="' + username + '"]');
-    
-    for (var i = 0; i < userLinkCheckboxes.length; i++) {
-        userLinkCheckboxes[i].checked = userCheckbox.checked;
-    }
-    
-    updateSubmitButton();
-}
-
-function updateUserCheckbox(username) {
-    var userLinkCheckboxes = document.querySelectorAll('.link-checkbox[data-username="' + username + '"]');
-    var userCheckbox = document.querySelector('.user-checkbox[data-username="' + username + '"]');
-    
-    if (!userCheckbox) return; // No user checkbox for single-link users
-    
-    var allChecked = true;
-    var noneChecked = true;
-    
-    for (var i = 0; i < userLinkCheckboxes.length; i++) {
-        if (userLinkCheckboxes[i].checked) {
-            noneChecked = false;
-        } else {
-            allChecked = false;
-        }
-    }
-    
-    if (allChecked) {
-        userCheckbox.checked = true;
-        userCheckbox.indeterminate = false;
-    } else if (noneChecked) {
-        userCheckbox.checked = false;
-        userCheckbox.indeterminate = false;
-    } else {
-        userCheckbox.checked = false;
-        userCheckbox.indeterminate = true;
-    }
-}
-
-function updateSubmitButton() {
-    var checkboxes = document.getElementsByName('selected_links');
-    var sourceServer = document.getElementById('source_server').value;
-    var targetServer = document.getElementById('target_server').value;
-    var submitBtn = document.getElementById('submit-btn');
-    
-    var hasSelected = false;
-    for (var i = 0; i < checkboxes.length; i++) {
-        if (checkboxes[i].checked) {
-            hasSelected = true;
-            break;
-        }
-    }
-    
-    submitBtn.disabled = !(hasSelected && sourceServer && targetServer && sourceServer !== targetServer);
-}
-
-// Form submission confirmation
-document.getElementById('move-clients-form').addEventListener('submit', function(e) {
-    var checkboxes = document.getElementsByName('selected_links');
-    var selectedCount = 0;
-    var selectedUsers = new Set();
-    
-    for (var i = 0; i < checkboxes.length; i++) {
-        if (checkboxes[i].checked) {
-            selectedCount++;
-            selectedUsers.add(checkboxes[i].getAttribute('data-username'));
-        }
-    }
-    
-    var sourceServerName = document.getElementById('source_server').selectedOptions[0].text;
-    var targetServerName = document.getElementById('target_server').selectedOptions[0].text;
-    var commentRegex = document.getElementById('comment_regex').value.trim();
-    
-    var confirmMessage = 'Are you sure you want to move ' + selectedCount + ' link(s) for ' + selectedUsers.size + ' user(s) from "' + sourceServerName + '" to "' + targetServerName + '"?\n\n';
-    confirmMessage += 'This action will:\n';
-    confirmMessage += '- Transfer selected links to target server\n';
-    confirmMessage += '- Create ACLs for users who don\'t have access to target server\n';
-    confirmMessage += '- Remove empty ACLs from source server\n';
-    confirmMessage += '- Preserve all link settings and comments\n';
-    
-    if (commentRegex) {
-        confirmMessage += '- Apply regex transformation to comments: "' + commentRegex + '"\n';
-    }
-    
-    confirmMessage += '\nThis cannot be undone.';
-    
-    if (!confirm(confirmMessage)) {
-        e.preventDefault();
-    }
-});
-
-// Add regex preview functionality
-document.getElementById('comment_regex').addEventListener('input', function() {
-    updateRegexPreview();
-});
-
-function updateRegexPreview() {
-    var regexInput = document.getElementById('comment_regex').value.trim();
-    
-    // Remove any existing preview
-    var existingPreview = document.getElementById('regex-preview');
-    if (existingPreview) {
-        existingPreview.remove();
-    }
-    
-    if (!regexInput) return;
-    
-    // Parse pattern -> replacement format
-    var parts = regexInput.split(' -> ');
-    if (parts.length !== 2) {
-        showRegexError('Invalid format. Use: pattern -> replacement');
-        return;
-    }
-    
-    var pattern = parts[0];
-    var replacement = parts[1];
-    
-    try {
-        var regex = new RegExp(pattern, 'g');
-        
-        // Test with sample comments from currently visible links
-        var sampleComments = getSampleComments();
-        if (sampleComments.length > 0) {
-            showRegexPreview(sampleComments, regex, replacement);
-        }
-        
-    } catch (e) {
-        showRegexError('Invalid regex pattern: ' + e.message);
-    }
-}
-
-function getSampleComments() {
-    var comments = [];
-    var checkboxes = document.getElementsByName('selected_links');
-    
-    // Collect actual comments from visible links
-    for (var i = 0; i < checkboxes.length && comments.length < 5; i++) {
-        var row = checkboxes[i].closest('tr');
-        if (row) {
-            var commentCell = row.children[2]; // Link Comment column
-            if (commentCell) {
-                var commentText = commentCell.textContent.trim();
-                if (commentText && commentText !== 'No comment') {
-                    comments.push(commentText);
-                }
-            }
-        }
-    }
-    
-    // Add some realistic default samples if no comments found or need more samples
-    var defaultSamples = ['iPhone 13'];
-    for (var i = 0; i < defaultSamples.length && comments.length < 5; i++) {
-        if (comments.indexOf(defaultSamples[i]) === -1) {
-            comments.push(defaultSamples[i]);
-        }
-    }
-    
-    return comments.slice(0, 5); // Limit to 5 samples
-}
-
-function showRegexPreview(samples, regex, replacement) {
-    var previewHtml = '<div id="regex-preview" style="margin-top: 10px; padding: 10px; background-color: #e8f5e8; border-radius: 3px; border-left: 4px solid #28a745;">';
-    previewHtml += '<h5 style="margin-top: 0; color: #28a745;">Preview (first 5 samples):</h5>';
-    previewHtml += '<table style="width: 100%; font-size: 13px;">';
-    previewHtml += '<tr><th style="text-align: left; padding: 5px;">Original</th><th style="text-align: left; padding: 5px;">→</th><th style="text-align: left; padding: 5px;">Transformed</th></tr>';
-    
-    samples.forEach(function(comment) {
-        var original = comment || '(empty)';
-        var transformed;
-        
-        try {
-            // Use string replace with regex and replacement string
-            transformed = original.replace(regex, replacement);
-        } catch (e) {
-            transformed = '(error: ' + e.message + ')';
-        }
-        
-        var changed = original !== transformed;
-        
-        previewHtml += '<tr>';
-        previewHtml += '<td style="padding: 3px 5px; font-family: monospace;">' + escapeHtml(original) + '</td>';
-        previewHtml += '<td style="padding: 3px 5px;">→</td>';
-        previewHtml += '<td style="padding: 3px 5px; font-family: monospace;' + (changed ? ' font-weight: bold; color: #28a745;' : '') + '">' + escapeHtml(transformed) + '</td>';
-        previewHtml += '</tr>';
-    });
-    
-    previewHtml += '</table></div>';
-    
-    document.querySelector('.regex-help').insertAdjacentHTML('afterend', previewHtml);
-}
-
-function escapeHtml(text) {
-    var div = document.createElement('div');
-    div.textContent = text;
-    return div.innerHTML;
-}
-
-function showRegexError(message) {
-    var errorHtml = '<div id="regex-preview" style="margin-top: 10px; padding: 10px; background-color: #f8d7da; border-radius: 3px; border-left: 4px solid #dc3545;">';
-    errorHtml += '<h5 style="margin-top: 0; color: #dc3545;">Error:</h5>';
-    errorHtml += '<p style="margin: 0; color: #721c24;">' + message + '</p>';
-    errorHtml += '</div>';
-    
-    document.querySelector('.regex-help').insertAdjacentHTML('afterend', errorHtml);
-}
-</script>
-
-<style>
-.alert {
-    margin: 10px 0;
-    padding: 10px;
-    border-radius: 4px;
-}
-
-.form-row {
-    margin-bottom: 20px;
-}
-
-.submit-row {
-    padding: 12px 14px;
-    margin: 0 0 20px;
-    background: #f8f8f8;
-    border: 1px solid #ddd;
-    border-radius: 4px;
-}
-
-.submit-row input[type="submit"] {
-    background: #417690;
-    color: white;
-    border: none;
-    padding: 10px 15px;
-    border-radius: 4px;
-    cursor: pointer;
-    margin-right: 10px;
-}
-
-.submit-row input[type="submit"]:disabled {
-    background: #ccc;
-    cursor: not-allowed;
-}
-
-.submit-row .cancel {
-    background: #6c757d;
-    color: white;
-    padding: 10px 15px;
-    border-radius: 4px;
-    text-decoration: none;
-}
-
-.submit-row .cancel:hover {
-    background: #5a6268;
-    color: white;
-}
-
-.link-row:hover {
-    background-color: #f8f9fa;
-}
-
-input[type="checkbox"]:indeterminate {
-    opacity: 0.5;
-}
-</style>
-{% endblock %}
diff --git a/vpn/templates/admin/polls/user/change_form.html b/vpn/templates/admin/polls/user/change_form.html
deleted file mode 100644
index 9b8ed3b..0000000
--- a/vpn/templates/admin/polls/user/change_form.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "admin/change_form.html" %}
-{% load static %}
-
-{% block after_field_sets %}
-    <div>
-        <h2>Create ACLs</h2>
-        {{ adminform.form.servers }}
-    </div>
-{% endblock %}
-
diff --git a/vpn/templates/admin/purge_users.html b/vpn/templates/admin/purge_users.html
deleted file mode 100644
index c99e768..0000000
--- a/vpn/templates/admin/purge_users.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!-- vpn/templates/admin/purge_users.html -->
-{% extends "admin/base_site.html" %}
-{% load i18n static %}
-
-{% block title %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
-
-{% block extrahead %}
-    {{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static 'admin/css/server_actions.css' %}">
-{% endblock %}
-
-{% block content %}
-<div class="content-main">
-    <h1>{{ title }}</h1>
-    
-    <!-- Context Information -->
-    <div class="alert alert-info" style="margin: 10px 0; padding: 10px; border-radius: 4px; background-color: #d1ecf1; border: 1px solid #bee5eb; color: #0c5460;">
-        {% if servers_info|length == 1 %}
-            <strong>🎯 Single Server Operation:</strong> You are managing users for server "{{ servers_info.0.server.name }}"
-        {% elif servers_info|length > 10 %}
-            <strong>🌐 Bulk Operation:</strong> You are managing users for {{ servers_info|length }} servers (all available servers)
-        {% else %}
-            <strong>📋 Multi-Server Operation:</strong> You are managing users for {{ servers_info|length }} selected servers
-        {% endif %}
-    </div>
-    
-    <div class="alert alert-warning" style="margin: 10px 0; padding: 15px; border-radius: 4px; background-color: #fff3cd; border: 1px solid #ffeaa7; color: #856404;">
-        <strong>⚠️ WARNING:</strong> This operation will permanently delete users directly from the VPN servers. 
-        This action cannot be undone and may affect active VPN connections.
-    </div>
-    
-    {% if messages %}
-        {% for message in messages %}
-            <div class="alert alert-{{ message.tags }}" style="margin: 10px 0; padding: 10px; border-radius: 4px; 
-                {% if message.tags == 'error' %}background-color: #f8d7da; border: 1px solid #f5c6cb; color: #721c24;
-                {% elif message.tags == 'success' %}background-color: #d4edda; border: 1px solid #c3e6cb; color: #155724;
-                {% elif message.tags == 'warning' %}background-color: #fff3cd; border: 1px solid #ffeaa7; color: #856404;
-                {% elif message.tags == 'info' %}background-color: #d1ecf1; border: 1px solid #bee5eb; color: #0c5460;
-                {% endif %}">
-                {{ message }}
-            </div>
-        {% endfor %}
-    {% endif %}
-
-    <form method="post" id="purge-form">
-        {% csrf_token %}
-        
-        <div class="form-row" style="margin-bottom: 20px;">
-            <h3>Select Servers and Purge Mode:</h3>
-            
-            <div style="margin-bottom: 15px;">
-                <label for="purge_mode"><strong>Purge Mode:</strong></label>
-                <div style="margin-top: 5px;">
-                    <input type="radio" id="purge_unmanaged" name="purge_mode" value="unmanaged" checked onchange="updatePurgeDescription()">
-                    <label for="purge_unmanaged" style="font-weight: normal; margin-left: 5px; margin-right: 20px;">
-                        <span style="color: #28a745;">Safe Purge</span> - Only unmanaged users
-                    </label>
-                    
-                    <input type="radio" id="purge_all" name="purge_mode" value="all" onchange="updatePurgeDescription()">
-                    <label for="purge_all" style="font-weight: normal; margin-left: 5px; color: #dc3545;">
-                        <span style="color: #dc3545;">⚠️ Full Purge</span> - ALL users (including OutFleet managed)
-                    </label>
-                </div>
-            </div>
-
-            <div id="purge-description" style="padding: 10px; border-radius: 5px; margin-bottom: 15px;">
-                <!-- Description will be updated by JavaScript -->
-            </div>
-        </div>
-
-        <div class="form-row" style="margin-bottom: 20px;">
-            <h3>Select Servers to Purge:</h3>
-            <div style="max-height: 400px; overflow-y: auto; border: 1px solid #ddd; padding: 10px;">
-                <div style="margin-bottom: 10px;">
-                    <button type="button" onclick="toggleAllServers()" style="padding: 5px 10px; margin-right: 10px;">Select All</button>
-                    <button type="button" onclick="toggleAllServers(false)" style="padding: 5px 10px;">Deselect All</button>
-                </div>
-                
-                <table style="width: 100%; border-collapse: collapse;">
-                    <thead>
-                        <tr style="background-color: #f5f5f5;">
-                            <th style="padding: 8px; border: 1px solid #ddd; width: 50px;">Select</th>
-                            <th style="padding: 8px; border: 1px solid #ddd;">Server Name</th>
-                            <th style="padding: 8px; border: 1px solid #ddd;">Type</th>
-                            <th style="padding: 8px; border: 1px solid #ddd;">Status</th>
-                            <th style="padding: 8px; border: 1px solid #ddd;">Users on Server</th>
-                            <th style="padding: 8px; border: 1px solid #ddd;">Details</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for server_info in servers_info %}
-                        <tr class="server-row" data-server-id="{{ server_info.server.id }}">
-                            <td style="padding: 8px; border: 1px solid #ddd; text-align: center;">
-                                {% if server_info.status == 'online' %}
-                                    <input type="checkbox" name="selected_servers" value="{{ server_info.server.id }}" 
-                                           class="server-checkbox" onchange="updateSubmitButton()">
-                                {% else %}
-                                    <span style="color: #ccc;" title="Server unavailable">❌</span>
-                                {% endif %}
-                            </td>
-                            <td style="padding: 8px; border: 1px solid #ddd;">
-                                <strong>{{ server_info.server.name }}</strong>
-                            </td>
-                            <td style="padding: 8px; border: 1px solid #ddd;">
-                                {{ server_info.server.server_type }}
-                            </td>
-                            <td style="padding: 8px; border: 1px solid #ddd;">
-                                {% if server_info.status == 'online' %}
-                                    <span style="color: #28a745;">✅ Online</span>
-                                {% else %}
-                                    <span style="color: #dc3545;">❌ Error</span>
-                                {% endif %}
-                            </td>
-                            <td style="padding: 8px; border: 1px solid #ddd; text-align: center;">
-                                {% if server_info.status == 'online' %}
-                                    <strong>{{ server_info.user_count }}</strong>
-                                {% else %}
-                                    <span style="color: #ccc;">N/A</span>
-                                {% endif %}
-                            </td>
-                            <td style="padding: 8px; border: 1px solid #ddd; font-size: 12px;">
-                                {% if server_info.status == 'online' %}
-                                    {% if server_info.user_count > 0 %}
-                                        <details>
-                                            <summary style="cursor: pointer;">View users ({{ server_info.user_count }})</summary>
-                                            <div style="margin-top: 5px; max-height: 150px; overflow-y: auto; background-color: #f8f9fa; padding: 5px; border-radius: 3px;">
-                                                {% for user in server_info.users %}
-                                                    <div style="margin: 2px 0; font-family: monospace; font-size: 11px;">
-                                                        <strong>{{ user.name }}</strong> (ID: {{ user.key_id }})
-                                                        <br><span style="color: #666;">Pass: {{ user.password|slice:":8" }}...</span>
-                                                    </div>
-                                                {% endfor %}
-                                            </div>
-                                        </details>
-                                    {% else %}
-                                        <span style="color: #666;">No users</span>
-                                    {% endif %}
-                                {% else %}
-                                    <span style="color: #dc3545;">{{ server_info.error }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div class="submit-row">
-            <input type="submit" value="🗑️ Purge Selected Servers" class="default" id="submit-btn" disabled 
-                   style="background-color: #dc3545; border-color: #dc3545;">
-            <a href="{% url 'admin:vpn_server_changelist' %}" class="button cancel">Cancel</a>
-        </div>
-    </form>
-</div>
-
-<script>
-function updatePurgeDescription() {
-    var purgeMode = document.querySelector('input[name="purge_mode"]:checked').value;
-    var descriptionDiv = document.getElementById('purge-description');
-    
-    if (purgeMode === 'unmanaged') {
-        descriptionDiv.innerHTML = `
-            <div style="background-color: #d4edda; border-left: 4px solid #28a745; color: #155724;">
-                <h4 style="margin: 0 0 5px 0;">Safe Purge Mode</h4>
-                <p style="margin: 0;">
-                    • Only removes users that are <strong>NOT</strong> managed by OutFleet<br>
-                    • Preserves all users that exist in the OutFleet database<br>
-                    • Safe to use - will not affect your managed users<br>
-                    • Recommended for cleaning up orphaned or manually created users
-                </p>
-            </div>
-        `;
-    } else {
-        descriptionDiv.innerHTML = `
-            <div style="background-color: #f8d7da; border-left: 4px solid #dc3545; color: #721c24;">
-                <h4 style="margin: 0 0 5px 0;">⚠️ DANGEROUS: Full Purge Mode</h4>
-                <p style="margin: 0;">
-                    • <strong>REMOVES ALL USERS</strong> from the server, including OutFleet managed users<br>
-                    • <strong>WILL DISCONNECT ALL ACTIVE VPN SESSIONS</strong><br>
-                    • OutFleet managed users will be recreated during next sync<br>
-                    • Use only if you want to completely reset the server<br>
-                    • <strong>THIS ACTION CANNOT BE UNDONE</strong>
-                </p>
-            </div>
-        `;
-    }
-}
-
-function toggleAllServers(selectAll = true) {
-    var checkboxes = document.getElementsByClassName('server-checkbox');
-    
-    for (var i = 0; i < checkboxes.length; i++) {
-        checkboxes[i].checked = selectAll;
-    }
-    
-    updateSubmitButton();
-}
-
-function updateSubmitButton() {
-    var checkboxes = document.getElementsByClassName('server-checkbox');
-    var submitBtn = document.getElementById('submit-btn');
-    
-    var hasSelected = false;
-    for (var i = 0; i < checkboxes.length; i++) {
-        if (checkboxes[i].checked) {
-            hasSelected = true;
-            break;
-        }
-    }
-    
-    submitBtn.disabled = !hasSelected;
-    
-    // Update button text based on purge mode
-    var purgeMode = document.querySelector('input[name="purge_mode"]:checked').value;
-    if (purgeMode === 'all') {
-        submitBtn.innerHTML = '<i class="fas fa-exclamation-triangle mr-2"></i>PURGE ALL USERS';
-        submitBtn.className = 'btn btn-danger';
-    } else {
-        submitBtn.innerHTML = '<i class="fas fa-trash mr-2"></i>Purge Unmanaged Users';
-        submitBtn.className = 'btn btn-warning';
-    }
-}
-
-// Form submission confirmation
-document.getElementById('purge-form').addEventListener('submit', function(e) {
-    var checkboxes = document.getElementsByClassName('server-checkbox');
-    var selectedCount = 0;
-    var selectedServers = [];
-    
-    for (var i = 0; i < checkboxes.length; i++) {
-        if (checkboxes[i].checked) {
-            selectedCount++;
-            var row = checkboxes[i].closest('tr');
-            var serverName = row.querySelector('td:nth-child(2) strong').textContent;
-            selectedServers.push(serverName);
-        }
-    }
-    
-    var purgeMode = document.querySelector('input[name="purge_mode"]:checked').value;
-    var totalUsers = 0;
-    
-    // Calculate total users that will be affected
-    for (var i = 0; i < checkboxes.length; i++) {
-        if (checkboxes[i].checked) {
-            var row = checkboxes[i].closest('tr');
-            var userCountBadge = row.querySelector('td:nth-child(5) .badge');
-            if (userCountBadge) {
-                totalUsers += parseInt(userCountBadge.textContent) || 0;
-            }
-        }
-    }
-    
-    var confirmMessage = '';
-    
-    if (purgeMode === 'all') {
-        confirmMessage = `⚠️ DANGER: FULL PURGE CONFIRMATION ⚠️\n\n`;
-        confirmMessage += `You are about to PERMANENTLY DELETE ALL USERS from ${selectedCount} server(s):\n`;
-        confirmMessage += `${selectedServers.join(', ')}\n\n`;
-        confirmMessage += `This will:\n`;
-        confirmMessage += `• DELETE ALL ${totalUsers} users from selected servers\n`;
-        confirmMessage += `• DISCONNECT ALL ACTIVE VPN SESSIONS\n`;
-        confirmMessage += `• REMOVE BOTH managed and unmanaged users\n`;
-        confirmMessage += `• Cannot be undone\n\n`;
-        confirmMessage += `OutFleet managed users will be recreated during next sync.\n\n`;
-        confirmMessage += `Type "PURGE ALL" to confirm this dangerous operation:`;
-        
-        var userInput = prompt(confirmMessage);
-        if (userInput !== "PURGE ALL") {
-            e.preventDefault();
-            alert("Operation cancelled. You must type exactly 'PURGE ALL' to confirm.");
-            return;
-        }
-    } else {
-        confirmMessage = `Safe Purge Confirmation\n\n`;
-        confirmMessage += `You are about to purge unmanaged users from ${selectedCount} server(s):\n`;
-        confirmMessage += `${selectedServers.join(', ')}\n\n`;
-        confirmMessage += `This will:\n`;
-        confirmMessage += `• Remove only users NOT managed by OutFleet\n`;
-        confirmMessage += `• Preserve all OutFleet managed users\n`;
-        confirmMessage += `• Help clean up orphaned users\n\n`;
-        confirmMessage += `Are you sure you want to continue?`;
-        
-        if (!confirm(confirmMessage)) {
-            e.preventDefault();
-        }
-    }
-});
-
-// Initialize page
-document.addEventListener('DOMContentLoaded', function() {
-    updatePurgeDescription();
-    updateSubmitButton();
-    
-    // Add event listeners to purge mode radio buttons
-    document.querySelectorAll('input[name="purge_mode"]').forEach(function(radio) {
-        radio.addEventListener('change', function() {
-            updatePurgeDescription();
-            updateSubmitButton();
-        });
-    });
-});
-</script>
-{% endblock %}
diff --git a/vpn/templates/admin/simple_move_clients.html b/vpn/templates/admin/simple_move_clients.html
deleted file mode 100644
index d4c7860..0000000
--- a/vpn/templates/admin/simple_move_clients.html
+++ /dev/null
@@ -1,93 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n admin_urls static admin_list %}
-
-{% block title %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
-
-{% block extrahead %}
-    <link rel="stylesheet" type="text/css" href="{% static 'admin/css/vpn_admin.css' %}">
-{% endblock %}
-
-{% block breadcrumbs %}
-<div class="breadcrumbs">
-    <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
-    &rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
-    &rsaquo; <a href="{% url 'admin:vpn_server_changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
-    &rsaquo; {{ title }}
-</div>
-{% endblock %}
-
-{% block content %}
-<h1>{{ title }}</h1>
-
-<div class="module aligned">
-    <div class="form-row">
-        <div class="form-row field-box">
-            <label>Source Server:</label>
-            <div class="readonly"><strong>{{ source_server.name }}</strong> ({{ source_server.server_type }})</div>
-        </div>
-        
-        <div class="form-row field-box">
-            <label>Statistics:</label>
-            <div class="readonly">
-                <strong>{{ links_count }}</strong> client link(s) for <strong>{{ users_count }}</strong> user(s)
-            </div>
-        </div>
-    </div>
-</div>
-
-{% if links_count == 0 %}
-    <div class="messagelist">
-        <div class="warning">No client links found on this server.</div>
-    </div>
-    <div class="submit-row">
-        <a href="{% url 'admin:vpn_server_changelist' %}" class="default">« Back to server list</a>
-    </div>
-{% else %}
-    <form method="post" id="move-form">
-        {% csrf_token %}
-        
-        <fieldset class="module aligned">
-            <h2>Move Options</h2>
-            
-            <div class="form-row">
-                <div>
-                    <label for="target_server" class="required">Target Server:</label>
-                    <select id="target_server" name="target_server" class="vLargeTextField" required>
-                        <option value="">-- Select target server --</option>
-                        {% for server in all_servers %}
-                            <option value="{{ server.id }}">{{ server.name }} ({{ server.server_type }})</option>
-                        {% endfor %}
-                    </select>
-                </div>
-            </div>
-            
-            <div class="form-row">
-                <div>
-                    <label for="add_prefix">Add prefix to comments (optional):</label>
-                    <input type="text" id="add_prefix" name="add_prefix" class="vTextField" 
-                           placeholder="e.g. [FROM {{ source_server.name }}]">
-                    <p class="help">This prefix will be added to all client link comments</p>
-                </div>
-            </div>
-        </fieldset>
-
-        <div class="submit-row">
-            <input type="submit" value="Move All Client Links" class="default" 
-                   onclick="return confirm('Are you sure you want to move ALL {{ links_count }} client link(s) from {{ source_server.name }} to the selected target server?\\n\\nThis action cannot be undone.');">
-            <a href="{% url 'admin:vpn_server_changelist' %}" class="button cancel">Cancel</a>
-        </div>
-    </form>
-    
-    <div class="help">
-        <h3>What will happen:</h3>
-        <ul>
-            <li>All {{ links_count }} client links will be moved from <strong>{{ source_server.name }}</strong> to the target server</li>
-            <li>Users who don't have access to the target server will get new ACL entries created automatically</li>
-            <li>Empty ACL entries on the source server will be cleaned up</li>
-            <li>All link settings and comments will be preserved (with optional prefix)</li>
-            <li>This operation is database-only and doesn't require server connectivity</li>
-        </ul>
-    </div>
-{% endif %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/vpn/templates/admin/vpn/acllink/change_list.html b/vpn/templates/admin/vpn/acllink/change_list.html
deleted file mode 100644
index 3575a94..0000000
--- a/vpn/templates/admin/vpn/acllink/change_list.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends "admin/change_list.html" %}
-
-{% block content_title %}
-    <h1 class="h4 m-0 pr-3 mr-3 border-right">ACL Links & User Statistics</h1>
-{% endblock %}
-
-{% block content %}
-    <!-- Compact Statistics Panel -->
-    <div style="background: #f8fafc; border: 1px solid #e2e8f0; border-radius: 6px; padding: 16px; margin: 0 0 16px 0;">
-        <div style="display: flex; gap: 16px; flex-wrap: wrap; align-items: center;">
-            <!-- Key Metrics -->
-            <div style="background: #3b82f6; color: white; padding: 8px 12px; border-radius: 4px; min-width: 100px; text-align: center;">
-                <div style="font-size: 18px; font-weight: bold;">{{ total_links|default:0 }}</div>
-                <div style="font-size: 11px; opacity: 0.9;">Links</div>
-            </div>
-            <div style="background: #10b981; color: white; padding: 8px 12px; border-radius: 4px; min-width: 100px; text-align: center;">
-                <div style="font-size: 18px; font-weight: bold;">{{ total_uses|default:0|floatformat:0 }}</div>
-                <div style="font-size: 11px; opacity: 0.9;">Total Uses</div>
-            </div>
-            <div style="background: #8b5cf6; color: white; padding: 8px 12px; border-radius: 4px; min-width: 100px; text-align: center;">
-                <div style="font-size: 18px; font-weight: bold;">{{ recent_uses|default:0|floatformat:0 }}</div>
-                <div style="font-size: 11px; opacity: 0.9;">Recent (30d)</div>
-            </div>
-            
-            <!-- Status indicators -->
-            <div style="margin-left: 20px; display: flex; gap: 12px; flex-wrap: wrap;">
-                {% if never_accessed > 0 %}
-                <span style="background: #dc2626; color: white; padding: 4px 8px; border-radius: 3px; font-size: 12px;">❌ {{ never_accessed }} never used</span>
-                {% endif %}
-                {% if old_links > 0 %}
-                <span style="background: #f97316; color: white; padding: 4px 8px; border-radius: 3px; font-size: 12px;">⚠️ {{ old_links }} old</span>
-                {% endif %}
-                <span style="background: #059669; color: white; padding: 4px 8px; border-radius: 3px; font-size: 12px;">✅ {{ active_links|default:0 }} active</span>
-            </div>
-            
-            <!-- Quick Actions -->
-            <div style="margin-left: auto; display: flex; gap: 8px; flex-wrap: wrap;">
-                <a href="?last_access_status=never" style="background: #dc2626; color: white; padding: 4px 8px; border-radius: 3px; text-decoration: none; font-size: 11px;">🔍 Never Used</a>
-                <a href="?last_access_status=old" style="background: #f97316; color: white; padding: 4px 8px; border-radius: 3px; text-decoration: none; font-size: 11px;">⏰ Old</a>
-                <a href="?last_access_status=week" style="background: #10b981; color: white; padding: 4px 8px; border-radius: 3px; text-decoration: none; font-size: 11px;">📅 Recent</a>
-                <a href="?" style="background: #6b7280; color: white; padding: 4px 8px; border-radius: 3px; text-decoration: none; font-size: 11px;">🔄 Clear</a>
-            </div>
-        </div>
-    </div>
-    
-    {{ block.super }}
-{% endblock %}
diff --git a/vpn/templates/admin/vpn/certificate/change_form.html b/vpn/templates/admin/vpn/certificate/change_form.html
deleted file mode 100644
index 5da9a6f..0000000
--- a/vpn/templates/admin/vpn/certificate/change_form.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "admin/change_form.html" %}
-
-{% block content %}
-    {% if show_tab_navigation %}
-    <div class="module" style="margin-bottom: 20px;">
-        <div style="display: flex; border-bottom: 1px solid #ddd;">
-            {% for tab in tabs %}
-            <a href="{{ tab.url }}" 
-               style="padding: 10px 20px; text-decoration: none; border-bottom: 3px solid {% if tab.active %}#417690{% else %}transparent{% endif %}; color: {% if tab.active %}#417690{% else %}#666{% endif %};">
-                {% if tab.name == 'subscription_groups' %}📋{% elif tab.name == 'user_subscriptions' %}👥{% elif tab.name == 'certificates' %}🔒{% elif tab.name == 'inbound_templates' %}⚙️{% endif %} {{ tab.label }}
-            </a>
-            {% endfor %}
-        </div>
-    </div>
-    {% endif %}
-    
-    {{ block.super }}
-{% endblock %}
\ No newline at end of file
diff --git a/vpn/templates/admin/vpn/certificate/change_list.html b/vpn/templates/admin/vpn/certificate/change_list.html
deleted file mode 100644
index 3dcf650..0000000
--- a/vpn/templates/admin/vpn/certificate/change_list.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "admin/change_list.html" %}
-
-{% block content %}
-    {% if show_tab_navigation %}
-    <div class="module" style="margin-bottom: 20px;">
-        <div style="display: flex; border-bottom: 1px solid #ddd;">
-            {% for tab in tabs %}
-            <a href="{{ tab.url }}" 
-               style="padding: 10px 20px; text-decoration: none; border-bottom: 3px solid {% if tab.active %}#417690{% else %}transparent{% endif %}; color: {% if tab.active %}#417690{% else %}#666{% endif %};">
-                {% if tab.name == 'subscription_groups' %}📋{% elif tab.name == 'user_subscriptions' %}👥{% elif tab.name == 'certificates' %}🔒{% elif tab.name == 'inbound_templates' %}⚙️{% endif %} {{ tab.label }}
-            </a>
-            {% endfor %}
-        </div>
-    </div>
-    {% endif %}
-    
-    {{ block.super }}
-{% endblock %}
\ No newline at end of file
diff --git a/vpn/templates/admin/vpn/inbound/change_form.html b/vpn/templates/admin/vpn/inbound/change_form.html
deleted file mode 100644
index 5da9a6f..0000000
--- a/vpn/templates/admin/vpn/inbound/change_form.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "admin/change_form.html" %}
-
-{% block content %}
-    {% if show_tab_navigation %}
-    <div class="module" style="margin-bottom: 20px;">
-        <div style="display: flex; border-bottom: 1px solid #ddd;">
-            {% for tab in tabs %}
-            <a href="{{ tab.url }}" 
-               style="padding: 10px 20px; text-decoration: none; border-bottom: 3px solid {% if tab.active %}#417690{% else %}transparent{% endif %}; color: {% if tab.active %}#417690{% else %}#666{% endif %};">
-                {% if tab.name == 'subscription_groups' %}📋{% elif tab.name == 'user_subscriptions' %}👥{% elif tab.name == 'certificates' %}🔒{% elif tab.name == 'inbound_templates' %}⚙️{% endif %} {{ tab.label }}
-            </a>
-            {% endfor %}
-        </div>
-    </div>
-    {% endif %}
-    
-    {{ block.super }}
-{% endblock %}
\ No newline at end of file
diff --git a/vpn/templates/admin/vpn/inbound/change_list.html b/vpn/templates/admin/vpn/inbound/change_list.html
deleted file mode 100644
index 3dcf650..0000000
--- a/vpn/templates/admin/vpn/inbound/change_list.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "admin/change_list.html" %}
-
-{% block content %}
-    {% if show_tab_navigation %}
-    <div class="module" style="margin-bottom: 20px;">
-        <div style="display: flex; border-bottom: 1px solid #ddd;">
-            {% for tab in tabs %}
-            <a href="{{ tab.url }}" 
-               style="padding: 10px 20px; text-decoration: none; border-bottom: 3px solid {% if tab.active %}#417690{% else %}transparent{% endif %}; color: {% if tab.active %}#417690{% else %}#666{% endif %};">
-                {% if tab.name == 'subscription_groups' %}📋{% elif tab.name == 'user_subscriptions' %}👥{% elif tab.name == 'certificates' %}🔒{% elif tab.name == 'inbound_templates' %}⚙️{% endif %} {{ tab.label }}
-            </a>
-            {% endfor %}
-        </div>
-    </div>
-    {% endif %}
-    
-    {{ block.super }}
-{% endblock %}
\ No newline at end of file
diff --git a/vpn/templates/admin/vpn/outlineserver/add_form.html.backup b/vpn/templates/admin/vpn/outlineserver/add_form.html.backup
deleted file mode 100644
index 00cda78..0000000
--- a/vpn/templates/admin/vpn/outlineserver/add_form.html.backup
+++ /dev/null
@@ -1,176 +0,0 @@
-{% extends "admin/change_form.html" %}
-{% load i18n admin_urls static %}
-
-{% block extrahead %}
-    {{ block.super }}
-    <script>
-    document.addEventListener('DOMContentLoaded', function() {
-        // Add JSON Import tab
-        const tabList = document.getElementById('jazzy-tabs');
-        const tabContent = document.querySelector('.tab-content');
-        
-        if (tabList && tabContent) {
-            // Add new tab
-            const newTab = document.createElement('li');
-            newTab.className = 'nav-item';
-            newTab.innerHTML = `
-                <a class="nav-link" data-toggle="pill" role="tab" aria-controls="json-import-tab" aria-selected="false" href="#json-import-tab">
-                    📥 JSON Import
-                </a>
-            `;
-            tabList.insertBefore(newTab, tabList.firstChild);
-            
-            // Add tab content
-            const newTabContent = document.createElement('div');
-            newTabContent.id = 'json-import-tab';
-            newTabContent.className = 'tab-pane fade';
-            newTabContent.setAttribute('role', 'tabpanel');
-            newTabContent.setAttribute('aria-labelledby', 'json-import-tab');
-            newTabContent.innerHTML = `
-                <div class="card">
-                    <div class="p-5 card-body">
-                        <h4 style="color: #007cba; margin-bottom: 1rem;">📥 Quick Import from JSON</h4>
-                        <p style="font-size: 0.875rem; color: #6c757d; margin-bottom: 1rem;">
-                            Paste the JSON configuration from your Outline server setup to automatically fill the fields:
-                        </p>
-                        
-                        <div class="form-group">
-                            <label for="import-json-config">JSON Configuration:</label>
-                            <textarea id="import-json-config" class="form-control" rows="8" 
-                                      placeholder='{
-  "apiUrl": "https://your-server:port/path",
-  "certSha256": "your-certificate-hash",
-  "serverName": "My Outline Server",
-  "clientHostname": "your-server.com",
-  "clientPort": 1257,
-  "comment": "Server description"
-}' style="font-family: 'Courier New', monospace; font-size: 0.875rem;"></textarea>
-                        </div>
-                        
-                        <button type="button" id="import-json-btn" class="btn btn-primary">
-                            Import Configuration
-                        </button>
-                        
-                        <div style="margin-top: 1rem; padding: 0.75rem; background: #e7f3ff; border-left: 4px solid #007cba; border-radius: 4px;">
-                            <strong>Required fields:</strong>
-                            <ul style="margin: 0.5rem 0; padding-left: 20px;">
-                                <li><code>apiUrl</code> - Server management URL</li>
-                                <li><code>certSha256</code> - Certificate fingerprint</li>
-                            </ul>
-                            <strong>Optional fields:</strong>
-                            <ul style="margin: 0.5rem 0; padding-left: 20px;">
-                                <li><code>serverName</code> - Display name</li>
-                                <li><code>clientHostname</code> - Client hostname</li>
-                                <li><code>clientPort</code> - Client port</li>
-                                <li><code>comment</code> - Description</li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            `;
-            tabContent.insertBefore(newTabContent, tabContent.firstChild);
-            
-            // Make first tab (JSON Import) active
-            document.querySelector('#jazzy-tabs .nav-link').classList.remove('active');
-            newTab.querySelector('.nav-link').classList.add('active');
-            document.querySelector('.tab-pane.active').classList.remove('active', 'show');
-            newTabContent.classList.add('active', 'show');
-        }
-        
-        // Import functionality
-        function tryAutoFillFromJson() {
-            const importJsonTextarea = document.getElementById('import-json-config');
-            
-            try {
-                const jsonText = importJsonTextarea.value.trim();
-                if (!jsonText) {
-                    alert('Please enter JSON configuration');
-                    return;
-                }
-                
-                const config = JSON.parse(jsonText);
-                
-                // Validate required fields
-                if (!config.apiUrl || !config.certSha256) {
-                    alert('Invalid JSON format. Required fields: apiUrl, certSha256');
-                    return;
-                }
-                
-                // Parse apiUrl to extract components
-                const url = new URL(config.apiUrl);
-                
-                // Fill form fields
-                const adminUrlField = document.getElementById('id_admin_url');
-                const adminCertField = document.getElementById('id_admin_access_cert');
-                const clientHostnameField = document.getElementById('id_client_hostname');
-                const clientPortField = document.getElementById('id_client_port');
-                const nameField = document.getElementById('id_name');
-                const commentField = document.getElementById('id_comment');
-                
-                if (adminUrlField) adminUrlField.value = config.apiUrl;
-                if (adminCertField) adminCertField.value = config.certSha256;
-                
-                // Use provided hostname or extract from URL
-                const hostname = config.clientHostname || config.hostnameForAccessKeys || url.hostname;
-                if (clientHostnameField) clientHostnameField.value = hostname;
-                
-                // Use provided port or extract from various sources
-                const clientPort = config.clientPort || config.portForNewAccessKeys || url.port || '1257';
-                if (clientPortField) clientPortField.value = clientPort;
-                
-                // Generate server name if not provided and field is empty
-                if (nameField && !nameField.value) {
-                    const serverName = config.serverName || config.name || `Outline-${hostname}`;
-                    nameField.value = serverName;
-                }
-                
-                // Fill comment if provided and field exists
-                if (commentField && config.comment) {
-                    commentField.value = config.comment;
-                }
-                
-                // Clear the JSON input
-                importJsonTextarea.value = '';
-                
-                // Show success message
-                alert('✅ Configuration imported successfully! Review the fields and save.');
-                
-                // Switch to Server Configuration tab
-                const serverConfigTab = document.querySelector('a[href="#server-configuration-tab"]');
-                if (serverConfigTab) {
-                    serverConfigTab.click();
-                }
-                
-                // Focus on name field
-                if (nameField) {
-                    setTimeout(() => {
-                        nameField.focus();
-                        nameField.select();
-                    }, 300);
-                }
-                
-            } catch (error) {
-                alert(`Invalid JSON format: ${error.message}`);
-            }
-        }
-        
-        // Wait a bit for DOM to be ready, then add event listeners
-        setTimeout(() => {
-            const importBtn = document.getElementById('import-json-btn');
-            const importTextarea = document.getElementById('import-json-config');
-            
-            if (importBtn) {
-                importBtn.addEventListener('click', tryAutoFillFromJson);
-            }
-            
-            if (importTextarea) {
-                importTextarea.addEventListener('paste', function(e) {
-                    setTimeout(() => {
-                        tryAutoFillFromJson();
-                    }, 100);
-                });
-            }
-        }, 500);
-    });
-    </script>
-{% endblock %}
diff --git a/vpn/templates/admin/vpn/outlineserver/change_form.html b/vpn/templates/admin/vpn/outlineserver/change_form.html
deleted file mode 100644
index 37adbb8..0000000
--- a/vpn/templates/admin/vpn/outlineserver/change_form.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "admin/change_form.html" %}
-{% load static %}
-
-{% block content_title %}
-    <h1 class="h4 m-0 pr-3 mr-3 border-right">
-        {% if original %}
-            🔵 Outline Server: {{ original.name }}
-        {% else %}
-            🔵 Add Outline Server
-        {% endif %}
-    </h1>
-{% endblock %}
-
-{% block admin_change_form_document_ready %}
-    {{ block.super }}
-    <script>
-    // All JavaScript functionality is now handled by generate_link.js
-    </script>
-{% endblock %}
-
-{% block field_sets %}
-    {{ block.super }}
-{% endblock %}
diff --git a/vpn/templates/admin/vpn/server/change_form.html b/vpn/templates/admin/vpn/server/change_form.html
deleted file mode 100644
index 11f42ab..0000000
--- a/vpn/templates/admin/vpn/server/change_form.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- vpn/templates/admin/vpn/server/change_form.html -->
-{% extends "admin/change_form.html" %}
-{% load static %}
-
-{% block extrahead %}
-    {{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static 'admin/css/main.css' %}">
-{% endblock %}
-
-{% block submit_buttons_bottom %}
-    {{ block.super }}
-    
-    {% if original %}
-    <div class="row mt-3">
-        <div class="col-12">
-            <div class="card card-outline card-primary">
-                <div class="card-header">
-                    <h3 class="card-title">
-                        <i class="fas fa-tools mr-2"></i>Server Actions
-                    </h3>
-                </div>
-                <div class="card-body">
-                    <div class="btn-group" role="group">
-                        <a href="{% url 'admin:server_move_clients' %}?servers={{ original.id }}" 
-                           class="btn btn-primary">
-                            <i class="fas fa-exchange-alt mr-2"></i>Move Links
-                        </a>
-                        <a href="{% url 'admin:server_purge_users' %}?servers={{ original.id }}" 
-                           class="btn btn-danger"
-                           onclick="return confirm('Open purge interface for {{ original.name }}?')">
-                            <i class="fas fa-trash mr-2"></i>Purge Users
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    {% endif %}
-{% endblock %}
diff --git a/vpn/templates/admin/vpn/server/change_list.html b/vpn/templates/admin/vpn/server/change_list.html
deleted file mode 100644
index 50546e2..0000000
--- a/vpn/templates/admin/vpn/server/change_list.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<!-- vpn/templates/admin/vpn/server/change_list.html -->
-{% extends "admin/change_list.html" %}
-
-{% block content_title %}
-    <h1>{{ title }}</h1>
-    
-    <!-- Bulk Action Buttons -->
-    <div class="bulk-actions-section" style="margin: 20px 0; padding: 15px; background-color: #f8f9fa; border: 1px solid #dee2e6; border-radius: 5px;">
-        <h3 style="margin-top: 0; color: #495057;">🚀 Bulk Server Operations</h3>
-        <p style="margin-bottom: 15px; color: #6c757d;">
-            Perform operations on all available servers at once. These actions will include all servers in the system.
-        </p>
-        
-        <div style="display: flex; gap: 10px; flex-wrap: wrap;">
-            <a href="{{ bulk_move_clients_url }}" 
-               class="bulk-action-btn btn-move-clients" 
-               style="background-color: #007cba; color: white; padding: 10px 15px; text-decoration: none; border-radius: 4px; display: inline-flex; align-items: center; gap: 5px;">
-                📦 <span>Bulk Move Clients</span>
-            </a>
-            
-            <a href="{{ bulk_purge_users_url }}" 
-               class="bulk-action-btn btn-purge-users" 
-               style="background-color: #dc3545; color: white; padding: 10px 15px; text-decoration: none; border-radius: 4px; display: inline-flex; align-items: center; gap: 5px;"
-               onclick="return confirm('⚠️ Warning: This will open the purge interface for ALL servers. Continue?')">
-                🗑️ <span>Bulk Purge Users</span>
-            </a>
-        </div>
-        
-        <div class="tip-section" style="margin-top: 10px; padding: 10px; background-color: #fff3cd; border-left: 4px solid #ffc107; border-radius: 3px;">
-            <small style="color: #856404;">
-                <strong>💡 Tip:</strong> You can also select specific servers below and use the "Actions" dropdown, 
-                or click individual action buttons in the "Actions" column for single-server operations.
-            </small>
-        </div>
-    </div>
-{% endblock %}
-
-{% block extrahead %}
-    {{ block.super }}
-    {% load static %}
-    <link rel="stylesheet" type="text/css" href="{% static 'admin/css/server_actions.css' %}">
-    <style>
-        /* Style for action buttons in the list */
-        .field-server_actions .button {
-            background-color: #007cba;
-            color: white;
-            border: none;
-            border-radius: 3px;
-            padding: 5px 8px;
-            font-size: 11px;
-            text-decoration: none;
-            display: inline-block;
-            margin: 2px;
-            transition: background-color 0.2s;
-        }
-        
-        .field-server_actions .button:hover {
-            background-color: #005a8b;
-            color: white;
-        }
-        
-        .field-server_actions .button[style*="background-color: #dc3545"] {
-            background-color: #dc3545 !important;
-        }
-        
-        .field-server_actions .button[style*="background-color: #dc3545"]:hover {
-            background-color: #c82333 !important;
-        }
-        
-        /* Make action column wider */
-        .field-server_actions {
-            min-width: 150px;
-        }
-        
-        /* Responsive design for action buttons */
-        @media (max-width: 768px) {
-            .field-server_actions > div {
-                flex-direction: column;
-            }
-            
-            .field-server_actions .button {
-                margin: 1px 0;
-                text-align: center;
-            }
-        }
-        
-        /* Enhanced bulk action section styling */
-        .bulk-actions-section {
-            background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
-            border-left: 4px solid #007cba;
-        }
-        
-        .bulk-actions-section h3 {
-            color: #007cba;
-            display: flex;
-            align-items: center;
-            gap: 8px;
-        }
-        
-        /* Hover effects for bulk buttons */
-        .bulk-action-btn {
-            transition: all 0.3s ease;
-            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-        }
-        
-        .bulk-action-btn:hover {
-            transform: translateY(-1px);
-            box-shadow: 0 4px 8px rgba(0,0,0,0.15);
-        }
-        
-        /* Status indicators */
-        .server-status-online {
-            color: #28a745;
-            font-weight: bold;
-        }
-        
-        .server-status-error {
-            color: #dc3545;
-            font-weight: bold;
-        }
-    </style>
-    
-    <script>
-        // Add loading states to bulk action buttons
-        document.addEventListener('DOMContentLoaded', function() {
-            const bulkButtons = document.querySelectorAll('.bulk-action-btn');
-            
-            bulkButtons.forEach(button => {
-                button.addEventListener('click', function(e) {
-                    // Don't prevent default, but add loading state
-                    this.classList.add('loading');
-                    this.style.pointerEvents = 'none';
-                    
-                    // Remove loading state after a delay (in case user navigates back)
-                    setTimeout(() => {
-                        this.classList.remove('loading');
-                        this.style.pointerEvents = 'auto';
-                    }, 5000);
-                });
-            });
-        });
-    </script>
-{% endblock %}
-
-{% block result_list %}
-    <!-- Server Statistics -->
-    <div class="server-stats-section" style="margin: 15px 0; padding: 10px; background-color: #e8f4fd; border: 1px solid #bee5eb; border-radius: 4px;">
-        <div class="server-stats-grid" style="display: flex; gap: 20px; flex-wrap: wrap; align-items: center;">
-            <div class="stat-item">
-                <strong>📊 Server Overview:</strong>
-            </div>
-            <div class="stat-item">
-                <span class="stat-label" style="color: #007cba;">Total Servers:</span> 
-                <strong class="stat-value">{{ cl.result_count }}</strong>
-            </div>
-            {% if cl.result_count > 0 %}
-            <div class="stat-item">
-                <span class="stat-label" style="color: #28a745;">Available Operations:</span> 
-                <strong class="stat-value">Move Links, Purge Users, Bulk Actions</strong>
-            </div>
-            {% endif %}
-        </div>
-    </div>
-
-    {{ block.super }}
-{% endblock %}
diff --git a/vpn/templates/admin/vpn/server/change_list.html.backup b/vpn/templates/admin/vpn/server/change_list.html.backup
deleted file mode 100644
index 43e7932..0000000
--- a/vpn/templates/admin/vpn/server/change_list.html.backup
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "admin/change_list.html" %}
-{% load admin_list admin_urls %}
-
-{% block content_title %}
-    <h1>{{ cl.opts.verbose_name_plural|capfirst }}</h1>
-{% endblock %}
-
-{% comment %}
-This template overrides the default changelist to provide a cleaner interface
-without any bulk operations blocks that might be added by external packages
-{% endcomment %}
diff --git a/vpn/templates/admin/vpn/subscriptiongroup/change_form.html b/vpn/templates/admin/vpn/subscriptiongroup/change_form.html
deleted file mode 100644
index 5da9a6f..0000000
--- a/vpn/templates/admin/vpn/subscriptiongroup/change_form.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "admin/change_form.html" %}
-
-{% block content %}
-    {% if show_tab_navigation %}
-    <div class="module" style="margin-bottom: 20px;">
-        <div style="display: flex; border-bottom: 1px solid #ddd;">
-            {% for tab in tabs %}
-            <a href="{{ tab.url }}" 
-               style="padding: 10px 20px; text-decoration: none; border-bottom: 3px solid {% if tab.active %}#417690{% else %}transparent{% endif %}; color: {% if tab.active %}#417690{% else %}#666{% endif %};">
-                {% if tab.name == 'subscription_groups' %}📋{% elif tab.name == 'user_subscriptions' %}👥{% elif tab.name == 'certificates' %}🔒{% elif tab.name == 'inbound_templates' %}⚙️{% endif %} {{ tab.label }}
-            </a>
-            {% endfor %}
-        </div>
-    </div>
-    {% endif %}
-    
-    {{ block.super }}
-{% endblock %}
\ No newline at end of file
diff --git a/vpn/templates/admin/vpn/subscriptiongroup/change_list.html b/vpn/templates/admin/vpn/subscriptiongroup/change_list.html
deleted file mode 100644
index 3dcf650..0000000
--- a/vpn/templates/admin/vpn/subscriptiongroup/change_list.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "admin/change_list.html" %}
-
-{% block content %}
-    {% if show_tab_navigation %}
-    <div class="module" style="margin-bottom: 20px;">
-        <div style="display: flex; border-bottom: 1px solid #ddd;">
-            {% for tab in tabs %}
-            <a href="{{ tab.url }}" 
-               style="padding: 10px 20px; text-decoration: none; border-bottom: 3px solid {% if tab.active %}#417690{% else %}transparent{% endif %}; color: {% if tab.active %}#417690{% else %}#666{% endif %};">
-                {% if tab.name == 'subscription_groups' %}📋{% elif tab.name == 'user_subscriptions' %}👥{% elif tab.name == 'certificates' %}🔒{% elif tab.name == 'inbound_templates' %}⚙️{% endif %} {{ tab.label }}
-            </a>
-            {% endfor %}
-        </div>
-    </div>
-    {% endif %}
-    
-    {{ block.super }}
-{% endblock %}
\ No newline at end of file
diff --git a/vpn/templates/admin/vpn/taskexecutionlog/change_list.html b/vpn/templates/admin/vpn/taskexecutionlog/change_list.html
deleted file mode 100644
index 249c47b..0000000
--- a/vpn/templates/admin/vpn/taskexecutionlog/change_list.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "admin/change_list.html" %}
-
-{% block content_title %}
-    <h1 class="h4 m-0 pr-3 mr-3 border-right">Task Execution Logs</h1>
-{% endblock %}
diff --git a/vpn/templates/admin/vpn/user/change_form.html b/vpn/templates/admin/vpn/user/change_form.html
deleted file mode 100644
index e87b535..0000000
--- a/vpn/templates/admin/vpn/user/change_form.html
+++ /dev/null
@@ -1,219 +0,0 @@
-{% extends "admin/change_form.html" %}
-{% load static %}
-
-{% block content_title %}
-    <h1 class="h4 m-0 pr-3 mr-3 border-right">
-        {% if original %}
-            👤 User: {{ original.username }}
-        {% else %}
-            👤 Add User
-        {% endif %}
-    </h1>
-{% endblock %}
-
-{% block extrahead %}
-    {{ block.super }}
-    <style>
-        .user-management-section {
-            background: #f8f9fa;
-            border: 1px solid #dee2e6;
-            border-radius: 0.375rem;
-            padding: 1rem;
-            margin: 0.5rem 0;
-        }
-        
-        .user-management-section h4 {
-            margin: 0 0 0.75rem 0;
-            color: #495057;
-            font-size: 1rem;
-            font-weight: 600;
-        }
-        
-        .server-section {
-            background: #ffffff;
-            border: 1px solid #e9ecef;
-            border-radius: 0.25rem;
-            padding: 1rem;
-            margin-bottom: 1rem;
-        }
-        
-        .link-item {
-            background: #f8f9fa;
-            border: 1px solid #e9ecef;
-            border-radius: 0.25rem;
-            padding: 0.75rem;
-            margin-bottom: 0.5rem;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-        
-        .btn-sm-custom {
-            padding: 0.25rem 0.5rem;
-            font-size: 0.75rem;
-            border-radius: 0.2rem;
-            margin: 0 0.1rem;
-        }
-        
-        .readonly .user-management-section {
-            border: none;
-            background: transparent;
-            padding: 0;
-        }
-    </style>
-{% endblock %}
-
-{% block admin_change_form_document_ready %}
-    {{ block.super }}
-    {% if original %}
-    <script>
-    document.addEventListener('DOMContentLoaded', function() {
-        const userId = {{ original.id }};
-        const csrfToken = document.querySelector('[name=csrfmiddlewaretoken]').value;
-        
-        // Show success/error messages in Django admin style
-        function showMessage(message, type = 'success') {
-            const messageClass = type === 'error' ? 'error' : 'success';
-            const messageHtml = `
-                <div class="alert alert-${messageClass} alert-dismissible" style="margin: 1rem 0;">
-                    ${message}
-                    <button type="button" class="close" aria-label="Close" onclick="this.parentElement.remove()">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-            `;
-            
-            const target = document.querySelector('.card-body') || document.querySelector('.content');
-            if (target) {
-                target.insertAdjacentHTML('afterbegin', messageHtml);
-                setTimeout(() => {
-                    const alert = target.querySelector('.alert');
-                    if (alert) alert.remove();
-                }, 5000);
-            }
-        }
-        
-        // Add new link functionality
-        document.querySelectorAll('.add-link-btn').forEach(btn => {
-            btn.addEventListener('click', async function() {
-                const serverId = this.dataset.serverId;
-                const serverName = this.dataset.serverName;
-                
-                const comment = prompt(`Add comment for new link on ${serverName} (optional):`, '');
-                if (comment === null) return;
-                
-                const originalText = this.textContent;
-                this.textContent = '⏳ Adding...';
-                this.disabled = true;
-                
-                try {
-                    const response = await fetch(`/admin/vpn/user/${userId}/add-link/`, {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/x-www-form-urlencoded',
-                            'X-CSRFToken': csrfToken
-                        },
-                        body: `server_id=${serverId}&comment=${encodeURIComponent(comment)}`
-                    });
-                    
-                    const data = await response.json();
-                    
-                    if (data.success) {
-                        showMessage(`✅ New link created successfully: ${data.link}`);
-                        setTimeout(() => window.location.reload(), 1000);
-                    } else {
-                        showMessage(`❌ Error: ${data.error}`, 'error');
-                    }
-                } catch (error) {
-                    showMessage(`❌ Network error: ${error.message}`, 'error');
-                } finally {
-                    this.textContent = originalText;
-                    this.disabled = false;
-                }
-            });
-        });
-        
-        // Delete link functionality
-        document.querySelectorAll('.delete-link-btn').forEach(btn => {
-            btn.addEventListener('click', async function() {
-                const linkId = this.dataset.linkId;
-                const linkName = this.dataset.linkName;
-                
-                if (!confirm(`Are you sure you want to delete link ${linkName}?`)) {
-                    return;
-                }
-                
-                const originalText = this.textContent;
-                this.textContent = '⏳ Deleting...';
-                this.disabled = true;
-                
-                try {
-                    const response = await fetch(`/admin/vpn/user/${userId}/delete-link/${linkId}/`, {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/x-www-form-urlencoded',
-                            'X-CSRFToken': csrfToken
-                        }
-                    });
-                    
-                    const data = await response.json();
-                    
-                    if (data.success) {
-                        showMessage(`✅ Link ${linkName} deleted successfully`);
-                        this.closest('.link-item')?.remove();
-                    } else {
-                        showMessage(`❌ Error: ${data.error}`, 'error');
-                    }
-                } catch (error) {
-                    showMessage(`❌ Network error: ${error.message}`, 'error');
-                } finally {
-                    this.textContent = originalText;
-                    this.disabled = false;
-                }
-            });
-        });
-        
-        // Add server access functionality
-        document.querySelectorAll('.add-server-btn').forEach(btn => {
-            btn.addEventListener('click', async function() {
-                const serverId = this.dataset.serverId;
-                const serverName = this.dataset.serverName;
-                
-                if (!confirm(`Add access to server ${serverName}?`)) {
-                    return;
-                }
-                
-                const originalText = this.textContent;
-                this.textContent = '⏳ Adding...';
-                this.disabled = true;
-                
-                try {
-                    const response = await fetch(`/admin/vpn/user/${userId}/add-server-access/`, {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/x-www-form-urlencoded',
-                            'X-CSRFToken': csrfToken
-                        },
-                        body: `server_id=${serverId}`
-                    });
-                    
-                    const data = await response.json();
-                    
-                    if (data.success) {
-                        showMessage(`✅ Access to ${serverName} added successfully`);
-                        setTimeout(() => window.location.reload(), 1000);
-                    } else {
-                        showMessage(`❌ Error: ${data.error}`, 'error');
-                    }
-                } catch (error) {
-                    showMessage(`❌ Network error: ${error.message}`, 'error');
-                } finally {
-                    this.textContent = originalText;
-                    this.disabled = false;
-                }
-            });
-        });
-    });
-    </script>
-    {% endif %}
-{% endblock %}
diff --git a/vpn/templates/admin/vpn/usersubscription/change_form.html b/vpn/templates/admin/vpn/usersubscription/change_form.html
deleted file mode 100644
index 5da9a6f..0000000
--- a/vpn/templates/admin/vpn/usersubscription/change_form.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "admin/change_form.html" %}
-
-{% block content %}
-    {% if show_tab_navigation %}
-    <div class="module" style="margin-bottom: 20px;">
-        <div style="display: flex; border-bottom: 1px solid #ddd;">
-            {% for tab in tabs %}
-            <a href="{{ tab.url }}" 
-               style="padding: 10px 20px; text-decoration: none; border-bottom: 3px solid {% if tab.active %}#417690{% else %}transparent{% endif %}; color: {% if tab.active %}#417690{% else %}#666{% endif %};">
-                {% if tab.name == 'subscription_groups' %}📋{% elif tab.name == 'user_subscriptions' %}👥{% elif tab.name == 'certificates' %}🔒{% elif tab.name == 'inbound_templates' %}⚙️{% endif %} {{ tab.label }}
-            </a>
-            {% endfor %}
-        </div>
-    </div>
-    {% endif %}
-    
-    {{ block.super }}
-{% endblock %}
\ No newline at end of file
diff --git a/vpn/templates/admin/vpn/usersubscription/change_list.html b/vpn/templates/admin/vpn/usersubscription/change_list.html
deleted file mode 100644
index 3dcf650..0000000
--- a/vpn/templates/admin/vpn/usersubscription/change_list.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "admin/change_list.html" %}
-
-{% block content %}
-    {% if show_tab_navigation %}
-    <div class="module" style="margin-bottom: 20px;">
-        <div style="display: flex; border-bottom: 1px solid #ddd;">
-            {% for tab in tabs %}
-            <a href="{{ tab.url }}" 
-               style="padding: 10px 20px; text-decoration: none; border-bottom: 3px solid {% if tab.active %}#417690{% else %}transparent{% endif %}; color: {% if tab.active %}#417690{% else %}#666{% endif %};">
-                {% if tab.name == 'subscription_groups' %}📋{% elif tab.name == 'user_subscriptions' %}👥{% elif tab.name == 'certificates' %}🔒{% elif tab.name == 'inbound_templates' %}⚙️{% endif %} {{ tab.label }}
-            </a>
-            {% endfor %}
-        </div>
-    </div>
-    {% endif %}
-    
-    {{ block.super }}
-{% endblock %}
\ No newline at end of file
diff --git a/vpn/templates/vpn/user_portal.html b/vpn/templates/vpn/user_portal.html
deleted file mode 100644
index ed52865..0000000
--- a/vpn/templates/vpn/user_portal.html
+++ /dev/null
@@ -1,765 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>VPN Access Portal - {{ user.username }}</title>
-    <style>
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
-            background: linear-gradient(135deg, #0c0c0c 0%, #1a1a1a 100%);
-            color: #e0e0e0;
-            min-height: 100vh;
-            line-height: 1.6;
-        }
-
-        .container {
-            max-width: 1200px;
-            margin: 0 auto;
-            padding: 20px;
-        }
-
-        .header {
-            background: rgba(255, 255, 255, 0.05);
-            backdrop-filter: blur(10px);
-            border: 1px solid rgba(255, 255, 255, 0.1);
-            border-radius: 20px;
-            padding: 30px;
-            margin-bottom: 30px;
-            text-align: center;
-        }
-
-        .header h1 {
-            color: #4ade80;
-            font-size: 2.5rem;
-            margin-bottom: 10px;
-            font-weight: 700;
-        }
-
-        .header .subtitle {
-            color: #9ca3af;
-            font-size: 1.1rem;
-            margin-bottom: 20px;
-        }
-
-        .stats {
-            display: flex;
-            justify-content: center;
-            gap: 40px;
-            margin-top: 20px;
-            flex-wrap: wrap;
-        }
-
-        .stat {
-            text-align: center;
-        }
-
-        .stat-number {
-            display: block;
-            font-size: 2rem;
-            font-weight: bold;
-            color: #4ade80;
-        }
-
-        .stat-label {
-            color: #9ca3af;
-            font-size: 0.9rem;
-        }
-
-        .stats-info {
-            margin-top: 15px;
-            text-align: center;
-        }
-
-        .stats-info p {
-            color: #6b7280;
-            font-size: 0.85rem;
-            margin: 0;
-            opacity: 0.8;
-        }
-
-        .servers-grid {
-            display: grid;
-            grid-template-columns: repeat(auto-fit, minmax(400px, 1fr));
-            gap: 30px;
-            margin-bottom: 40px;
-        }
-
-        .server-card {
-            background: rgba(255, 255, 255, 0.05);
-            backdrop-filter: blur(10px);
-            border: 1px solid rgba(255, 255, 255, 0.1);
-            border-radius: 20px;
-            padding: 30px;
-            transition: all 0.3s ease;
-        }
-
-        .server-card:hover {
-            transform: translateY(-5px);
-            border-color: #4ade80;
-            box-shadow: 0 20px 40px rgba(74, 222, 128, 0.1);
-        }
-
-        .server-header {
-            display: flex;
-            align-items: flex-start;
-            justify-content: space-between;
-            margin-bottom: 20px;
-            flex-wrap: wrap;
-            gap: 15px;
-        }
-
-        .server-info {
-            flex: 1;
-        }
-
-        .server-name {
-            font-size: 1.5rem;
-            font-weight: 600;
-            color: #fff;
-            margin-bottom: 5px;
-        }
-
-        .server-stats {
-            display: flex;
-            gap: 15px;
-            flex-wrap: wrap;
-        }
-
-        .connection-count {
-            color: #9ca3af;
-            font-size: 0.85rem;
-            background: rgba(74, 222, 128, 0.1);
-            padding: 4px 8px;
-            border-radius: 12px;
-            border: 1px solid rgba(74, 222, 128, 0.2);
-            transition: all 0.3s ease;
-        }
-
-        .connection-count:hover {
-            background: rgba(74, 222, 128, 0.2);
-            border-color: rgba(74, 222, 128, 0.4);
-            transform: scale(1.05);
-        }
-
-        .server-type {
-            background: #4ade80;
-            color: #000;
-            padding: 5px 12px;
-            border-radius: 20px;
-            font-size: 0.8rem;
-            font-weight: 600;
-            text-transform: uppercase;
-            align-self: flex-start;
-        }
-
-        .server-status {
-            margin-bottom: 20px;
-        }
-
-        .status-indicator {
-            display: inline-flex;
-            align-items: center;
-            gap: 8px;
-            padding: 8px 16px;
-            border-radius: 25px;
-            font-size: 0.9rem;
-            font-weight: 500;
-        }
-
-        .status-online {
-            background: rgba(74, 222, 128, 0.2);
-            color: #4ade80;
-            border: 1px solid rgba(74, 222, 128, 0.3);
-        }
-
-        .status-offline {
-            background: rgba(248, 113, 113, 0.2);
-            color: #f87171;
-            border: 1px solid rgba(248, 113, 113, 0.3);
-        }
-
-        .status-dot {
-            width: 8px;
-            height: 8px;
-            border-radius: 50%;
-            background: currentColor;
-        }
-
-        .links-container {
-            display: grid;
-            gap: 15px;
-        }
-
-        .link-item {
-            background: rgba(0, 0, 0, 0.3);
-            border: 1px solid rgba(255, 255, 255, 0.1);
-            border-radius: 15px;
-            padding: 20px;
-            transition: all 0.3s ease;
-        }
-
-        .link-item:hover {
-            background: rgba(0, 0, 0, 0.5);
-            border-color: rgba(74, 222, 128, 0.5);
-        }
-
-        .link-header {
-            display: flex;
-            justify-content: space-between;
-            align-items: flex-start;
-            margin-bottom: 15px;
-            flex-wrap: wrap;
-            gap: 15px;
-        }
-
-        .link-info {
-            flex: 1;
-            min-width: 200px;
-        }
-
-        .link-comment {
-            font-weight: 600;
-            color: #fff;
-            margin-bottom: 5px;
-        }
-
-        .link-stats {
-            display: flex;
-            gap: 10px;
-            flex-wrap: wrap;
-        }
-
-        .last-used {
-            color: #9ca3af;
-            font-size: 0.8rem;
-            background: rgba(156, 163, 175, 0.1);
-            padding: 3px 8px;
-            border-radius: 10px;
-            border: 1px solid rgba(156, 163, 175, 0.2);
-            transition: all 0.3s ease;
-        }
-
-        .last-used:hover {
-            background: rgba(156, 163, 175, 0.2);
-            border-color: rgba(156, 163, 175, 0.4);
-            transform: scale(1.05);
-        }
-
-        .usage-count {
-            color: #9ca3af;
-            font-size: 0.8rem;
-            background: rgba(59, 130, 246, 0.1);
-            padding: 3px 8px;
-            border-radius: 10px;
-            border: 1px solid rgba(59, 130, 246, 0.2);
-            transition: all 0.3s ease;
-        }
-
-        .usage-count:hover {
-            background: rgba(59, 130, 246, 0.2);
-            border-color: rgba(59, 130, 246, 0.4);
-            transform: scale(1.05);
-        }
-
-        .recent-count {
-            color: #9ca3af;
-            font-size: 0.8rem;
-            background: rgba(168, 85, 247, 0.1);
-            padding: 3px 8px;
-            border-radius: 10px;
-            border: 1px solid rgba(168, 85, 247, 0.2);
-            transition: all 0.3s ease;
-        }
-
-        .recent-count:hover {
-            background: rgba(168, 85, 247, 0.2);
-            border-color: rgba(168, 85, 247, 0.4);
-            transform: scale(1.05);
-        }
-
-        .usage-chart {
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            background: rgba(0, 0, 0, 0.2);
-            padding: 12px;
-            border-radius: 12px;
-            border: 1px solid rgba(255, 255, 255, 0.1);
-            min-width: 170px;
-        }
-
-        .chart-title {
-            color: #9ca3af;
-            font-size: 0.7rem;
-            margin-bottom: 8px;
-            text-align: center;
-            font-weight: 500;
-        }
-
-        .chart-bars {
-            display: flex;
-            align-items: end;
-            gap: 1px;
-            height: 30px;
-            width: 150px;
-        }
-
-        .chart-bar {
-            background: linear-gradient(to top, #4ade80, #22c55e);
-            width: 4px;
-            border-radius: 1px 1px 0 0;
-            transition: all 0.3s ease;
-            min-height: 2px;
-            opacity: 0.7;
-            transform-origin: bottom;
-        }
-
-        .chart-bar:hover {
-            opacity: 1;
-            transform: scaleY(1.1);
-            background: linear-gradient(to top, #22c55e, #16a34a);
-        }
-
-        .chart-bar.zero {
-            background: rgba(107, 114, 128, 0.3);
-            height: 2px !important;
-        }
-
-        .link-url {
-            background: rgba(0, 0, 0, 0.5);
-            padding: 12px;
-            border-radius: 8px;
-            font-family: 'Monaco', 'Consolas', monospace;
-            font-size: 0.9rem;
-            color: #4ade80;
-            word-break: break-all;
-            margin-bottom: 15px;
-            position: relative;
-        }
-
-        .copy-btn {
-            position: absolute;
-            top: 8px;
-            right: 8px;
-            background: #4ade80;
-            color: #000;
-            border: none;
-            padding: 4px 8px;
-            border-radius: 4px;
-            cursor: pointer;
-            font-size: 0.7rem;
-            font-weight: 600;
-            transition: all 0.3s ease;
-        }
-
-        .copy-btn:hover {
-            background: #22c55e;
-        }
-
-        .footer {
-            text-align: center;
-            padding: 40px 20px;
-            color: #6b7280;
-            border-top: 1px solid rgba(255, 255, 255, 0.1);
-            margin-top: 40px;
-        }
-
-        .footer a {
-            color: #4ade80;
-            text-decoration: none;
-        }
-
-        .footer a:hover {
-            text-decoration: underline;
-        }
-
-        @media (max-width: 768px) {
-            .servers-grid {
-                grid-template-columns: 1fr;
-            }
-
-            .header h1 {
-                font-size: 2rem;
-            }
-
-            .stats {
-                gap: 15px;
-            }
-
-            .stat {
-                min-width: 120px;
-            }
-
-            .server-card {
-                padding: 20px;
-            }
-
-            .server-header {
-                flex-direction: column;
-                align-items: flex-start;
-                gap: 10px;
-            }
-
-            .server-stats {
-                gap: 10px;
-            }
-
-            .link-stats {
-                gap: 8px;
-            }
-            
-            .usage-chart {
-                min-width: 160px;
-                padding: 8px;
-            }
-            
-            .chart-bars {
-                width: 120px;
-                height: 25px;
-            }
-            
-            .chart-bar {
-                width: 3px;
-            }
-        }
-
-        .no-servers {
-            text-align: center;
-            padding: 60px 20px;
-            color: #9ca3af;
-        }
-
-        .no-servers h3 {
-            font-size: 1.5rem;
-            margin-bottom: 10px;
-            color: #6b7280;
-        }
-    </style>
-</head>
-<body>
-    <div class="container">
-        <div class="header">
-            <h1>🚀 VPN Access Portal</h1>
-            <div class="subtitle">Welcome back, <strong>{{ user.username }}</strong></div>
-            <div class="stats">
-                <div class="stat">
-                    <span class="stat-number">{{ total_groups }}</span>
-                    <span class="stat-label">Subscription Groups</span>
-                </div>
-                <div class="stat">
-                    <span class="stat-number">{{ total_inbounds }}</span>
-                    <span class="stat-label">Available Inbounds</span>
-                </div>
-                <div class="stat">
-                    <span class="stat-number">{{ total_connections }}</span>
-                    <span class="stat-label">Total Uses</span>
-                </div>
-                <div class="stat">
-                    <span class="stat-number">{{ recent_connections }}</span>
-                    <span class="stat-label">Last 30 Days</span>
-                </div>
-            </div>
-            <div class="stats-info">
-                {% if total_connections == 0 and total_links > 0 %}
-                <p>📊 Statistics cache is empty. Run update in Admin → Task Execution Logs</p>
-                {% else %}
-                <p>📊 Statistics are updated every 5 minutes and show your connection history</p>
-                {% endif %}
-            </div>
-            
-            <!-- Xray Subscription Link -->
-            {% if has_xray_access %}
-            <div class="xray-subscription" style="margin-top: 20px; padding: 15px; background: rgba(148, 163, 184, 0.1); border: 1px solid rgba(148, 163, 184, 0.3); border-radius: 12px;">
-                <h3 style="color: #94a3b8; margin-bottom: 10px; font-size: 1.1rem;">🚀 Xray Universal Subscription</h3>
-                <p style="color: #64748b; font-size: 0.9rem; margin-bottom: 10px;">
-                    One link for all your Xray protocols (VLESS, VMess, Trojan)
-                </p>
-                <div class="link-url" style="margin-bottom: 0;">
-                    {{ force_scheme|default:request.scheme }}://{{ request.get_host }}/xray/{{ user.hash }}
-                    <button class="copy-btn" onclick="copyToClipboard('{{ force_scheme|default:request.scheme }}://{{ request.get_host }}/xray/{{ user.hash }}')">Copy</button>
-                </div>
-            </div>
-            {% endif %}
-        </div>
-
-        {% if groups_data %}
-            <div class="servers-grid">
-                {% for group_name, group_data in groups_data.items %}
-                <div class="server-card">
-                    <div class="server-header">
-                        <div class="server-info">
-                            <div class="server-name">{{ group_name }}</div>
-                            <div class="server-stats">
-                                <span class="connection-count">🔗 {{ group_data.deployed_count }} inbound(s)</span>
-                            </div>
-                        </div>
-                        <div class="server-type">Xray Group</div>
-                    </div>
-
-                    <div class="server-status">
-                        <div class="status-indicator status-online">
-                            <div class="status-dot"></div>
-                            Active Subscription
-                        </div>
-                    </div>
-
-                    <!-- Individual Subscription Link for this Group -->
-                    <div class="links-container">
-                        <div class="link-item">
-                            <div class="link-header">
-                                <div class="link-info">
-                                    <div class="link-comment">🚀 {{ group_name }} Subscription</div>
-                                    <div class="link-stats">
-                                        <span class="last-used">🔗 {{ group_data.deployed_count }} inbound(s)</span>
-                                    </div>
-                                </div>
-                                <div class="usage-chart">
-                                    <div class="chart-title">Protocols</div>
-                                    <div style="display: flex; flex-direction: column; gap: 5px; align-items: center;">
-                                        {% for inbound_data in group_data.inbounds %}
-                                        <div style="background: rgba(74, 222, 128, 0.2); padding: 3px 8px; border-radius: 8px; font-size: 0.7rem; color: #4ade80;">
-                                            {{ inbound_data.server_name }}: {{ inbound_data.protocol|upper }}:{{ inbound_data.port }}
-                                        </div>
-                                        {% endfor %}
-                                    </div>
-                                </div>
-                            </div>
-                            
-                            <div class="link-url">
-                                {{ force_scheme|default:request.scheme }}://{{ request.get_host }}/xray/{{ user.hash }}?group={{ group_name }}
-                                <button class="copy-btn" onclick="copyToClipboard('{{ force_scheme|default:request.scheme }}://{{ request.get_host }}/xray/{{ user.hash }}?group={{ group_name }}')">Copy</button>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-                {% endfor %}
-            </div>
-        {% else %}
-            <div class="no-servers">
-                <h3>No Xray Subscriptions Available</h3>
-                <p>You don't have access to any subscription groups yet. Please contact your administrator.</p>
-            </div>
-        {% endif %}
-
-        <!-- Show old ACL links for backwards compatibility -->
-        {% if has_old_links %}
-        <h2 style="color: #9ca3af; margin: 40px 0 20px 0; text-align: center;">Legacy Shadowsocks Access</h2>
-        <div class="servers-grid">
-            {% for acl_link in acl_links %}
-            <div class="server-card" style="opacity: 0.7;">
-                <div class="server-header">
-                    <div class="server-info">
-                        <div class="server-name">{{ acl_link.acl.server.name }}</div>
-                        <div class="server-stats">
-                            <span class="connection-count">📊 Legacy</span>
-                        </div>
-                    </div>
-                    <div class="server-type">Shadowsocks</div>
-                </div>
-
-                <div class="server-status">
-                    <div class="status-indicator status-online">
-                        <div class="status-dot"></div>
-                        Legacy Access
-                    </div>
-                </div>
-
-                <div class="links-container">
-                    <div class="link-item">
-                        <div class="link-header">
-                            <div class="link-info">
-                                <div class="link-comment">📱 {{ acl_link.comment }}</div>
-                                <div class="link-stats">
-                                    <span class="last-used">🕒 {{ acl_link.last_access_time|default:"Never used" }}</span>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <div class="link-url">
-                            {{ external_address }}/ss/{{ acl_link.link }}#{{ acl_link.acl.server.name }}
-                            <button class="copy-btn" onclick="copyToClipboard('{{ external_address }}/ss/{{ acl_link.link }}#{{ acl_link.acl.server.name }}')">Copy</button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            {% endfor %}
-        </div>
-        {% endif %}
-
-        <div class="footer">
-            <p>Powered by <a href="https://github.com/house-of-vanity/OutFleet" target="_blank">OutFleet VPN Manager</a></p>
-            <p>Keep this link secure and don't share it with others</p>
-        </div>
-    </div>
-
-    <script>
-        // Copy to clipboard functionality
-        async function copyToClipboard(text) {
-            try {
-                await navigator.clipboard.writeText(text);
-                
-                // Visual feedback
-                const event = new CustomEvent('copied');
-                document.dispatchEvent(event);
-                
-                // Show temporary feedback
-                showCopyFeedback();
-            } catch (err) {
-                // Fallback for older browsers
-                const textArea = document.createElement('textarea');
-                textArea.value = text;
-                document.body.appendChild(textArea);
-                textArea.select();
-                document.execCommand('copy');
-                document.body.removeChild(textArea);
-                showCopyFeedback();
-            }
-        }
-
-        function showCopyFeedback() {
-            // Create and show a toast notification
-            const toast = document.createElement('div');
-            toast.textContent = 'Link copied to clipboard! ✓';
-            toast.style.cssText = `
-                position: fixed;
-                top: 20px;
-                right: 20px;
-                background: #4ade80;
-                color: #000;
-                padding: 12px 20px;
-                border-radius: 8px;
-                font-weight: 600;
-                z-index: 1000;
-                animation: slideIn 0.3s ease;
-            `;
-            
-            document.body.appendChild(toast);
-            
-            setTimeout(() => {
-                toast.style.animation = 'slideOut 0.3s ease';
-                setTimeout(() => document.body.removeChild(toast), 300);
-            }, 2000);
-        }
-
-        // Add animation styles
-        const style = document.createElement('style');
-        style.textContent = `
-            @keyframes slideIn {
-                from { transform: translateX(100%); opacity: 0; }
-                to { transform: translateX(0); opacity: 1; }
-            }
-            @keyframes slideOut {
-                from { transform: translateX(0); opacity: 1; }
-                to { transform: translateX(100%); opacity: 0; }
-            }
-            @keyframes pulse {
-                0% { transform: scale(1); }
-                50% { transform: scale(1.1); }
-                100% { transform: scale(1); }
-            }
-            @keyframes barGrow {
-                from { transform: scaleY(0); }
-                to { transform: scaleY(1); }
-            }
-        `;
-        document.head.appendChild(style);
-
-        // Update page title with username
-        document.title = `VPN Portal - {{ user.username }}`;
-        
-        // Add some interactivity on load
-        document.addEventListener('DOMContentLoaded', function() {
-            // Initialize chart bars
-            initializeCharts();
-            
-            // Animate cards on load
-            const cards = document.querySelectorAll('.server-card');
-            cards.forEach((card, index) => {
-                card.style.opacity = '0';
-                card.style.transform = 'translateY(20px)';
-                
-                setTimeout(() => {
-                    card.style.transition = 'all 0.6s ease';
-                    card.style.opacity = '1';
-                    card.style.transform = 'translateY(0)';
-                }, index * 150);
-            });
-            
-            // Animate stat numbers
-            const statNumbers = document.querySelectorAll('.stat-number');
-            statNumbers.forEach((stat, index) => {
-                const finalValue = parseInt(stat.textContent);
-                if (finalValue > 0) {
-                    stat.textContent = '0';
-                    let current = 0;
-                    const increment = Math.ceil(finalValue / 20);
-                    const timer = setInterval(() => {
-                        current += increment;
-                        if (current >= finalValue) {
-                            stat.textContent = finalValue;
-                            clearInterval(timer);
-                        } else {
-                            stat.textContent = current;
-                        }
-                    }, 50);
-                }
-            });
-            
-            // Add pulse animation to connection counts
-            setTimeout(() => {
-                const connectionCounts = document.querySelectorAll('.connection-count, .usage-count, .recent-count');
-                connectionCounts.forEach((count, index) => {
-                    setTimeout(() => {
-                        count.style.animation = 'pulse 0.6s ease-in-out';
-                    }, index * 100);
-                });
-            }, 1000);
-            
-            // Animate chart bars
-            setTimeout(() => {
-                const chartBars = document.querySelectorAll('.chart-bar');
-                chartBars.forEach((bar, index) => {
-                    setTimeout(() => {
-                        bar.style.animation = 'barGrow 0.8s ease-out';
-                    }, index * 50);
-                });
-            }, 1500);
-        });
-        
-        function initializeCharts() {
-            const charts = document.querySelectorAll('.usage-chart');
-            
-            charts.forEach(chart => {
-                const maxValue = parseInt(chart.dataset.max) || 1;
-                const bars = chart.querySelectorAll('.chart-bar');
-                
-                bars.forEach(bar => {
-                    const height = parseInt(bar.dataset.height) || 0;
-                    const maxHeight = parseInt(bar.dataset.max) || 1;
-                    
-                    if (height === 0) {
-                        bar.classList.add('zero');
-                        bar.style.height = '2px';
-                    } else {
-                        // Calculate height as percentage of container (30px max)
-                        const percentage = Math.max(10, (height / Math.max(maxHeight, 1)) * 100);
-                        const pixelHeight = Math.max(3, (percentage / 100) * 28); // 28px max for padding
-                        bar.style.height = pixelHeight + 'px';
-                        
-                        // Add tooltip
-                        bar.title = `${height} connections`;
-                    }
-                });
-            });
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/vpn/templates/vpn/user_portal_error.html b/vpn/templates/vpn/user_portal_error.html
deleted file mode 100644
index 2025853..0000000
--- a/vpn/templates/vpn/user_portal_error.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{ error_title }} - VPN Portal</title>
-    <style>
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
-            background: linear-gradient(135deg, #0c0c0c 0%, #1a1a1a 100%);
-            color: #e0e0e0;
-            min-height: 100vh;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            line-height: 1.6;
-        }
-
-        .error-container {
-            max-width: 500px;
-            padding: 40px;
-            text-align: center;
-        }
-
-        .error-card {
-            background: rgba(255, 255, 255, 0.05);
-            backdrop-filter: blur(10px);
-            border: 1px solid rgba(255, 255, 255, 0.1);
-            border-radius: 20px;
-            padding: 40px;
-            animation: fadeInUp 0.6s ease;
-        }
-
-        .error-icon {
-            font-size: 4rem;
-            margin-bottom: 20px;
-            opacity: 0.7;
-        }
-
-        .error-title {
-            color: #f87171;
-            font-size: 2rem;
-            font-weight: 700;
-            margin-bottom: 15px;
-        }
-
-        .error-message {
-            color: #9ca3af;
-            font-size: 1.1rem;
-            margin-bottom: 30px;
-            line-height: 1.6;
-        }
-
-        .back-link {
-            display: inline-block;
-            background: #4ade80;
-            color: #000;
-            padding: 12px 24px;
-            border-radius: 10px;
-            text-decoration: none;
-            font-weight: 600;
-            transition: all 0.3s ease;
-        }
-
-        .back-link:hover {
-            background: #22c55e;
-            transform: translateY(-2px);
-        }
-
-        .footer {
-            margin-top: 40px;
-            color: #6b7280;
-            font-size: 0.9rem;
-        }
-
-        .footer a {
-            color: #4ade80;
-            text-decoration: none;
-        }
-
-        .footer a:hover {
-            text-decoration: underline;
-        }
-
-        @keyframes fadeInUp {
-            from {
-                opacity: 0;
-                transform: translateY(30px);
-            }
-            to {
-                opacity: 1;
-                transform: translateY(0);
-            }
-        }
-
-        @media (max-width: 768px) {
-            .error-container {
-                padding: 20px;
-            }
-
-            .error-card {
-                padding: 30px 20px;
-            }
-
-            .error-title {
-                font-size: 1.5rem;
-            }
-
-            .error-message {
-                font-size: 1rem;
-            }
-        }
-    </style>
-</head>
-<body>
-    <div class="error-container">
-        <div class="error-card">
-            <div class="error-icon">🚫</div>
-            <h1 class="error-title">{{ error_title }}</h1>
-            <p class="error-message">{{ error_message }}</p>
-            
-            <a href="javascript:history.back()" class="back-link">← Go Back</a>
-        </div>
-
-        <div class="footer">
-            <p>Powered by <a href="https://github.com/house-of-vanity/OutFleet" target="_blank">OutFleet VPN Manager</a></p>
-        </div>
-    </div>
-
-    <script>
-        // Add some interactivity
-        document.addEventListener('DOMContentLoaded', function() {
-            // Auto-refresh every 30 seconds for server errors
-            {% if 'Server Error' in error_title %}
-            setTimeout(() => {
-                window.location.reload();
-            }, 30000);
-            {% endif %}
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/vpn/tests.py b/vpn/tests.py
deleted file mode 100644
index 7ce503c..0000000
--- a/vpn/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/vpn/utils.py b/vpn/utils.py
deleted file mode 100644
index a4054b1..0000000
--- a/vpn/utils.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""
-Utility functions for VPN application
-"""
-import json
-from django.utils.safestring import mark_safe
-
-
-def format_object(data):
-    """
-    Format various data types for display in Django admin interface
-    """
-    try:  
-        if isinstance(data, dict):
-            formatted_data = json.dumps(data, indent=2)
-            return mark_safe(f"<pre>{formatted_data}</pre>")
-        elif isinstance(data, str):
-            return mark_safe(f"<pre>{data}</pre>")
-        else:
-            return mark_safe(f"<pre>{str(data)}</pre>")
-    except Exception as e:
-        return mark_safe(f"<span style='color: red;'>Error: {e}</span>")
\ No newline at end of file
diff --git a/vpn/views.py b/vpn/views.py
deleted file mode 100644
index a6f2725..0000000
--- a/vpn/views.py
+++ /dev/null
@@ -1,635 +0,0 @@
-def userPortal(request, user_hash):
-    """HTML portal for user to view their VPN access links and subscription groups"""
-    from .models import User
-    from .models_xray import UserSubscription, SubscriptionGroup, Inbound
-    from django.utils import timezone
-    from datetime import timedelta
-    import logging
-    
-    logger = logging.getLogger(__name__)
-    
-    try:
-        user = get_object_or_404(User, hash=user_hash)
-        logger.info(f"User portal accessed for user {user.username}")
-    except Http404:
-        logger.warning(f"User portal access attempt with invalid hash: {user_hash}")
-        return render(request, 'vpn/user_portal_error.html', {
-            'error_title': 'Access Denied',
-            'error_message': 'Invalid access link. Please contact your administrator.'
-        }, status=403)
-    
-    try:
-        # Get all active subscription groups for the user
-        user_subscriptions = UserSubscription.objects.filter(
-            user=user, 
-            active=True,
-            subscription_group__is_active=True
-        ).select_related('subscription_group').prefetch_related('subscription_group__inbounds')
-        
-        logger.info(f"Found {user_subscriptions.count()} active subscription groups for user {user.username}")
-        
-        # Calculate overall Xray subscription statistics
-        from .models import AccessLog
-        total_connections = AccessLog.objects.filter(
-            user=user.username,
-            action='Success',
-            server='Xray-Subscription'
-        ).count()
-        
-        recent_connections = AccessLog.objects.filter(
-            user=user.username,
-            action='Success',
-            server='Xray-Subscription',
-            timestamp__gte=timezone.now() - timedelta(days=30)
-        ).count()
-        
-        logger.info(f"Xray statistics for user {user.username}: total={total_connections}, recent={recent_connections}")
-        
-        # Determine protocol scheme
-        scheme = 'https'  # Always use HTTPS as SSL is handled by ingress
-        
-        # Group inbounds by subscription group
-        groups_data = {}
-        total_inbounds = 0
-        
-        for subscription in user_subscriptions:
-            group = subscription.subscription_group
-            group_name = group.name
-            logger.debug(f"Processing subscription group {group_name}")
-            
-            # Get all deployed inbounds for this group (count actual server deployments)
-            from .models_xray import ServerInbound
-            deployed_inbounds = ServerInbound.objects.filter(
-                inbound__in=group.inbounds.all(),
-                active=True
-            ).select_related('inbound', 'server')
-            
-            # Calculate connections for this specific group
-            group_connections = AccessLog.objects.filter(
-                user=user.username,
-                action='Success',
-                server='Xray-Subscription',
-                data__icontains=f'"group": "{group_name}"'
-            ).count()
-            
-            groups_data[group_name] = {
-                'group': group,
-                'subscription': subscription,
-                'inbounds': [],
-                'total_connections': group_connections,
-                'deployed_count': deployed_inbounds.count(),  # Actual deployed inbounds count
-            }
-            
-            # Process each deployed inbound (each server-inbound combination)
-            for server_inbound in deployed_inbounds:
-                inbound = server_inbound.inbound
-                logger.debug(f"Processing inbound {inbound.name} in group {group_name}")
-                
-                # Generate connection URLs based on protocol
-                connection_urls = []
-                
-                if inbound.protocol == 'vless':
-                    # Generate VLESS URL - this is a placeholder implementation
-                    # In the real implementation, you'd generate proper VLESS URLs with user UUID
-                    connection_url = f"vless://user-uuid@{get_external_host()}:{inbound.port}#{inbound.name}"
-                    connection_urls.append({
-                        'url': connection_url,
-                        'protocol': 'VLESS',
-                        'name': inbound.name
-                    })
-                elif inbound.protocol == 'vmess':
-                    # Generate VMess URL - placeholder
-                    connection_url = f"vmess://user-config@{get_external_host()}:{inbound.port}#{inbound.name}"
-                    connection_urls.append({
-                        'url': connection_url,
-                        'protocol': 'VMess',
-                        'name': inbound.name
-                    })
-                elif inbound.protocol == 'trojan':
-                    # Generate Trojan URL - placeholder
-                    connection_url = f"trojan://user-password@{get_external_host()}:{inbound.port}#{inbound.name}"
-                    connection_urls.append({
-                        'url': connection_url,
-                        'protocol': 'Trojan',
-                        'name': inbound.name
-                    })
-                elif inbound.protocol == 'shadowsocks':
-                    # Generate Shadowsocks URL - placeholder
-                    connection_url = f"ss://user-config@{get_external_host()}:{inbound.port}#{inbound.name}"
-                    connection_urls.append({
-                        'url': connection_url,
-                        'protocol': 'Shadowsocks',
-                        'name': inbound.name
-                    })
-                
-                inbound_data = {
-                    'inbound': inbound,
-                    'connection_urls': connection_urls,
-                    'protocol': inbound.protocol.upper(),
-                    'port': inbound.port,
-                    'domain': get_external_host(),
-                    'network': inbound.network,
-                    'security': inbound.security,
-                    'connections': 0,  # Placeholder during transition
-                    'last_access_display': "Never used",  # Placeholder
-                    'server': server_inbound.server,  # Server that deployed this inbound
-                    'server_name': server_inbound.server.name,  # Server name for display
-                }
-                
-                groups_data[group_name]['inbounds'].append(inbound_data)
-                total_inbounds += 1
-                
-                logger.debug(f"Added inbound data for {inbound.name}")
-        
-        logger.info(f"Prepared data for {len(groups_data)} subscription groups and {total_inbounds} total inbounds")
-        logger.info(f"Portal statistics: total_connections={total_connections}, recent_connections={recent_connections}")
-        
-        # Check if user has any Xray subscription groups
-        has_xray_access = user_subscriptions.exists()
-        
-        # Also get old-style ACL links for backwards compatibility
-        acl_links = []
-        try:
-            from .models import ACLLink
-            acl_links = ACLLink.objects.filter(acl__user=user).select_related('acl__server', 'acl')
-        except:
-            pass
-
-        context = {
-            'user': user,
-            'user_subscriptions': user_subscriptions,  # For accessing user's subscriptions in template
-            'groups_data': groups_data,
-            'total_groups': len(groups_data),
-            'total_inbounds': total_inbounds,
-            'total_connections': total_connections,
-            'recent_connections': recent_connections,
-            'external_address': get_external_host(),
-            'has_xray_access': has_xray_access,
-            'force_scheme': scheme,  # Override request.scheme in template
-            'acl_links': acl_links,  # For backwards compatibility
-            'has_old_links': len(acl_links) > 0,
-            'xray_subscription_url': f"https://{request.get_host()}/xray/{user.hash}",
-        }
-        
-        logger.debug(f"Context prepared with keys: {list(context.keys())}")
-        logger.debug(f"Groups in context: {list(groups_data.keys())}")
-        
-        # Log sample group data for debugging
-        for group_name, group_data in groups_data.items():
-            logger.debug(f"Group {group_name}: total_connections={group_data['total_connections']}, inbounds_count={len(group_data['inbounds'])}")
-            for i, inbound_data in enumerate(group_data['inbounds']):
-                logger.debug(f"  Inbound {i}: protocol={inbound_data['protocol']}, port={inbound_data['port']}, connections={inbound_data['connections']}")
-        
-        return render(request, 'vpn/user_portal.html', context)
-        
-    except Exception as e:
-        logger.error(f"Error loading user portal for {user.username}: {e}", exc_info=True)
-        return render(request, 'vpn/user_portal_error.html', {
-            'error_title': 'Server Error',
-            'error_message': 'Unable to load your VPN information. Please try again later or contact support.'
-        }, status=500)
-import yaml
-import json
-import logging
-from django.shortcuts import get_object_or_404, render
-from django.http import JsonResponse, HttpResponse, Http404
-from mysite.settings import EXTERNAL_ADDRESS
-from urllib.parse import urlparse
-
-def get_external_host():
-    """Extract hostname from EXTERNAL_ADDRESS, removing scheme"""
-    parsed = urlparse(EXTERNAL_ADDRESS)
-    if parsed.hostname:
-        return parsed.hostname
-    # If no scheme, assume it's just a hostname
-    return EXTERNAL_ADDRESS
-
-def userFrontend(request, user_hash):
-    from .models import User, ACLLink
-    try:
-        user = get_object_or_404(User, hash=user_hash)
-    except Http404:
-        return JsonResponse({"error": "Not allowed"}, status=403)
-
-    acl_links = {}
-    for link in ACLLink.objects.filter(acl__user=user).select_related('acl__server'):
-        server_name = link.acl.server.name
-        if server_name not in acl_links:
-            acl_links[server_name] = []
-        acl_links[server_name].append({"link": f"https://{request.get_host()}/ss/{link.link}#{link.acl.server.name}", "comment": link.comment})
-
-    return JsonResponse(acl_links)
-
-def shadowsocks(request, link):
-    from .models import ACLLink, AccessLog
-    import logging
-    from django.utils import timezone
-    
-    logger = logging.getLogger(__name__)
-    
-    try:
-        acl_link = get_object_or_404(ACLLink, link=link)
-        acl = acl_link.acl
-        logger.info(f"Found ACL link for user {acl.user.username} on server {acl.server.name}")
-    except Http404:
-        logger.warning(f"ACL link not found: {link}")
-        AccessLog.objects.create(
-            user=None, 
-            server="Unknown", 
-            acl_link_id=link,
-            action="Failed",
-            data=f"ACL not found for link: {link}"
-        )
-        return JsonResponse({"error": "Not allowed"}, status=403)
-
-    try:
-        server_user = acl.server.get_user(acl.user, raw=True)
-        logger.info(f"Successfully retrieved user credentials for {acl.user.username} from {acl.server.name}")
-    except Exception as e:
-        logger.error(f"Failed to get user credentials for {acl.user.username} from {acl.server.name}: {e}")
-        AccessLog.objects.create(
-            user=acl.user.username, 
-            server=acl.server.name, 
-            acl_link_id=acl_link.link,
-            action="Failed",
-            data=f"Failed to get credentials: {e}"
-        )
-        return JsonResponse({"error": f"Couldn't get credentials from server. {e}"}, status=500)
-
-    # Handle both dict and object formats for server_user
-    if isinstance(server_user, dict):
-        password = server_user.get('password', '')
-        method = server_user.get('method', 'aes-128-gcm')
-        port = server_user.get('port', 8080)
-        access_url = server_user.get('access_url', '')
-    else:
-        password = getattr(server_user, 'password', '')
-        method = getattr(server_user, 'method', 'aes-128-gcm')
-        port = getattr(server_user, 'port', 8080)
-        access_url = getattr(server_user, 'access_url', '')
-
-    if request.GET.get('mode') == 'json':
-      config = {
-          "info": "Managed by OutFleet_2 [github.com/house-of-vanity/OutFleet/]",
-          "password": password,
-          "method": method,
-          "prefix": "\u0005\u00dc_\u00e0\u0001",
-          "server": acl.server.client_hostname,
-          "server_port": port,
-          "access_url": access_url,
-          "outfleet": {
-              "acl_link": link,
-              "server_name": acl.server.name,
-              "server_type": acl.server.server_type,
-          }
-      }
-      response = json.dumps(config, indent=2)
-    else:
-      config = {
-          "transport": {
-             "$type": "tcpudp",
-             "tcp": {
-                  "$type": "shadowsocks",
-                  "endpoint": f"{acl.server.client_hostname}:{port}",
-                  "cipher": f"{method}",
-                  "secret": f"{password}",
-                  "prefix": "\u0005\u00dc_\u00e0\u0001"
-             },
-             "udp": {
-                  "$type": "shadowsocks",
-                  "endpoint": f"{acl.server.client_hostname}:{port}",
-                  "cipher": f"{method}",
-                  "secret": f"{password}",
-                  "prefix": "\u0005\u00dc_\u00e0\u0001"
-              }
-          }
-      }
-      response = yaml.dump(config, allow_unicode=True)
-
-    # Update last access time for this specific link
-    acl_link.last_access_time = timezone.now()
-    acl_link.save(update_fields=['last_access_time'])
-    
-    # Create AccessLog with specific link tracking
-    AccessLog.objects.create(
-        user=acl.user.username, 
-        server=acl.server.name, 
-        acl_link_id=acl_link.link,
-        action="Success", 
-        data=response
-    )
-
-    return HttpResponse(response, content_type=f"{ 'application/json; charset=utf-8' if request.GET.get('mode') == 'json' else 'text/html' }")
-
-
-def xray_subscription(request, user_hash):
-    """
-    Return Xray subscription with all available protocols for the user.
-    This generates configs based on user's subscription groups.
-    """
-    from .models import User, AccessLog
-    from .models_xray import UserSubscription
-    import logging
-    from django.utils import timezone
-    import base64
-    import uuid
-    import json
-    
-    logger = logging.getLogger(__name__)
-    
-    # Clean user_hash from any trailing slashes
-    user_hash = user_hash.rstrip('/')
-    
-    try:
-        user = get_object_or_404(User, hash=user_hash)
-        logger.info(f"Found user {user.username} for Xray subscription generation")
-    except Http404:
-        logger.warning(f"User not found for hash: {user_hash}")
-        AccessLog.objects.create(
-            user=None, 
-            server="Unknown", 
-            acl_link_id=user_hash,
-            action="Failed",
-            data=f"User not found for hash: {user_hash}"
-        )
-        return HttpResponse("Not found", status=404)
-
-    # Check if this is a JSON request for web display
-    if request.GET.get('format') == 'json':
-        return xray_subscription_json(request, user, user_hash)
-
-    try:
-        # Check if specific group is requested
-        group_filter = request.GET.get('group')
-        
-        # Get subscription groups for the user
-        user_subscriptions = UserSubscription.objects.filter(
-            user=user, 
-            active=True,
-            subscription_group__is_active=True
-        ).select_related('subscription_group').prefetch_related('subscription_group__inbounds')
-        
-        # Filter by specific group if requested
-        if group_filter:
-            user_subscriptions = user_subscriptions.filter(subscription_group__name=group_filter)
-            logger.info(f"Filtering subscription for group: {group_filter}")
-        
-        subscription_configs = []
-        
-        for subscription in user_subscriptions:
-            group = subscription.subscription_group
-            logger.info(f"Processing subscription group {group.name} for user {user.username}")
-            
-            # Get all inbounds from this group
-            for inbound in group.inbounds.all():
-                try:
-                    # Find all servers where this inbound is deployed
-                    from .models_xray import ServerInbound
-                    deployed_servers = ServerInbound.objects.filter(
-                        inbound=inbound, 
-                        active=True
-                    ).select_related('server')
-                    
-                    # Generate connection string for each server where inbound is deployed
-                    for server_inbound in deployed_servers:
-                        server = server_inbound.server
-                        # Get server's client_hostname for XrayServerV2
-                        server_hostname = getattr(server.get_real_instance(), 'client_hostname', None)
-                        connection_string = generate_xray_connection_string(user, inbound, server.name, server_hostname)
-                        
-                        if connection_string:
-                            subscription_configs.append(connection_string)
-                            logger.info(f"Added {inbound.protocol} config for inbound {inbound.name} on server {server.name}")
-                        
-                except Exception as e:
-                    logger.warning(f"Failed to generate config for inbound {inbound.name}: {e}")
-                    continue
-        
-        if not subscription_configs:
-            group_msg = f" for group '{group_filter}'" if group_filter else ""
-            logger.warning(f"No Xray configurations found for user {user.username}{group_msg}")
-            AccessLog.objects.create(
-                user=user.username, 
-                server="Xray-Subscription", 
-                acl_link_id=user_hash,
-                action="Failed",
-                data=f"No Xray configurations available{group_msg}"
-            )
-            return HttpResponse(f"No configurations available{group_msg}", status=404)
-        
-        # Join all configs with newlines and encode in base64 for subscription format
-        subscription_content = '\n'.join(subscription_configs)
-        logger.info(f"Raw subscription content for {user.username}: {len(subscription_configs)} configs")
-        
-        subscription_b64 = base64.b64encode(subscription_content.encode('utf-8')).decode('utf-8')
-        logger.info(f"Base64 subscription length: {len(subscription_b64)}")
-        
-        # Create access log
-        group_msg = f" for group '{group_filter}'" if group_filter else ""
-        AccessLog.objects.create(
-            user=user.username, 
-            server="Xray-Subscription", 
-            acl_link_id=user_hash,
-            action="Success", 
-            data=f"Generated subscription with {len(subscription_configs)} configs from {user_subscriptions.count()} groups{group_msg}"
-        )
-        
-        logger.info(f"Generated Xray subscription for {user.username} with {len(subscription_configs)} configs{group_msg}")
-        
-        # Return with proper headers for subscription
-        response = HttpResponse(subscription_b64, content_type="text/plain; charset=utf-8")
-        response['Content-Disposition'] = f'attachment; filename="{user.username}"'
-        response['Cache-Control'] = 'no-cache'
-        
-        # Add subscription-specific headers like other providers
-        import base64 as b64
-        profile_title_b64 = b64.b64encode("OutFleet VPN".encode('utf-8')).decode('utf-8')
-        response['profile-title'] = f'base64:{profile_title_b64}'
-        response['profile-update-interval'] = '24'  # Update every 24 hours
-        response['profile-web-page-url'] = f'https://{request.get_host()}/u/{user_hash}'
-        response['support-url'] = f'https://{request.get_host()}/admin/'
-        
-        # Add user info without limits (unlimited service)
-        # Set very high limits to indicate "unlimited"
-        import time
-        expire_timestamp = int(time.time()) + (365 * 24 * 60 * 60)  # 1 year from now
-        response['subscription-userinfo'] = f'upload=0; download=0; total=1099511627776; expire={expire_timestamp}'
-        
-        return response
-        
-    except Exception as e:
-        logger.error(f"Failed to generate Xray subscription for {user.username}: {e}")
-        AccessLog.objects.create(
-            user=user.username, 
-            server="Xray-Subscription", 
-            acl_link_id=user_hash,
-            action="Failed",
-            data=f"Failed to generate subscription: {e}"
-        )
-        return HttpResponse(f"Error generating subscription: {e}", status=500)
-
-
-def xray_subscription_json(request, user, user_hash):
-    """Return Xray subscription in JSON format for web display"""
-    from .models_xray import UserSubscription
-    import logging
-    
-    logger = logging.getLogger(__name__)
-    
-    try:
-        # Get all active subscription groups for the user
-        user_subscriptions = UserSubscription.objects.filter(
-            user=user, 
-            active=True,
-            subscription_group__is_active=True
-        ).select_related('subscription_group').prefetch_related('subscription_group__inbounds')
-        
-        groups_data = {}
-        
-        for subscription in user_subscriptions:
-            group = subscription.subscription_group
-            group_configs = []
-            
-            # Get all inbounds from this group
-            for inbound in group.inbounds.all():
-                try:
-                    # Find all servers where this inbound is deployed
-                    from .models_xray import ServerInbound
-                    deployed_servers = ServerInbound.objects.filter(
-                        inbound=inbound, 
-                        active=True
-                    ).select_related('server')
-                    
-                    # Generate connection string for each server where inbound is deployed
-                    for server_inbound in deployed_servers:
-                        server = server_inbound.server
-                        # Get server's client_hostname for XrayServerV2
-                        server_hostname = getattr(server.get_real_instance(), 'client_hostname', None)
-                        connection_string = generate_xray_connection_string(user, inbound, server.name, server_hostname)
-                        
-                        if connection_string:
-                            config_name = f"{server.name} {inbound.name}"
-                            group_configs.append({
-                            'name': config_name,
-                            'protocol': inbound.protocol.upper(),
-                            'port': inbound.port,
-                            'network': inbound.network,
-                            'security': inbound.security,
-                            'domain': host,
-                            'connection_string': connection_string
-                        })
-                        
-                except Exception as e:
-                    logger.warning(f"Failed to generate config for inbound {inbound.name}: {e}")
-                    continue
-            
-            if group_configs:
-                groups_data[group.name] = {
-                    'group_name': group.name,
-                    'description': group.description,
-                    'configs': group_configs
-                }
-        
-        return JsonResponse(groups_data)
-        
-    except Exception as e:
-        logger.error(f"Failed to generate Xray JSON for {user.username}: {e}")
-        return JsonResponse({'error': str(e)}, status=500)
-
-
-def generate_xray_connection_string(user, inbound, server_name=None, server_hostname=None):
-    """Generate Xray connection string for user and inbound"""
-    import uuid
-    import base64
-    import json
-    from urllib.parse import quote
-    
-    try:
-        # Generate user UUID based on user ID and inbound
-        user_uuid = str(uuid.uuid5(uuid.NAMESPACE_DNS, f"{user.username}-{inbound.name}"))
-        
-        # Get host (use server's client_hostname if available, fallback to external host)
-        host = server_hostname if server_hostname else get_external_host()
-        
-        if inbound.protocol == 'vless':
-            # VLESS URL format: vless://uuid@host:port?params#name
-            params = []
-            
-            # Always add transport type for VLESS
-            params.append(f"type={inbound.network}")
-            
-            if inbound.security != 'none':
-                params.append(f"security={inbound.security}")
-                if inbound.security == 'tls' and host:
-                    params.append(f"sni={host}")
-            
-            if inbound.network == 'ws':
-                params.append(f"path=/{inbound.name}")
-            elif inbound.network == 'grpc':
-                params.append(f"serviceName={inbound.name}")
-            
-            param_string = '&'.join(params)
-            query_part = f"?{param_string}" if param_string else ""
-            
-            # Generate config name: ServerName InboundName (e.g., "Israel VLESS-Premium")
-            config_name = f"{server_name} {inbound.name}" if server_name else inbound.name
-            connection_string = f"vless://{user_uuid}@{host}:{inbound.port}{query_part}#{quote(config_name)}"
-            
-        elif inbound.protocol == 'vmess':
-            # VMess JSON format encoded in base64
-            # Generate config name: ServerName InboundName (e.g., "Israel VMESS-Premium")
-            config_name = f"{server_name} {inbound.name}" if server_name else inbound.name
-            vmess_config = {
-                "v": "2",
-                "ps": config_name,
-                "add": host,
-                "port": str(inbound.port),
-                "id": user_uuid,
-                "aid": "0",
-                "scy": "auto",
-                "net": inbound.network,
-                "type": "none",
-                "host": host if host else "",
-                "path": f"/{inbound.name}" if inbound.network == 'ws' else "",
-                "tls": inbound.security if inbound.security != 'none' else ""
-            }
-            
-            vmess_json = json.dumps(vmess_config)
-            vmess_b64 = base64.b64encode(vmess_json.encode()).decode()
-            connection_string = f"vmess://{vmess_b64}"
-            
-        elif inbound.protocol == 'trojan':
-            # Trojan URL format: trojan://password@host:port?params#name
-            # Use user UUID as password
-            params = []
-            
-            if inbound.security != 'none' and host:
-                params.append(f"sni={host}")
-            
-            if inbound.network != 'tcp':
-                params.append(f"type={inbound.network}")
-                if inbound.network == 'ws':
-                    params.append(f"path=/{inbound.name}")
-                elif inbound.network == 'grpc':
-                    params.append(f"serviceName={inbound.name}")
-            
-            param_string = '&'.join(params)
-            query_part = f"?{param_string}" if param_string else ""
-            
-            # Generate config name: ServerName InboundName (e.g., "Israel TROJAN-Premium")
-            config_name = f"{server_name} {inbound.name}" if server_name else inbound.name
-            connection_string = f"trojan://{user_uuid}@{host}:{inbound.port}{query_part}#{quote(config_name)}"
-            
-        else:
-            # Fallback for unknown protocols
-            config_name = f"{server_name} {inbound.name}" if server_name else inbound.name
-            connection_string = f"{inbound.protocol}://{user_uuid}@{host}:{inbound.port}#{quote(config_name)}"
-        
-        return connection_string
-        
-    except Exception as e:
-        import logging
-        logger = logging.getLogger(__name__)
-        logger.error(f"Failed to generate connection string for {inbound.name}: {e}")
-        return None
-
diff --git a/vpn/xray_api_v2/__init__.py b/vpn/xray_api_v2/__init__.py
deleted file mode 100644
index 6ce6f91..0000000
--- a/vpn/xray_api_v2/__init__.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""Xray API Python Library"""
-from .client import XrayClient
-from .stats import StatsManager, StatItem, SystemStats
-from .subscription import SubscriptionLinkGenerator
-from .exceptions import (
-    XrayAPIError, XrayConnectionError, XrayCommandError,
-    XrayConfigError, XrayNotFoundError, XrayValidationError
-)
-from .models import (
-    # Base
-    XrayProtocol, TransportProtocol, SecurityType,
-    
-    # Protocols
-    VLESSClient, VMeSSUser, TrojanUser, TrojanFallback,
-    VLESSInboundConfig, VMeSSInboundConfig, TrojanServerConfig,
-    generate_uuid, validate_uuid,
-    
-    # Transports
-    StreamSettings, create_tcp_stream, create_ws_stream, 
-    create_grpc_stream, create_http_stream, create_xhttp_stream,
-    
-    # Security
-    TLSConfig, REALITYConfig,
-    create_tls_config, create_reality_config,
-    generate_self_signed_certificate, create_tls_config_with_self_signed,
-    
-    # Inbound
-    InboundConfig, InboundBuilder, SniffingConfig
-)
-
-__version__ = "0.1.0"
-
-__all__ = [
-    # Client
-    'XrayClient',
-    
-    # Stats
-    'StatsManager', 'StatItem', 'SystemStats',
-    
-    # Subscription
-    'SubscriptionLinkGenerator',
-    
-    # Exceptions
-    'XrayAPIError', 'XrayConnectionError', 'XrayCommandError',
-    'XrayConfigError', 'XrayNotFoundError', 'XrayValidationError',
-    
-    # Enums
-    'XrayProtocol', 'TransportProtocol', 'SecurityType',
-    
-    # Models
-    'VLESSClient', 'VMeSSUser', 'TrojanUser', 'TrojanFallback',
-    'VLESSInboundConfig', 'VMeSSInboundConfig', 'TrojanServerConfig',
-    'StreamSettings', 'TLSConfig', 'REALITYConfig',
-    'InboundConfig', 'InboundBuilder', 'SniffingConfig',
-    
-    # Utils
-    'generate_uuid', 'validate_uuid',
-    'create_tcp_stream', 'create_ws_stream', 
-    'create_grpc_stream', 'create_http_stream', 'create_xhttp_stream',
-    'create_tls_config', 'create_reality_config',
-    'generate_self_signed_certificate', 'create_tls_config_with_self_signed',
-]
\ No newline at end of file
diff --git a/vpn/xray_api_v2/client.py b/vpn/xray_api_v2/client.py
deleted file mode 100644
index 5de12d9..0000000
--- a/vpn/xray_api_v2/client.py
+++ /dev/null
@@ -1,235 +0,0 @@
-"""Xray API client implementation"""
-import json
-import subprocess
-from typing import Dict, Any, List, Optional, Union
-from pathlib import Path
-import tempfile
-import os
-
-from .exceptions import (
-    XrayConnectionError, 
-    XrayCommandError,
-    XrayConfigError
-)
-from .models.base import BaseXrayModel
-
-
-class XrayClient:
-    """Client for interacting with Xray API via CLI commands"""
-    
-    def __init__(self, server: str = "127.0.0.1:8080", timeout: int = 3):
-        """
-        Initialize Xray client
-        
-        Args:
-            server: API server address (host:port)
-            timeout: Command timeout in seconds
-        """
-        self.server = server
-        self.timeout = timeout
-        self._xray_binary = "xray"
-    
-    def execute_command(self, 
-                       command: str,
-                       args: List[str] = None,
-                       json_files: List[Union[str, Dict, BaseXrayModel]] = None) -> Dict[str, Any]:
-        """
-        Execute xray API command
-        
-        Args:
-            command: API command (e.g., 'adi', 'adu', 'lsi')
-            args: Additional command arguments
-            json_files: JSON configurations (paths, dicts, or models)
-            
-        Returns:
-            Command output as dictionary
-        """
-        cmd = [self._xray_binary, "api", command]
-        cmd.extend([f"--server={self.server}", f"--timeout={self.timeout}"])
-        
-        if args:
-            cmd.extend(args)
-        
-        temp_files = []
-        try:
-            # Handle JSON configurations
-            if json_files:
-                for config in json_files:
-                    if isinstance(config, str):
-                        # File path provided
-                        cmd.append(config)
-                    else:
-                        # Create temporary file for dict or model
-                        temp_file = self._create_temp_json(config)
-                        temp_files.append(temp_file)
-                        cmd.append(temp_file.name)
-            
-            # Execute command
-            result = subprocess.run(
-                cmd,
-                capture_output=True,
-                text=True,
-                timeout=self.timeout + 5  # Add buffer to subprocess timeout
-            )
-            
-            if result.returncode != 0:
-                raise XrayCommandError(f"Command failed: {result.stderr}")
-            
-            # Parse output
-            output = result.stdout.strip()
-            if not output:
-                return {}
-                
-            try:
-                return json.loads(output)
-            except json.JSONDecodeError:
-                # Some commands return plain text
-                return {"output": output}
-                
-        except subprocess.TimeoutExpired:
-            raise XrayConnectionError(f"Command timed out after {self.timeout} seconds")
-        except Exception as e:
-            raise XrayCommandError(f"Command execution failed: {str(e)}")
-        finally:
-            # Cleanup temporary files
-            for temp_file in temp_files:
-                try:
-                    os.unlink(temp_file.name)
-                except:
-                    pass
-    
-    def _create_temp_json(self, config: Union[Dict, BaseXrayModel]) -> tempfile.NamedTemporaryFile:
-        """Create temporary JSON file from config"""
-        if isinstance(config, BaseXrayModel):
-            data = config.to_xray_json()
-        else:
-            data = config
-        
-        temp_file = tempfile.NamedTemporaryFile(
-            mode='w',
-            suffix='.json',
-            delete=False
-        )
-        json.dump(data, temp_file, indent=2)
-        temp_file.close()
-        return temp_file
-    
-    # Inbound management
-    def add_inbound(self, *configs: Union[Dict, BaseXrayModel]) -> Dict[str, Any]:
-        """Add one or more inbounds"""
-        # Wrap inbound configs in the required format
-        wrapped_configs = []
-        for config in configs:
-            if isinstance(config, BaseXrayModel):
-                config_dict = config.to_xray_json()
-            else:
-                config_dict = config
-                
-            # Wrap in inbounds array if not already wrapped
-            if "inbounds" not in config_dict:
-                wrapped_config = {"inbounds": [config_dict]}
-            else:
-                wrapped_config = config_dict
-                
-            wrapped_configs.append(wrapped_config)
-        
-        return self.execute_command("adi", json_files=wrapped_configs)
-    
-    def remove_inbound(self, tag: str) -> Dict[str, Any]:
-        """Remove inbound by tag"""
-        return self.execute_command("rmi", args=[tag])
-    
-    def list_inbounds(self) -> List[Dict[str, Any]]:
-        """List all inbounds"""
-        result = self.execute_command("lsi")
-        return result.get("inbounds", [])
-    
-    # Outbound management
-    def add_outbound(self, *configs: Union[Dict, BaseXrayModel]) -> Dict[str, Any]:
-        """Add one or more outbounds"""
-        return self.execute_command("ado", json_files=list(configs))
-    
-    def remove_outbound(self, tag: str) -> Dict[str, Any]:
-        """Remove outbound by tag"""
-        return self.execute_command("rmo", args=[tag])
-    
-    def list_outbounds(self) -> List[Dict[str, Any]]:
-        """List all outbounds"""
-        result = self.execute_command("lso")
-        return result.get("outbounds", [])
-    
-    # User management
-    def add_users(self, *configs: Union[Dict, BaseXrayModel]) -> Dict[str, Any]:
-        """Add users to inbounds using JSON files"""
-        return self.execute_command("adu", json_files=list(configs))
-    
-    def remove_users(self, tag: str, *emails: str) -> Dict[str, Any]:
-        """Remove users from inbounds using tag and email list"""
-        args = [f"-tag={tag}"] + list(emails)
-        return self.execute_command("rmu", args=args)
-    
-    def get_inbound_user(self, tag: str, email: Optional[str] = None) -> Dict[str, Any]:
-        """Get inbound user(s) information using -tag flag"""
-        args = [f"-tag={tag}"]
-        if email:
-            args.append(f"-email={email}")
-        return self.execute_command("inbounduser", args=args)
-    
-    def get_inbound_user_count(self, tag: str) -> int:
-        """Get inbound user count using -tag flag"""
-        args = [f"-tag={tag}"]
-        result = self.execute_command("inboundusercount", args=args)
-        # Parse the result - might be in output field or direct number
-        if isinstance(result, dict):
-            return result.get("count", 0)
-        return 0
-    
-    # Statistics
-    def get_stats(self, pattern: str = "", reset: bool = False) -> List[Dict[str, Any]]:
-        """Get statistics"""
-        args = [pattern]
-        if reset:
-            args.append("-reset")
-        if pattern:
-            args.extend(["-json"])
-        result = self.execute_command("statsquery", args=args)
-        return result.get("stat", [])
-    
-    def get_system_stats(self) -> Dict[str, Any]:
-        """Get system statistics"""
-        return self.execute_command("statssys")
-    
-    def get_online_stats(self, email: str) -> Dict[str, Any]:
-        """Get online session count for user"""
-        return self.execute_command("statsonline", args=[email])
-    
-    def get_online_ips(self, email: str) -> List[Dict[str, Any]]:
-        """Get user's online IP addresses"""
-        result = self.execute_command("statsonlineiplist", args=[email])
-        return result.get("ips", [])
-    
-    # Routing rules
-    def add_routing_rules(self, *configs: Union[Dict, BaseXrayModel]) -> Dict[str, Any]:
-        """Add routing rules"""
-        return self.execute_command("adrules", json_files=list(configs))
-    
-    def remove_routing_rules(self, *tags: str) -> Dict[str, Any]:
-        """Remove routing rules by tags"""
-        return self.execute_command("rmrules", args=list(tags))
-    
-    # Other operations
-    def restart_logger(self) -> Dict[str, Any]:
-        """Restart the logger"""
-        return self.execute_command("restartlogger")
-    
-    def get_balancer_info(self, tag: str) -> Dict[str, Any]:
-        """Get balancer information"""
-        return self.execute_command("bi", args=[tag])
-    
-    def override_balancer(self, tag: str, selectors: List[str]) -> Dict[str, Any]:
-        """Override balancer selection"""
-        return self.execute_command("bo", args=[tag] + selectors)
-    
-    def block_connection(self, source_ip: str, seconds: int) -> Dict[str, Any]:
-        """Block connections from source IP"""
-        return self.execute_command("sib", args=[source_ip, str(seconds)])
\ No newline at end of file
diff --git a/vpn/xray_api_v2/commands/__init__.py b/vpn/xray_api_v2/commands/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/vpn/xray_api_v2/commands/user.py b/vpn/xray_api_v2/commands/user.py
deleted file mode 100644
index e7a23ec..0000000
--- a/vpn/xray_api_v2/commands/user.py
+++ /dev/null
@@ -1,33 +0,0 @@
-"""User management command wrappers"""
-from dataclasses import dataclass
-from typing import List, Optional, Dict, Any
-
-from ..models.base import BaseXrayModel
-
-
-@dataclass
-class AddUserRequest(BaseXrayModel):
-    """Request to add user to inbound"""
-    inboundTag: str
-    user: Dict[str, Any]  # Protocol-specific user config
-    
-
-@dataclass
-class RemoveUserRequest(BaseXrayModel):
-    """Request to remove user from inbound"""
-    inboundTag: str
-    email: str
-
-
-@dataclass
-class UserStats(BaseXrayModel):
-    """User statistics data"""
-    email: str
-    uplink: int = 0
-    downlink: int = 0
-    online: bool = False
-    ips: List[str] = None
-    
-    def __post_init__(self):
-        if self.ips is None:
-            self.ips = []
\ No newline at end of file
diff --git a/vpn/xray_api_v2/exceptions.py b/vpn/xray_api_v2/exceptions.py
deleted file mode 100644
index 4468de2..0000000
--- a/vpn/xray_api_v2/exceptions.py
+++ /dev/null
@@ -1,31 +0,0 @@
-"""Exceptions for xray-api library"""
-
-
-class XrayAPIError(Exception):
-    """Base exception for all xray-api errors"""
-    pass
-
-
-class XrayConnectionError(XrayAPIError):
-    """Connection to Xray API server failed"""
-    pass
-
-
-class XrayCommandError(XrayAPIError):
-    """Xray command execution failed"""
-    pass
-
-
-class XrayConfigError(XrayAPIError):
-    """Invalid configuration"""
-    pass
-
-
-class XrayNotFoundError(XrayAPIError):
-    """Resource not found"""
-    pass
-
-
-class XrayValidationError(XrayAPIError):
-    """Validation error"""
-    pass
\ No newline at end of file
diff --git a/vpn/xray_api_v2/models/__init__.py b/vpn/xray_api_v2/models/__init__.py
deleted file mode 100644
index 387eddf..0000000
--- a/vpn/xray_api_v2/models/__init__.py
+++ /dev/null
@@ -1,55 +0,0 @@
-"""Xray API models"""
-from .base import (
-    BaseXrayModel, XrayConfig, XrayProtocol, 
-    TransportProtocol, SecurityType
-)
-from .protocols import (
-    # VLESS
-    VLESSAccount, VLESSClient, VLESSInboundConfig,
-    # VMess
-    VMeSSAccount, VMeSSUser, VMeSSInboundConfig, VMeSSSecurityConfig,
-    # Trojan
-    TrojanAccount, TrojanUser, TrojanServerConfig, TrojanFallback,
-    # Shadowsocks
-    ShadowsocksAccount, ShadowsocksUser, ShadowsocksServerConfig,
-    # Utils
-    generate_uuid, validate_uuid, create_protocol_config
-)
-from .transports import (
-    StreamSettings, TCPSettings, WebSocketSettings, GRPCSettings,
-    HTTPSettings, XHTTPSettings, KCPSettings, QUICSettings, DomainSocketSettings,
-    create_tcp_stream, create_ws_stream, create_grpc_stream, create_http_stream, create_xhttp_stream
-)
-from .security import (
-    TLSConfig, REALITYConfig, XTLSConfig, Certificate,
-    create_tls_config, create_reality_config, create_reality_client_config,
-    generate_self_signed_certificate, create_tls_config_with_self_signed
-)
-from .inbound import (
-    InboundConfig, ReceiverConfig, SniffingConfig, InboundBuilder
-)
-
-__all__ = [
-    # Base
-    'BaseXrayModel', 'XrayConfig', 'XrayProtocol', 'TransportProtocol', 'SecurityType',
-    
-    # Protocols
-    'VLESSAccount', 'VLESSClient', 'VLESSInboundConfig',
-    'VMeSSAccount', 'VMeSSUser', 'VMeSSInboundConfig', 'VMeSSSecurityConfig',
-    'TrojanAccount', 'TrojanUser', 'TrojanServerConfig', 'TrojanFallback',
-    'ShadowsocksAccount', 'ShadowsocksUser', 'ShadowsocksServerConfig',
-    'generate_uuid', 'validate_uuid', 'create_protocol_config',
-    
-    # Transports
-    'StreamSettings', 'TCPSettings', 'WebSocketSettings', 'GRPCSettings',
-    'HTTPSettings', 'XHTTPSettings', 'KCPSettings', 'QUICSettings', 'DomainSocketSettings',
-    'create_tcp_stream', 'create_ws_stream', 'create_grpc_stream', 'create_http_stream', 'create_xhttp_stream',
-    
-    # Security
-    'TLSConfig', 'REALITYConfig', 'XTLSConfig', 'Certificate',
-    'create_tls_config', 'create_reality_config', 'create_reality_client_config',
-    'generate_self_signed_certificate', 'create_tls_config_with_self_signed',
-    
-    # Inbound
-    'InboundConfig', 'ReceiverConfig', 'SniffingConfig', 'InboundBuilder',
-]
\ No newline at end of file
diff --git a/vpn/xray_api_v2/models/base.py b/vpn/xray_api_v2/models/base.py
deleted file mode 100644
index 51fe9da..0000000
--- a/vpn/xray_api_v2/models/base.py
+++ /dev/null
@@ -1,97 +0,0 @@
-"""Base models for xray-api library"""
-from abc import ABC, abstractmethod
-from dataclasses import dataclass, asdict, field
-from typing import Dict, Any, Optional, Type, TypeVar
-import json
-from enum import Enum
-
-T = TypeVar('T', bound='BaseXrayModel')
-
-
-class BaseXrayModel(ABC):
-    """Base class for all Xray configuration models"""
-    
-    def to_dict(self) -> Dict[str, Any]:
-        """Convert model to dictionary for storage"""
-        if hasattr(self, '__dataclass_fields__'):
-            return self._clean_dict(asdict(self))
-        return self._clean_dict(self.__dict__.copy())
-    
-    def to_xray_json(self) -> Dict[str, Any]:
-        """Convert model to Xray API format"""
-        return self.to_dict()
-    
-    @classmethod
-    def from_dict(cls: Type[T], data: Dict[str, Any]) -> T:
-        """Create model instance from dictionary"""
-        return cls(**data)
-    
-    def _clean_dict(self, data: Dict[str, Any]) -> Dict[str, Any]:
-        """Remove None values and empty collections"""
-        cleaned = {}
-        for key, value in data.items():
-            if value is None:
-                continue
-            if isinstance(value, (list, dict)) and not value:
-                continue
-            if isinstance(value, BaseXrayModel):
-                cleaned[key] = value.to_dict()
-            elif isinstance(value, list):
-                cleaned[key] = [
-                    item.to_dict() if isinstance(item, BaseXrayModel) else item
-                    for item in value
-                ]
-            elif isinstance(value, Enum):
-                cleaned[key] = value.value
-            else:
-                cleaned[key] = value
-        return cleaned
-    
-    def to_json(self) -> str:
-        """Convert to JSON string"""
-        return json.dumps(self.to_dict(), indent=2)
-
-
-@dataclass
-class XrayConfig(BaseXrayModel):
-    """Base configuration class"""
-    _TypedMessage_: Optional[str] = field(default=None, init=False)
-    
-    def __post_init__(self):
-        """Set TypedMessage after initialization"""
-        if self._TypedMessage_ is None and hasattr(self, '__xray_type__'):
-            self._TypedMessage_ = self.__xray_type__
-
-
-class XrayProtocol(str, Enum):
-    """Supported Xray protocols"""
-    VLESS = "vless"
-    VMESS = "vmess"
-    TROJAN = "trojan"
-    SHADOWSOCKS = "shadowsocks"
-    DOKODEMO = "dokodemo-door"
-    FREEDOM = "freedom"
-    BLACKHOLE = "blackhole"
-    DNS = "dns"
-    HTTP = "http"
-    SOCKS = "socks"
-
-
-class TransportProtocol(str, Enum):
-    """Transport protocols"""
-    TCP = "tcp"
-    KCP = "kcp"
-    WS = "ws"
-    HTTP = "http"
-    XHTTP = "xhttp"
-    DOMAINSOCKET = "domainsocket"
-    QUIC = "quic"
-    GRPC = "grpc"
-
-
-class SecurityType(str, Enum):
-    """Security types"""
-    NONE = "none"
-    TLS = "tls"
-    REALITY = "reality"
-    XTLS = "xtls"
\ No newline at end of file
diff --git a/vpn/xray_api_v2/models/inbound.py b/vpn/xray_api_v2/models/inbound.py
deleted file mode 100644
index 97a8912..0000000
--- a/vpn/xray_api_v2/models/inbound.py
+++ /dev/null
@@ -1,176 +0,0 @@
-"""Inbound configuration models"""
-from dataclasses import dataclass, field
-from typing import Optional, Dict, Any, List, Union
-
-from .base import BaseXrayModel, XrayConfig, XrayProtocol
-from .protocols import (
-    VLESSInboundConfig, VMeSSInboundConfig, 
-    TrojanServerConfig, ShadowsocksServerConfig
-)
-from .transports import StreamSettings
-
-
-@dataclass
-class SniffingConfig(BaseXrayModel):
-    """Traffic sniffing configuration"""
-    enabled: bool = True
-    destOverride: Optional[List[str]] = None
-    metadataOnly: bool = False
-    
-    def __post_init__(self):
-        if self.destOverride is None:
-            self.destOverride = ["http", "tls"]
-
-
-@dataclass
-class ReceiverConfig(XrayConfig):
-    """Receiver configuration for inbound"""
-    __xray_type__ = "xray.app.proxyman.ReceiverConfig"
-    
-    listen: str = "0.0.0.0"
-    port: Optional[int] = None
-    portList: Optional[Union[int, str]] = None  # Can be int or range like "10000-20000"
-    streamSettings: Optional[StreamSettings] = None
-    
-    def to_xray_json(self) -> Dict[str, Any]:
-        """Convert to Xray format"""
-        config = {"listen": self.listen}
-        
-        # Either port or portList must be set
-        if self.port is not None:
-            config["port"] = self.port
-        elif self.portList is not None:
-            config["portList"] = self.portList
-        else:
-            raise ValueError("Either port or portList must be specified")
-            
-        if self.streamSettings:
-            config["streamSettings"] = self.streamSettings.to_xray_json()
-            
-        return config
-
-
-@dataclass
-class InboundConfig(BaseXrayModel):
-    """Complete inbound configuration"""
-    tag: str
-    protocol: XrayProtocol
-    settings: Union[VLESSInboundConfig, VMeSSInboundConfig, TrojanServerConfig, ShadowsocksServerConfig]
-    listen: str = "0.0.0.0"
-    port: Optional[int] = None
-    portList: Optional[Union[int, str]] = None
-    streamSettings: Optional[StreamSettings] = None
-    sniffing: Optional[SniffingConfig] = None
-    
-    def to_xray_json(self) -> Dict[str, Any]:
-        """Convert to Xray API format with proper field order and structure"""
-        config = {
-            "listen": self.listen,
-            "tag": self.tag,
-            "protocol": self.protocol.value if hasattr(self.protocol, 'value') else str(self.protocol),
-        }
-        
-        # Add port or portList (port comes before protocol in working format)
-        if self.port is not None:
-            config["port"] = self.port
-        elif self.portList is not None:
-            config["portList"] = self.portList
-        else:
-            raise ValueError("Either port or portList must be specified")
-            
-        # Add protocol settings with _TypedMessage_
-        settings = self.settings.to_xray_json()
-        if "_TypedMessage_" not in settings:
-            # Add _TypedMessage_ based on protocol
-            protocol_type_map = {
-                "vless": "xray.proxy.vless.inbound.Config",
-                "vmess": "xray.proxy.vmess.inbound.Config", 
-                "trojan": "xray.proxy.trojan.inbound.Config",
-                "shadowsocks": "xray.proxy.shadowsocks.inbound.Config"
-            }
-            protocol_name = self.protocol.value if hasattr(self.protocol, 'value') else str(self.protocol)
-            if protocol_name in protocol_type_map:
-                settings["_TypedMessage_"] = protocol_type_map[protocol_name]
-                
-        config["settings"] = settings
-        
-        # Add stream settings
-        if self.streamSettings:
-            config["streamSettings"] = self.streamSettings.to_xray_json()
-        else:
-            config["streamSettings"] = {"network": "tcp"}  # Default TCP
-        
-        # Add sniffing
-        if self.sniffing:
-            config["sniffing"] = self.sniffing.to_dict()
-            
-        return config
-
-
-# Builder for easier configuration
-class InboundBuilder:
-    """Builder for creating inbound configurations"""
-    
-    def __init__(self, tag: str, protocol: XrayProtocol):
-        self.tag = tag
-        self.protocol = protocol
-        self._settings = None
-        self._listen = "0.0.0.0"
-        self._port = None
-        self._port_list = None
-        self._stream_settings = None
-        self._sniffing = None
-        
-    def listen(self, address: str) -> 'InboundBuilder':
-        """Set listen address"""
-        self._listen = address
-        return self
-        
-    def port(self, port: int) -> 'InboundBuilder':
-        """Set single port"""
-        self._port = port
-        self._port_list = None
-        return self
-        
-    def port_range(self, start: int, end: int) -> 'InboundBuilder':
-        """Set port range"""
-        self._port_list = f"{start}-{end}"
-        self._port = None
-        return self
-        
-    def stream_settings(self, settings: StreamSettings) -> 'InboundBuilder':
-        """Set stream settings"""
-        self._stream_settings = settings
-        return self
-        
-    def sniffing(self, enabled: bool = True, dest_override: Optional[List[str]] = None) -> 'InboundBuilder':
-        """Configure sniffing"""
-        self._sniffing = SniffingConfig(
-            enabled=enabled,
-            destOverride=dest_override
-        )
-        return self
-        
-    def protocol_settings(self, settings: Union[VLESSInboundConfig, VMeSSInboundConfig, TrojanServerConfig, ShadowsocksServerConfig]) -> 'InboundBuilder':
-        """Set protocol-specific settings"""
-        self._settings = settings
-        return self
-        
-    def build(self) -> InboundConfig:
-        """Build the inbound configuration"""
-        if not self._settings:
-            raise ValueError("Protocol settings must be specified")
-            
-        if not self._port and not self._port_list:
-            raise ValueError("Either port or port range must be specified")
-            
-        return InboundConfig(
-            tag=self.tag,
-            protocol=self.protocol,
-            settings=self._settings,
-            listen=self._listen,
-            port=self._port,
-            portList=self._port_list,
-            streamSettings=self._stream_settings,
-            sniffing=self._sniffing
-        )
\ No newline at end of file
diff --git a/vpn/xray_api_v2/models/protocols.py b/vpn/xray_api_v2/models/protocols.py
deleted file mode 100644
index 6a6381e..0000000
--- a/vpn/xray_api_v2/models/protocols.py
+++ /dev/null
@@ -1,266 +0,0 @@
-"""Protocol models for Xray"""
-from dataclasses import dataclass, field
-from typing import List, Optional, Dict, Any
-from uuid import uuid4
-import re
-
-from .base import BaseXrayModel, XrayConfig, XrayProtocol
-
-
-def validate_uuid(uuid_str: str) -> bool:
-    """Validate UUID format"""
-    pattern = re.compile(r'^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$', re.I)
-    return bool(pattern.match(uuid_str))
-
-
-def generate_uuid() -> str:
-    """Generate new UUID"""
-    return str(uuid4())
-
-
-# VLESS Protocol
-@dataclass
-class VLESSAccount(XrayConfig):
-    """VLESS account configuration"""
-    __xray_type__ = "xray.proxy.vless.Account"
-    
-    id: str
-    flow: Optional[str] = None
-    encryption: str = "none"
-    
-    def __post_init__(self):
-        super().__post_init__()
-        if not validate_uuid(self.id):
-            raise ValueError(f"Invalid UUID: {self.id}")
-
-
-@dataclass
-class VLESSClient(BaseXrayModel):
-    """VLESS client configuration"""
-    email: str
-    account: VLESSAccount
-    level: int = 0
-    
-    @classmethod
-    def create(cls, email: str, uuid: Optional[str] = None, flow: Optional[str] = None) -> 'VLESSClient':
-        """Create VLESS client with optional UUID generation"""
-        if uuid is None:
-            uuid = generate_uuid()
-        account = VLESSAccount(id=uuid, flow=flow)
-        return cls(email=email, account=account)
-
-
-@dataclass
-class VLESSInboundConfig(XrayConfig):
-    """VLESS inbound configuration"""
-    __xray_type__ = "xray.proxy.vless.inbound.Config"
-    
-    clients: List[VLESSClient] = field(default_factory=list)
-    decryption: str = "none"
-    fallbacks: Optional[List[Dict[str, Any]]] = None
-    
-    def to_xray_json(self) -> Dict[str, Any]:
-        """Convert to Xray API format with proper structure"""
-        config = {
-            "_TypedMessage_": self.__xray_type__,
-            "clients": [],
-            "decryption": self.decryption
-        }
-        
-        # Convert clients to proper format
-        for client in self.clients:
-            client_data = {
-                "id": client.account.id,
-                "level": client.level,
-                "email": client.email
-            }
-            if client.account.flow:
-                client_data["flow"] = client.account.flow
-            config["clients"].append(client_data)
-        
-        if self.fallbacks:
-            config["fallbacks"] = self.fallbacks
-            
-        return config
-
-
-# VMess Protocol
-@dataclass
-class VMeSSSecurityConfig(BaseXrayModel):
-    """VMess security configuration"""
-    type: str = "AUTO"  # AUTO, AES-128-GCM, CHACHA20-POLY1305, NONE
-
-
-@dataclass
-class VMeSSAccount(XrayConfig):
-    """VMess account configuration"""
-    __xray_type__ = "xray.proxy.vmess.Account"
-    
-    id: str
-    securitySettings: Optional[VMeSSSecurityConfig] = None
-    
-    def __post_init__(self):
-        super().__post_init__()
-        if not validate_uuid(self.id):
-            raise ValueError(f"Invalid UUID: {self.id}")
-        if self.securitySettings is None:
-            self.securitySettings = VMeSSSecurityConfig()
-
-
-@dataclass 
-class VMeSSUser(BaseXrayModel):
-    """VMess user configuration"""
-    email: str
-    account: VMeSSAccount
-    level: int = 0
-    
-    @classmethod
-    def create(cls, email: str, uuid: Optional[str] = None, security: str = "AUTO") -> 'VMeSSUser':
-        """Create VMess user with optional UUID generation"""
-        if uuid is None:
-            uuid = generate_uuid()
-        account = VMeSSAccount(
-            id=uuid,
-            securitySettings=VMeSSSecurityConfig(type=security)
-        )
-        return cls(email=email, account=account)
-
-
-@dataclass
-class VMeSSInboundConfig(XrayConfig):
-    """VMess inbound configuration"""
-    __xray_type__ = "xray.proxy.vmess.inbound.Config"
-    
-    user: List[VMeSSUser] = field(default_factory=list)
-    disableInsecureEncryption: bool = False
-    
-    def to_xray_json(self) -> Dict[str, Any]:
-        """Convert to Xray API format with proper structure"""
-        config = {
-            "_TypedMessage_": self.__xray_type__,
-            "clients": []
-        }
-        
-        # Convert users to proper format
-        for user in self.user:
-            client_data = {
-                "id": user.account.id,
-                "level": user.level,
-                "email": user.email,
-                "alterId": 0  # VMess specific
-            }
-            config["clients"].append(client_data)
-            
-        return config
-
-
-# Trojan Protocol
-@dataclass
-class TrojanAccount(XrayConfig):
-    """Trojan account configuration"""
-    __xray_type__ = "xray.proxy.trojan.Account"
-    
-    password: str
-    
-    @classmethod
-    def generate_password(cls) -> str:
-        """Generate secure password"""
-        return generate_uuid()
-
-
-@dataclass
-class TrojanUser(BaseXrayModel):
-    """Trojan user configuration"""
-    email: str
-    account: TrojanAccount
-    level: int = 0
-    
-    @classmethod
-    def create(cls, email: str, password: Optional[str] = None) -> 'TrojanUser':
-        """Create Trojan user with optional password generation"""
-        if password is None:
-            password = TrojanAccount.generate_password()
-        account = TrojanAccount(password=password)
-        return cls(email=email, account=account)
-
-
-@dataclass
-class TrojanFallback(BaseXrayModel):
-    """Trojan fallback configuration"""
-    dest: str
-    type: str = "tcp"
-    xver: int = 0
-
-
-@dataclass
-class TrojanServerConfig(XrayConfig):
-    """Trojan server configuration"""
-    __xray_type__ = "xray.proxy.trojan.ServerConfig"
-    
-    users: List[TrojanUser] = field(default_factory=list)
-    fallbacks: Optional[List[TrojanFallback]] = None
-    
-    def to_xray_json(self) -> Dict[str, Any]:
-        """Convert to Xray API format with proper structure"""
-        config = {
-            "_TypedMessage_": self.__xray_type__,
-            "clients": []
-        }
-        
-        # Convert users to proper format  
-        for user in self.users:
-            client_data = {
-                "password": user.account.password,
-                "level": user.level,
-                "email": user.email
-            }
-            config["clients"].append(client_data)
-        
-        if self.fallbacks:
-            config["fallbacks"] = [fb.to_dict() for fb in self.fallbacks]
-            
-        return config
-
-
-# Shadowsocks Protocol
-@dataclass
-class ShadowsocksAccount(XrayConfig):
-    """Shadowsocks account configuration"""
-    __xray_type__ = "xray.proxy.shadowsocks.Account"
-    
-    method: str  # aes-256-gcm, aes-128-gcm, chacha20-poly1305, etc.
-    password: str
-
-
-@dataclass
-class ShadowsocksUser(BaseXrayModel):
-    """Shadowsocks user configuration"""
-    email: str
-    account: ShadowsocksAccount
-    level: int = 0
-
-
-@dataclass
-class ShadowsocksServerConfig(XrayConfig):
-    """Shadowsocks server configuration"""
-    __xray_type__ = "xray.proxy.shadowsocks.ServerConfig"
-    
-    users: List[ShadowsocksUser] = field(default_factory=list)
-    network: str = "tcp,udp"
-
-
-# Protocol config factory
-def create_protocol_config(protocol: XrayProtocol, **kwargs) -> XrayConfig:
-    """Factory to create protocol configurations"""
-    protocol_map = {
-        XrayProtocol.VLESS: VLESSInboundConfig,
-        XrayProtocol.VMESS: VMeSSInboundConfig,
-        XrayProtocol.TROJAN: TrojanServerConfig,
-        XrayProtocol.SHADOWSOCKS: ShadowsocksServerConfig,
-    }
-    
-    config_class = protocol_map.get(protocol)
-    if not config_class:
-        raise ValueError(f"Unsupported protocol: {protocol}")
-    
-    return config_class(**kwargs)
\ No newline at end of file
diff --git a/vpn/xray_api_v2/models/security.py b/vpn/xray_api_v2/models/security.py
deleted file mode 100644
index 715461c..0000000
--- a/vpn/xray_api_v2/models/security.py
+++ /dev/null
@@ -1,389 +0,0 @@
-"""Security configuration models for Xray"""
-from dataclasses import dataclass, field
-from typing import Optional, List, Dict, Any, Tuple
-from pathlib import Path
-import secrets
-from datetime import datetime, timedelta
-
-from .base import BaseXrayModel, XrayConfig, SecurityType
-
-
-# TLS Configuration
-@dataclass
-class Certificate(BaseXrayModel):
-    """TLS certificate configuration"""
-    certificateFile: Optional[str] = None
-    keyFile: Optional[str] = None
-    certificate: Optional[List[str]] = None  # PEM format lines
-    key: Optional[List[str]] = None  # PEM format lines
-    usage: str = "encipherment"
-    ocspStapling: int = 3600
-    oneTimeLoading: bool = False
-    
-    def to_xray_json(self) -> Dict[str, Any]:
-        """Convert to Xray format"""
-        config = {}
-        
-        if self.certificateFile and self.keyFile:
-            config["certificateFile"] = self.certificateFile
-            config["keyFile"] = self.keyFile
-        elif self.certificate and self.key:
-            config["certificate"] = self.certificate
-            config["key"] = self.key
-            
-        config["usage"] = self.usage
-        
-        if self.ocspStapling:
-            config["ocspStapling"] = self.ocspStapling
-            
-        if self.oneTimeLoading:
-            config["OneTimeLoading"] = self.oneTimeLoading
-            
-        return config
-
-
-@dataclass
-class TLSConfig(XrayConfig):
-    """TLS configuration"""
-    __xray_type__ = "xray.transport.internet.tls.Config"
-    
-    serverName: Optional[str] = None
-    allowInsecure: bool = False
-    alpn: Optional[List[str]] = None
-    minVersion: str = "1.2"
-    maxVersion: str = "1.3"
-    preferServerCipherSuites: bool = True
-    cipherSuites: Optional[str] = None
-    certificates: Optional[List[Certificate]] = None
-    disableSystemRoot: bool = False
-    enableSessionResumption: bool = False
-    fingerprint: Optional[str] = None  # Client-side
-    pinnedPeerCertificateChainSha256: Optional[List[str]] = None
-    rejectUnknownSni: bool = False  # Server-side
-    
-    def to_xray_json(self) -> Dict[str, Any]:
-        """Convert to Xray format with proper field handling"""
-        config = super().to_xray_json()
-        
-        # Handle certificates properly
-        if self.certificates:
-            config["certificates"] = [cert.to_xray_json() for cert in self.certificates]
-            
-        return config
-
-
-# REALITY Configuration
-@dataclass
-class REALITYConfig(XrayConfig):
-    """REALITY configuration"""
-    __xray_type__ = "xray.transport.internet.reality.Config"
-    
-    # Server-side
-    show: bool = False
-    dest: Optional[str] = None  # e.g., "example.com:443"
-    xver: int = 0
-    serverNames: Optional[List[str]] = None
-    privateKey: Optional[str] = None
-    shortIds: Optional[List[str]] = None
-    
-    # Client-side
-    serverName: Optional[str] = None
-    fingerprint: str = "chrome"
-    publicKey: Optional[str] = None
-    shortId: Optional[str] = None
-    spiderX: Optional[str] = None
-    
-    @classmethod
-    def generate_keys(cls) -> Dict[str, str]:
-        """Generate REALITY key pair using xray x25519"""
-        import subprocess
-        try:
-            # Use xray x25519 to generate proper keys
-            result = subprocess.run(['xray', 'x25519'], capture_output=True, text=True, check=True)
-            lines = result.stdout.strip().split('\n')
-            
-            private_key = ""
-            public_key = ""
-            
-            for line in lines:
-                if line.startswith('Private key:'):
-                    private_key = line.split(': ')[1].strip()
-                elif line.startswith('Public key:'):
-                    public_key = line.split(': ')[1].strip()
-            
-            return {
-                "privateKey": private_key,
-                "publicKey": public_key
-            }
-        except (subprocess.CalledProcessError, FileNotFoundError, IndexError):
-            # Fallback to base64 encoded random bytes (32 bytes for X25519)
-            import base64
-            private_bytes = secrets.token_bytes(32)
-            public_bytes = secrets.token_bytes(32)
-            return {
-                "privateKey": base64.b64encode(private_bytes).decode().rstrip('='),
-                "publicKey": base64.b64encode(public_bytes).decode().rstrip('=')
-            }
-    
-    @classmethod
-    def generate_short_id(cls) -> str:
-        """Generate random short ID (1-16 hex chars)"""
-        # Generate 1-8 bytes (2-16 hex chars)
-        length = secrets.randbelow(8) + 1
-        return secrets.token_hex(length)
-
-
-# XTLS Configuration (deprecated but still supported)
-@dataclass
-class XTLSConfig(XrayConfig):
-    """XTLS configuration (legacy)"""
-    __xray_type__ = "xray.transport.internet.xtls.Config"
-    
-    serverName: Optional[str] = None
-    allowInsecure: bool = False
-    alpn: Optional[List[str]] = None
-    minVersion: str = "1.2"
-    maxVersion: str = "1.3"
-    preferServerCipherSuites: bool = True
-    cipherSuites: Optional[str] = None
-    certificates: Optional[List[Certificate]] = None
-    disableSystemRoot: bool = False
-    fingerprint: Optional[str] = None
-    rejectUnknownSni: bool = False
-
-
-# Security factory
-def create_tls_config(
-    server_name: Optional[str] = None,
-    cert_file: Optional[str] = None,
-    key_file: Optional[str] = None,
-    alpn: Optional[List[str]] = None,
-    fingerprint: Optional[str] = None,
-    **kwargs
-) -> TLSConfig:
-    """Create TLS configuration"""
-    config = TLSConfig(
-        serverName=server_name,
-        alpn=alpn or ["h2", "http/1.1"],
-        fingerprint=fingerprint,
-        **kwargs
-    )
-    
-    if cert_file and key_file:
-        config.certificates = [Certificate(
-            certificateFile=cert_file,
-            keyFile=key_file
-        )]
-        
-    return config
-
-
-def create_reality_config(
-    dest: str,
-    server_names: Optional[List[str]] = None,
-    private_key: Optional[str] = None,
-    short_ids: Optional[List[str]] = None,
-    **kwargs
-) -> REALITYConfig:
-    """Create REALITY configuration for server"""
-    if not private_key:
-        keys = REALITYConfig.generate_keys()
-        private_key = keys["privateKey"]
-        
-    if not short_ids:
-        short_ids = [REALITYConfig.generate_short_id()]
-        
-    return REALITYConfig(
-        show=False,
-        dest=dest,
-        serverNames=server_names or [dest.split(":")[0]],
-        privateKey=private_key,
-        shortIds=short_ids,
-        **kwargs
-    )
-
-
-def create_reality_client_config(
-    server_name: str,
-    public_key: str,
-    short_id: str,
-    fingerprint: str = "chrome",
-    **kwargs
-) -> REALITYConfig:
-    """Create REALITY configuration for client"""
-    return REALITYConfig(
-        serverName=server_name,
-        publicKey=public_key,
-        shortId=short_id,
-        fingerprint=fingerprint,
-        **kwargs
-    )
-
-
-# Certificate generation utilities
-def generate_self_signed_certificate(
-    common_name: str = "localhost",
-    san_list: Optional[List[str]] = None,
-    days: int = 365,
-    key_size: int = 2048,
-    save_to_files: bool = False,
-    cert_path: Optional[str] = None,
-    key_path: Optional[str] = None
-) -> Tuple[str, str]:
-    """
-    Generate self-signed certificate
-    
-    Args:
-        common_name: Certificate common name
-        san_list: Subject Alternative Names (domains/IPs)
-        days: Certificate validity in days
-        key_size: RSA key size
-        save_to_files: Whether to save to files
-        cert_path: Path to save certificate
-        key_path: Path to save private key
-        
-    Returns:
-        Tuple of (certificate_pem, private_key_pem)
-    """
-    try:
-        from cryptography import x509
-        from cryptography.x509.oid import NameOID, ExtensionOID
-        from cryptography.hazmat.primitives import hashes, serialization
-        from cryptography.hazmat.primitives.asymmetric import rsa
-        from cryptography.hazmat.backends import default_backend
-    except ImportError:
-        raise ImportError("cryptography package is required for certificate generation. Install with: pip install cryptography")
-    
-    # Generate private key
-    private_key = rsa.generate_private_key(
-        public_exponent=65537,
-        key_size=key_size,
-        backend=default_backend()
-    )
-    
-    # Create certificate subject
-    subject = issuer = x509.Name([
-        x509.NameAttribute(NameOID.COUNTRY_NAME, "US"),
-        x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, "State"),
-        x509.NameAttribute(NameOID.LOCALITY_NAME, "City"),
-        x509.NameAttribute(NameOID.ORGANIZATION_NAME, "Xray Self-Signed"),
-        x509.NameAttribute(NameOID.COMMON_NAME, common_name),
-    ])
-    
-    # Create certificate builder
-    builder = x509.CertificateBuilder()
-    builder = builder.subject_name(subject)
-    builder = builder.issuer_name(issuer)
-    builder = builder.public_key(private_key.public_key())
-    builder = builder.serial_number(x509.random_serial_number())
-    builder = builder.not_valid_before(datetime.utcnow())
-    builder = builder.not_valid_after(datetime.utcnow() + timedelta(days=days))
-    
-    # Add Subject Alternative Names
-    san_list = san_list or [common_name]
-    alt_names = []
-    for san in san_list:
-        if san.replace('.', '').isdigit():  # IP address
-            alt_names.append(x509.IPAddress(ipaddress.ip_address(san)))
-        else:  # Domain name
-            alt_names.append(x509.DNSName(san))
-    
-    builder = builder.add_extension(
-        x509.SubjectAlternativeName(alt_names),
-        critical=False,
-    )
-    
-    # Add basic constraints
-    builder = builder.add_extension(
-        x509.BasicConstraints(ca=True, path_length=0),
-        critical=True,
-    )
-    
-    # Add key usage
-    builder = builder.add_extension(
-        x509.KeyUsage(
-            digital_signature=True,
-            content_commitment=False,
-            key_encipherment=True,
-            data_encipherment=False,
-            key_agreement=False,
-            key_cert_sign=True,
-            crl_sign=False,
-            encipher_only=False,
-            decipher_only=False,
-        ),
-        critical=True,
-    )
-    
-    # Sign certificate
-    certificate = builder.sign(private_key, hashes.SHA256(), default_backend())
-    
-    # Serialize to PEM
-    cert_pem = certificate.public_bytes(serialization.Encoding.PEM).decode('utf-8')
-    key_pem = private_key.private_bytes(
-        encoding=serialization.Encoding.PEM,
-        format=serialization.PrivateFormat.TraditionalOpenSSL,
-        encryption_algorithm=serialization.NoEncryption()
-    ).decode('utf-8')
-    
-    # Save to files if requested
-    if save_to_files:
-        cert_file = cert_path or f"{common_name}_cert.pem"
-        key_file = key_path or f"{common_name}_key.pem"
-        
-        with open(cert_file, 'w') as f:
-            f.write(cert_pem)
-        
-        with open(key_file, 'w') as f:
-            f.write(key_pem)
-            
-        # Set appropriate permissions
-        Path(key_file).chmod(0o600)
-    
-    return cert_pem, key_pem
-
-
-def create_tls_config_with_self_signed(
-    common_name: str = "localhost",
-    san_list: Optional[List[str]] = None,
-    alpn: Optional[List[str]] = None,
-    **tls_kwargs
-) -> Tuple[TLSConfig, str, str]:
-    """
-    Create TLS configuration with self-signed certificate
-    
-    Returns:
-        Tuple of (TLSConfig, certificate_pem, private_key_pem)
-    """
-    cert_pem, key_pem = generate_self_signed_certificate(
-        common_name=common_name,
-        san_list=san_list
-    )
-    
-    # Convert PEM to lines for Xray format
-    cert_lines = cert_pem.strip().split('\n')
-    key_lines = key_pem.strip().split('\n')
-    
-    # Create certificate config
-    certificate = Certificate(
-        certificate=cert_lines,
-        key=key_lines,
-        oneTimeLoading=True
-    )
-    
-    # Create TLS config
-    tls_config = TLSConfig(
-        serverName=common_name,
-        alpn=alpn or ["h2", "http/1.1"],
-        certificates=[certificate],
-        **tls_kwargs
-    )
-    
-    return tls_config, cert_pem, key_pem
-
-
-# Add missing import
-try:
-    import ipaddress
-except ImportError:
-    ipaddress = None
\ No newline at end of file
diff --git a/vpn/xray_api_v2/models/transports.py b/vpn/xray_api_v2/models/transports.py
deleted file mode 100644
index 68e2d9e..0000000
--- a/vpn/xray_api_v2/models/transports.py
+++ /dev/null
@@ -1,241 +0,0 @@
-"""Transport configuration models for Xray"""
-from dataclasses import dataclass, field
-from typing import Optional, Dict, Any, List
-
-from .base import BaseXrayModel, XrayConfig, TransportProtocol
-
-
-# TCP Transport
-@dataclass
-class TCPSettings(XrayConfig):
-    """TCP transport settings"""
-    __xray_type__ = "xray.transport.internet.tcp.Config"
-    
-    acceptProxyProtocol: bool = False
-    header: Optional[Dict[str, Any]] = None
-
-
-# KCP Transport
-@dataclass 
-class KCPSettings(XrayConfig):
-    """KCP transport settings"""
-    __xray_type__ = "xray.transport.internet.kcp.Config"
-    
-    mtu: int = 1350
-    tti: int = 50
-    uplinkCapacity: int = 5
-    downlinkCapacity: int = 20
-    congestion: bool = False
-    readBufferSize: int = 2
-    writeBufferSize: int = 2
-    header: Optional[Dict[str, Any]] = None
-
-
-# WebSocket Transport
-@dataclass
-class WebSocketSettings(XrayConfig):
-    """WebSocket transport settings"""
-    __xray_type__ = "xray.transport.internet.websocket.Config"
-    
-    path: str = "/"
-    headers: Optional[Dict[str, str]] = None
-    acceptProxyProtocol: bool = False
-    
-    def to_xray_json(self) -> Dict[str, Any]:
-        """Convert to Xray format"""
-        config = super().to_xray_json()
-        # Ensure headers is a dict even if empty
-        if self.headers:
-            config["headers"] = self.headers
-        return config
-
-
-# HTTP/2 Transport
-@dataclass
-class HTTPSettings(XrayConfig):
-    """HTTP/2 transport settings"""
-    __xray_type__ = "xray.transport.internet.http.Config"
-    
-    path: str = "/"
-    host: Optional[List[str]] = None
-    method: str = "PUT"
-    headers: Optional[Dict[str, List[str]]] = None
-
-
-# XHTTP Transport (New)
-@dataclass 
-class XHTTPSettings(XrayConfig):
-    """XHTTP transport settings"""
-    __xray_type__ = "xray.transport.internet.xhttp.Config"
-    
-    path: str = "/"
-    host: Optional[str] = None
-    method: str = "GET"
-    headers: Optional[Dict[str, Any]] = None
-    mode: str = "auto"
-
-
-# Domain Socket Transport
-@dataclass
-class DomainSocketSettings(XrayConfig):
-    """Domain socket transport settings"""
-    __xray_type__ = "xray.transport.internet.domainsocket.Config"
-    
-    path: str
-    abstract: bool = False
-    padding: bool = False
-
-
-# QUIC Transport
-@dataclass
-class QUICSettings(XrayConfig):
-    """QUIC transport settings"""
-    __xray_type__ = "xray.transport.internet.quic.Config"
-    
-    security: str = "none"
-    key: str = ""
-    header: Optional[Dict[str, Any]] = None
-
-
-# gRPC Transport
-@dataclass
-class GRPCSettings(XrayConfig):
-    """gRPC transport settings"""
-    __xray_type__ = "xray.transport.internet.grpc.encoding.Config"
-    
-    serviceName: str = ""
-    multiMode: bool = False
-    idle_timeout: int = 60
-    health_check_timeout: int = 20
-    permit_without_stream: bool = False
-    initial_windows_size: int = 0
-
-
-# Stream Settings
-@dataclass
-class StreamSettings(BaseXrayModel):
-    """Stream settings for inbound/outbound"""
-    
-    network: TransportProtocol = TransportProtocol.TCP
-    security: Optional[str] = None
-    tlsSettings: Optional[Any] = None
-    xtlsSettings: Optional[Any] = None
-    realitySettings: Optional[Any] = None
-    tcpSettings: Optional[TCPSettings] = None
-    kcpSettings: Optional[KCPSettings] = None
-    wsSettings: Optional[WebSocketSettings] = None
-    httpSettings: Optional[HTTPSettings] = None
-    xhttpSettings: Optional[XHTTPSettings] = None
-    dsSettings: Optional[DomainSocketSettings] = None
-    quicSettings: Optional[QUICSettings] = None
-    grpcSettings: Optional[GRPCSettings] = None
-    sockopt: Optional[Dict[str, Any]] = None
-    
-    def to_xray_json(self) -> Dict[str, Any]:
-        """Convert to Xray format with correct field names"""
-        config = {
-            "network": self.network.value if isinstance(self.network, TransportProtocol) else self.network
-        }
-        
-        if self.security:
-            config["security"] = self.security
-            
-        # Map transport settings
-        transport_map = {
-            TransportProtocol.TCP: ("tcpSettings", self.tcpSettings),
-            TransportProtocol.KCP: ("kcpSettings", self.kcpSettings),
-            TransportProtocol.WS: ("wsSettings", self.wsSettings),
-            TransportProtocol.HTTP: ("httpSettings", self.httpSettings),
-            TransportProtocol.XHTTP: ("xhttpSettings", self.xhttpSettings),
-            TransportProtocol.DOMAINSOCKET: ("dsSettings", self.dsSettings),
-            TransportProtocol.QUIC: ("quicSettings", self.quicSettings),
-            TransportProtocol.GRPC: ("grpcSettings", self.grpcSettings),
-        }
-        
-        network = self.network if isinstance(self.network, TransportProtocol) else TransportProtocol(self.network)
-        field_name, settings = transport_map.get(network, (None, None))
-        
-        if field_name and settings:
-            config[field_name] = settings.to_xray_json() if hasattr(settings, 'to_xray_json') else settings
-            
-        # Add security settings
-        if self.tlsSettings:
-            config["tlsSettings"] = self.tlsSettings if isinstance(self.tlsSettings, dict) else self.tlsSettings.to_xray_json()
-        if self.xtlsSettings:
-            config["xtlsSettings"] = self.xtlsSettings if isinstance(self.xtlsSettings, dict) else self.xtlsSettings.to_xray_json()
-        if self.realitySettings:
-            config["realitySettings"] = self.realitySettings if isinstance(self.realitySettings, dict) else self.realitySettings.to_xray_json()
-            
-        if self.sockopt:
-            config["sockopt"] = self.sockopt
-            
-        return config
-
-
-# Factory functions
-def create_tcp_stream(
-    security: Optional[str] = None,
-    **kwargs
-) -> StreamSettings:
-    """Create TCP stream settings"""
-    return StreamSettings(
-        network=TransportProtocol.TCP,
-        security=security,
-        tcpSettings=TCPSettings(**kwargs) if kwargs else None
-    )
-
-
-def create_ws_stream(
-    path: str = "/",
-    headers: Optional[Dict[str, str]] = None,
-    security: Optional[str] = None,
-    **kwargs
-) -> StreamSettings:
-    """Create WebSocket stream settings"""
-    return StreamSettings(
-        network=TransportProtocol.WS,
-        security=security,
-        wsSettings=WebSocketSettings(path=path, headers=headers, **kwargs)
-    )
-
-
-def create_grpc_stream(
-    service_name: str = "",
-    security: Optional[str] = None,
-    **kwargs
-) -> StreamSettings:
-    """Create gRPC stream settings"""
-    return StreamSettings(
-        network=TransportProtocol.GRPC,
-        security=security,
-        grpcSettings=GRPCSettings(serviceName=service_name, **kwargs)
-    )
-
-
-def create_http_stream(
-    path: str = "/",
-    host: Optional[List[str]] = None,
-    security: Optional[str] = None,
-    **kwargs
-) -> StreamSettings:
-    """Create HTTP/2 stream settings"""
-    return StreamSettings(
-        network=TransportProtocol.HTTP,
-        security=security,
-        httpSettings=HTTPSettings(path=path, host=host, **kwargs)
-    )
-
-
-def create_xhttp_stream(
-    path: str = "/",
-    host: Optional[str] = None,
-    security: Optional[str] = None,
-    mode: str = "auto",
-    **kwargs
-) -> StreamSettings:
-    """Create XHTTP stream settings"""
-    return StreamSettings(
-        network=TransportProtocol.XHTTP,
-        security=security,
-        xhttpSettings=XHTTPSettings(path=path, host=host, mode=mode, **kwargs)
-    )
\ No newline at end of file
diff --git a/vpn/xray_api_v2/serializers/__init__.py b/vpn/xray_api_v2/serializers/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/vpn/xray_api_v2/stats.py b/vpn/xray_api_v2/stats.py
deleted file mode 100644
index b2638d6..0000000
--- a/vpn/xray_api_v2/stats.py
+++ /dev/null
@@ -1,184 +0,0 @@
-"""Statistics functionality for Xray API"""
-from dataclasses import dataclass
-from typing import List, Dict, Optional, Tuple, Any
-from datetime import datetime
-
-from .client import XrayClient
-from .models.base import BaseXrayModel
-
-
-@dataclass
-class StatItem(BaseXrayModel):
-    """Single statistics item"""
-    name: str
-    value: int
-    
-    @property
-    def parts(self) -> List[str]:
-        """Split stat name into parts"""
-        return self.name.split(">>>")
-    
-    @property
-    def stat_type(self) -> str:
-        """Get stat type (inbound/outbound/user)"""
-        return self.parts[0] if self.parts else ""
-    
-    @property
-    def tag(self) -> str:
-        """Get inbound/outbound tag"""
-        return self.parts[1] if len(self.parts) > 1 else ""
-    
-    @property
-    def metric(self) -> str:
-        """Get metric name (traffic/uplink/downlink)"""
-        return self.parts[-1] if self.parts else ""
-
-
-@dataclass
-class SystemStats(BaseXrayModel):
-    """System statistics"""
-    numGoroutine: int = 0
-    numGC: int = 0
-    alloc: int = 0
-    totalAlloc: int = 0
-    sys: int = 0
-    mallocs: int = 0
-    frees: int = 0
-    liveObjects: int = 0
-    pauseTotalNs: int = 0
-    uptime: int = 0
-    
-    @classmethod
-    def from_dict(cls, data: Dict[str, Any]) -> 'SystemStats':
-        """Create from API response with proper field mapping"""
-        # Map API response fields to model fields
-        field_mapping = {
-            'NumGoroutine': 'numGoroutine',
-            'NumGC': 'numGC', 
-            'Alloc': 'alloc',
-            'TotalAlloc': 'totalAlloc',
-            'Sys': 'sys',
-            'Mallocs': 'mallocs',
-            'Frees': 'frees',
-            'LiveObjects': 'liveObjects',
-            'PauseTotalNs': 'pauseTotalNs',
-            'Uptime': 'uptime'
-        }
-        
-        normalized = {}
-        for api_key, model_key in field_mapping.items():
-            if api_key in data:
-                normalized[model_key] = data[api_key]
-                
-        return cls(**normalized)
-    
-    @property
-    def uptime_seconds(self) -> int:
-        """Get uptime in seconds"""
-        return self.uptime
-    
-    @property
-    def memory_mb(self) -> float:
-        """Get allocated memory in MB"""
-        return self.alloc / 1024 / 1024
-
-
-class StatsManager:
-    """Manager for Xray statistics"""
-    
-    def __init__(self, client: XrayClient):
-        self.client = client
-        
-    def get_all_stats(self, reset: bool = False) -> List[StatItem]:
-        """Get all statistics"""
-        stats = self.client.get_stats("", reset=reset)
-        result = []
-        for stat in stats:
-            if isinstance(stat, dict) and 'name' in stat and 'value' in stat:
-                result.append(StatItem(name=stat['name'], value=stat['value']))
-        return result
-    
-    def get_inbound_stats(self, tag: str, reset: bool = False) -> Dict[str, int]:
-        """Get statistics for specific inbound"""
-        pattern = f"inbound>>>{tag}>>>traffic>>>"
-        stats = self.client.get_stats(pattern, reset=reset)
-        
-        result = {"uplink": 0, "downlink": 0}
-        for stat in stats:
-            item = StatItem(**stat)
-            if item.metric in result:
-                result[item.metric] = item.value
-                
-        return result
-    
-    def get_outbound_stats(self, tag: str, reset: bool = False) -> Dict[str, int]:
-        """Get statistics for specific outbound"""
-        pattern = f"outbound>>>{tag}>>>traffic>>>"
-        stats = self.client.get_stats(pattern, reset=reset)
-        
-        result = {"uplink": 0, "downlink": 0}
-        for stat in stats:
-            item = StatItem(**stat)
-            if item.metric in result:
-                result[item.metric] = item.value
-                
-        return result
-    
-    def get_user_stats(self, email: str, reset: bool = False) -> Dict[str, int]:
-        """Get statistics for specific user"""
-        pattern = f"user>>>{email}>>>traffic>>>"
-        stats = self.client.get_stats(pattern, reset=reset)
-        
-        result = {"uplink": 0, "downlink": 0}
-        for stat in stats:
-            item = StatItem(**stat)
-            if item.metric in result:
-                result[item.metric] = item.value
-                
-        return result
-    
-    def get_user_online_info(self, email: str) -> Dict[str, Any]:
-        """Get user online information"""
-        online = self.client.get_online_stats(email)
-        ips_data = self.client.get_online_ips(email)
-        
-        return {
-            "email": email,
-            "online": online.get("count", 0) > 0,
-            "sessions": online.get("count", 0),
-            "ips": ips_data
-        }
-    
-    def get_system_stats(self) -> SystemStats:
-        """Get system statistics"""
-        stats = self.client.get_system_stats()
-        return SystemStats.from_dict(stats)
-    
-    def get_traffic_summary(self) -> Dict[str, Dict[str, int]]:
-        """Get traffic summary for all inbounds/outbounds"""
-        all_stats = self.get_all_stats()
-        summary = {
-            "inbounds": {},
-            "outbounds": {},
-            "users": {}
-        }
-        
-        for stat in all_stats:
-            if stat.stat_type == "inbound":
-                if stat.tag not in summary["inbounds"]:
-                    summary["inbounds"][stat.tag] = {"uplink": 0, "downlink": 0}
-                summary["inbounds"][stat.tag][stat.metric] = stat.value
-                
-            elif stat.stat_type == "outbound":
-                if stat.tag not in summary["outbounds"]:
-                    summary["outbounds"][stat.tag] = {"uplink": 0, "downlink": 0}
-                summary["outbounds"][stat.tag][stat.metric] = stat.value
-                
-            elif stat.stat_type == "user":
-                user_email = stat.parts[1] if len(stat.parts) > 1 else ""
-                if user_email and user_email not in summary["users"]:
-                    summary["users"][user_email] = {"uplink": 0, "downlink": 0}
-                if user_email:
-                    summary["users"][user_email][stat.metric] = stat.value
-                    
-        return summary
\ No newline at end of file
diff --git a/vpn/xray_api_v2/subscription.py b/vpn/xray_api_v2/subscription.py
deleted file mode 100644
index 3877cb8..0000000
--- a/vpn/xray_api_v2/subscription.py
+++ /dev/null
@@ -1,392 +0,0 @@
-"""Subscription link generation for Xray protocols"""
-import json
-import base64
-import urllib.parse
-from typing import Dict, Any, Optional, List, Union
-from .models.base import BaseXrayModel
-from .models.inbound import InboundConfig
-from .models.protocols import VLESSInboundConfig, VMeSSInboundConfig, TrojanServerConfig
-
-
-class SubscriptionLinkGenerator:
-    """Generate subscription links for various Xray protocols"""
-    
-    @staticmethod
-    def _url_encode(value: str) -> str:
-        """URL encode string with safe characters"""
-        return urllib.parse.quote(value, safe='')
-    
-    @staticmethod
-    def _format_ipv6(address: str) -> str:
-        """Format IPv6 address with brackets if needed"""
-        if ':' in address and not address.startswith('['):
-            return f'[{address}]'
-        return address
-    
-    @classmethod
-    def generate_vless_link(cls,
-                           uuid: str,
-                           address: str,
-                           port: int,
-                           remark: str = "VLESS",
-                           encryption: str = "none",
-                           security: str = "none",
-                           sni: Optional[str] = None,
-                           transport_type: str = "tcp",
-                           path: Optional[str] = None,
-                           host: Optional[str] = None,
-                           alpn: Optional[str] = None,
-                           fp: str = "chrome",
-                           flow: Optional[str] = None,
-                           allow_insecure: bool = False,
-                           # REALITY parameters
-                           pbk: Optional[str] = None,
-                           sid: Optional[str] = None,
-                           spx: Optional[str] = None,
-                           **kwargs) -> str:
-        """
-        Generate VLESS subscription link
-        
-        Args:
-            uuid: Client UUID
-            address: Server address
-            port: Server port
-            remark: Link description/name
-            encryption: Encryption method (default: none)
-            security: Security layer (none, tls, reality)
-            sni: SNI for TLS
-            transport_type: Transport type (tcp, ws, grpc, xhttp, h2, kcp)
-            path: Path for WebSocket/HTTP2/gRPC
-            host: Host header for WebSocket
-            alpn: ALPN negotiation
-            fp: Fingerprint
-            flow: Flow control (xtls-rprx-vision, etc.)
-            pbk: REALITY public key
-            sid: REALITY short ID
-            spx: REALITY spider X
-            **kwargs: Additional parameters
-            
-        Returns:
-            VLESS subscription link
-        """
-        # Build query parameters
-        params = {
-            'encryption': encryption,
-            'security': security,
-            'type': transport_type,
-            'fp': fp
-        }
-        
-        # Add optional parameters
-        if sni:
-            params['sni'] = sni
-        if path:
-            params['path'] = path  # Don't double encode - urlencode will handle it
-        if host:
-            params['host'] = host
-        if alpn:
-            params['alpn'] = alpn
-        if flow:
-            params['flow'] = flow
-        if allow_insecure:
-            params['allowInsecure'] = '1'
-            
-        # Add REALITY parameters
-        if pbk:
-            params['pbk'] = pbk
-        if sid:
-            params['sid'] = sid
-        if spx:
-            params['spx'] = spx
-            
-        # Add any additional parameters
-        params.update(kwargs)
-        
-        # Remove None values
-        params = {k: v for k, v in params.items() if v is not None}
-        
-        # Build query string (keep - and _ safe for REALITY keys)
-        query_string = urllib.parse.urlencode(params, safe='-_')
-        
-        # Format address (handle IPv6)
-        formatted_address = cls._format_ipv6(address)
-        
-        # Build VLESS URL
-        url = f"vless://{uuid}@{formatted_address}:{port}?{query_string}#{cls._url_encode(remark)}"
-        
-        return url
-    
-    @classmethod
-    def generate_vmess_link(cls,
-                           uuid: str,
-                           address: str,
-                           port: int,
-                           remark: str = "VMess",
-                           alterId: int = 0,
-                           security: str = "auto",
-                           network: str = "tcp",
-                           transport_type: Optional[str] = None,
-                           path: Optional[str] = None,
-                           host: Optional[str] = None,
-                           tls: str = "",
-                           sni: Optional[str] = None,
-                           alpn: Optional[str] = None,
-                           fp: Optional[str] = None,
-                           allow_insecure: bool = False,
-                           **kwargs) -> str:
-        """
-        Generate VMess subscription link
-        
-        Args:
-            uuid: Client UUID
-            address: Server address
-            port: Server port
-            remark: Link description/name
-            alterId: Alter ID (default: 0)
-            security: Security method (auto, aes-128-gcm, chacha20-poly1305, none)
-            network: Network type (tcp, kcp, ws, h2, quic, grpc)
-            transport_type: Transport type (same as network for compatibility)
-            path: Path for WebSocket/HTTP2/gRPC
-            host: Host header
-            tls: TLS settings ("" for none, "tls" for TLS)
-            sni: SNI for TLS
-            alpn: ALPN negotiation
-            fp: Fingerprint
-            **kwargs: Additional parameters
-            
-        Returns:
-            VMess subscription link
-        """
-        # Use transport_type if provided, otherwise use network
-        net = transport_type or network
-        
-        # Build VMess configuration object
-        vmess_config = {
-            'v': '2',
-            'ps': remark,
-            'add': address,
-            'port': str(port),
-            'id': uuid,
-            'aid': str(alterId),
-            'scy': security,
-            'net': net,
-            'type': kwargs.get('type', 'none'),
-            'host': host or '',
-            'path': path or '',
-            'tls': tls,
-            'sni': sni or '',
-            'alpn': alpn or '',
-            'fp': fp or ''
-        }
-        
-        # Add allowInsecure only if True (VMess format - try multiple approaches)
-        if allow_insecure:
-            vmess_config['allowInsecure'] = 1
-            vmess_config['skip-cert-verify'] = True  # For compatibility with some clients
-        
-        # Add any additional parameters
-        for key, value in kwargs.items():
-            if key not in vmess_config and value is not None:
-                vmess_config[key] = str(value)
-        
-        # Convert to JSON and base64 encode
-        json_str = json.dumps(vmess_config, separators=(',', ':'))
-        encoded = base64.b64encode(json_str.encode('utf-8')).decode('ascii')
-        
-        return f"vmess://{encoded}"
-    
-    @classmethod
-    def generate_trojan_link(cls,
-                           password: str,
-                           address: str,
-                           port: int,
-                           remark: str = "Trojan",
-                           security: str = "tls",
-                           sni: Optional[str] = None,
-                           transport_type: str = "tcp",
-                           path: Optional[str] = None,
-                           host: Optional[str] = None,
-                           alpn: Optional[str] = None,
-                           fp: str = "chrome",
-                           allow_insecure: bool = False,
-                           **kwargs) -> str:
-        """
-        Generate Trojan subscription link
-        
-        Args:
-            password: Trojan password
-            address: Server address
-            port: Server port
-            remark: Link description/name
-            security: Security layer (tls, none)
-            sni: SNI for TLS
-            transport_type: Transport type (tcp, ws, grpc)
-            path: Path for WebSocket/gRPC
-            host: Host header
-            alpn: ALPN negotiation
-            fp: Fingerprint
-            **kwargs: Additional parameters
-            
-        Returns:
-            Trojan subscription link
-        """
-        # Build query parameters
-        params = {
-            'security': security,
-            'type': transport_type,
-            'fp': fp
-        }
-        
-        # Add optional parameters
-        if sni:
-            params['sni'] = sni
-        if path:
-            params['path'] = path  # Don't double encode - urlencode will handle it
-        if host:
-            params['host'] = host
-        if alpn:
-            params['alpn'] = alpn
-        if allow_insecure:
-            params['allowInsecure'] = '1'
-            
-        # Add any additional parameters
-        params.update(kwargs)
-        
-        # Remove None values
-        params = {k: v for k, v in params.items() if v is not None}
-        
-        # Build query string
-        query_string = urllib.parse.urlencode(params)
-        
-        # Format address (handle IPv6)
-        formatted_address = cls._format_ipv6(address)
-        
-        # URL encode password
-        encoded_password = cls._url_encode(password)
-        
-        # Build Trojan URL
-        url = f"trojan://{encoded_password}@{formatted_address}:{port}?{query_string}#{cls._url_encode(remark)}"
-        
-        return url
-    
-    @classmethod
-    def generate_shadowsocks_link(cls,
-                                method: str,
-                                password: str,
-                                address: str,
-                                port: int,
-                                remark: str = "Shadowsocks") -> str:
-        """
-        Generate Shadowsocks subscription link
-        
-        Args:
-            method: Encryption method
-            password: SS password
-            address: Server address
-            port: Server port
-            remark: Link description/name
-            
-        Returns:
-            Shadowsocks subscription link
-        """
-        # Format: ss://base64(method:password)@server:port#remark
-        user_info = f"{method}:{password}"
-        encoded_user_info = base64.b64encode(user_info.encode('utf-8')).decode('ascii')
-        
-        # Format address (handle IPv6)
-        formatted_address = cls._format_ipv6(address)
-        
-        return f"ss://{encoded_user_info}@{formatted_address}:{port}#{cls._url_encode(remark)}"
-    
-    @classmethod
-    def generate_subscription_from_inbound(cls,
-                                         inbound: InboundConfig,
-                                         server_address: str,
-                                         remark_prefix: str = "",
-                                         **transport_params) -> List[str]:
-        """
-        Generate subscription links from inbound configuration
-        
-        Args:
-            inbound: Inbound configuration
-            server_address: Public server address
-            remark_prefix: Prefix for link remarks
-            **transport_params: Additional transport parameters
-            
-        Returns:
-            List of subscription links for all users
-        """
-        links = []
-        protocol = inbound.protocol.lower()
-        port = inbound.port
-        tag = inbound.tag
-        
-        # Extract protocol-specific settings
-        if isinstance(inbound.settings, VLESSInboundConfig):
-            for client in inbound.settings.clients:
-                remark = f"{remark_prefix}{tag}_{client.email}" if remark_prefix else f"{tag}_{client.email}"
-                link = cls.generate_vless_link(
-                    uuid=client.account.id,
-                    address=server_address,
-                    port=port,
-                    remark=remark,
-                    **transport_params
-                )
-                links.append(link)
-                
-        elif isinstance(inbound.settings, VMeSSInboundConfig):
-            for client in inbound.settings.user:
-                remark = f"{remark_prefix}{tag}_{client.email}" if remark_prefix else f"{tag}_{client.email}"
-                link = cls.generate_vmess_link(
-                    uuid=client.account.id,
-                    address=server_address,
-                    port=port,
-                    remark=remark,
-                    **transport_params
-                )
-                links.append(link)
-                
-        elif isinstance(inbound.settings, TrojanServerConfig):
-            for client in inbound.settings.users:
-                remark = f"{remark_prefix}{tag}_{client.email}" if remark_prefix else f"{tag}_{client.email}"
-                link = cls.generate_trojan_link(
-                    password=client.password,
-                    address=server_address,
-                    port=port,
-                    remark=remark,
-                    **transport_params
-                )
-                links.append(link)
-        
-        return links
-    
-    @classmethod
-    def create_subscription_content(cls, links: List[str]) -> str:
-        """
-        Create base64 encoded subscription content
-        
-        Args:
-            links: List of subscription links
-            
-        Returns:
-            Base64 encoded subscription content
-        """
-        content = '\n'.join(links)
-        return base64.b64encode(content.encode('utf-8')).decode('ascii')
-    
-    @classmethod
-    def parse_subscription_content(cls, content: str) -> List[str]:
-        """
-        Parse base64 encoded subscription content
-        
-        Args:
-            content: Base64 encoded subscription content
-            
-        Returns:
-            List of subscription links
-        """
-        try:
-            decoded = base64.b64decode(content).decode('utf-8')
-            return [link.strip() for link in decoded.split('\n') if link.strip()]
-        except Exception as e:
-            raise ValueError(f"Invalid subscription content: {e}")
\ No newline at end of file