diff --git a/MIGRATION_GUIDE.md b/MIGRATION_GUIDE.md
new file mode 100644
index 0000000..2a5c60e
--- /dev/null
+++ b/MIGRATION_GUIDE.md
@@ -0,0 +1,188 @@
+# Player Configs Migration Guide
+
+## Overview
+
+Đây là tài liệu hướng dẫn migrate player settings từ bảng `user_preferences` sang bảng `player_configs` mới.
+
+### Tại sao cần migrate?
+
+- **user_preferences**: Một hàng mỗi user, không thể có nhiều cấu hình player
+- **player_configs**: Nhiều hàng mỗi user, hỗ trợ nhiều cấu hình player khác nhau
+
+### Các bước thực hiện
+
+## Bước 1: Chạy Migration SQL
+
+```bash
+cd /home/dat/projects/stream/stream.api
+
+# Cách 1: Dùng script tự động (khuyến nghị)
+./migrate_player_configs.sh
+
+# Cách 2: Chạy SQL thủ công
+psql -h 47.84.63.130 -U postgres -d video_db -f full_player_configs_migration.sql
+```
+
+### Script sẽ thực hiện:
+
+1. ✅ Tạo bảng `player_configs` với các columns:
+   - id, user_id, name, description
+   - autoplay, loop, muted, show_controls, pip, airplay, chromecast
+   - is_active, is_default, created_at, updated_at, version
+
+2. ✅ Migrate dữ liệu từ `user_preferences` sang `player_configs`:
+   - Mỗi user sẽ có 1 config mặc định tên "Default Config"
+   - Description là "Migrated from user_preferences"
+
+3. ✅ Xóa các columns player khỏi `user_preferences`:
+   - autoplay, loop, muted
+   - show_controls, pip, airplay, chromecast
+   - encrytion_m3u8 (VIP feature không dùng)
+
+4. ✅ Tạo indexes và triggers
+
+## Bước 2: Regenerate Go Models
+
+Sau khi migration xong, chạy:
+
+```bash
+go run cmd/gendb/main.go
+```
+
+Script này sẽ đọc schema mới từ database và regenerate:
+- `internal/database/model/user_preferences.gen.go` (không còn player fields)
+- `internal/database/model/player_configs.gen.go` (mới)
+- `internal/database/query/*.gen.go`
+
+## Bước 3: Cập nhật Code
+
+Sau khi models được regenerate, cập nhật các file sau:
+
+### 3.1. Cập nhật `internal/api/preferences/service.go`
+
+```go
+// Xóa các field player settings khỏi UpdateInput
+type UpdateInput struct {
+    EmailNotifications     *bool
+    PushNotifications      *bool
+    MarketingNotifications *bool
+    TelegramNotifications  *bool
+    // XÓA: Autoplay, Loop, Muted, ShowControls, Pip, Airplay, Chromecast
+    Language               *string
+    Locale                 *string
+}
+
+// Xóa logic update player settings khỏi UpdateUserPreferences
+```
+
+### 3.2. Cập nhật `internal/rpc/app/service_account.go`
+
+```go
+// UpdatePreferences chỉ update notification settings + language/locale
+func (s *appServices) UpdatePreferences(...) {
+    // Chỉ update các fields không phải player settings
+    pref, err := preferencesapi.UpdateUserPreferences(ctx, s.db, s.logger, result.UserID, preferencesapi.UpdateInput{
+        EmailNotifications:     req.EmailNotifications,
+        PushNotifications:      req.PushNotifications,
+        MarketingNotifications: req.MarketingNotifications,
+        TelegramNotifications:  req.TelegramNotifications,
+        Language:               req.Language,
+        Locale:                 req.Locale,
+        // XÓA: Autoplay, Loop, Muted, ShowControls, Pip, Airplay, Chromecast
+    })
+}
+```
+
+### 3.3. Sử dụng PlayerConfigs API cho player settings
+
+Thay vì dùng `UpdatePreferences` cho player settings, dùng:
+
+```go
+// Tạo hoặc cập nhật default player config
+func (s *appServices) UpdatePlayerSettings(ctx context.Context, req *appv1.UpdatePlayerSettingsRequest) {
+    // Dùng player_configs API đã implement
+    // ListPlayerConfigs, CreatePlayerConfig, UpdatePlayerConfig
+}
+```
+
+## Bước 4: Build và Test
+
+```bash
+# Build
+go build -o bin/api ./cmd/api
+
+# Test migration
+# 1. Kiểm tra bảng player_configs
+psql -h 47.84.63.130 -U postgres -d video_db -c "SELECT COUNT(*) FROM player_configs;"
+
+# 2. Kiểm tra user_preferences không còn player columns
+psql -h 47.84.63.130 -U postgres -d video_db -c "\d user_preferences"
+```
+
+## Rollback (nếu cần)
+
+Nếu muốn rollback:
+
+```sql
+-- Thêm lại columns vào user_preferences
+ALTER TABLE user_preferences
+    ADD COLUMN IF NOT EXISTS autoplay BOOLEAN DEFAULT FALSE,
+    ADD COLUMN IF NOT EXISTS loop BOOLEAN DEFAULT FALSE,
+    ADD COLUMN IF NOT EXISTS muted BOOLEAN DEFAULT FALSE,
+    ADD COLUMN IF NOT EXISTS show_controls BOOLEAN DEFAULT TRUE,
+    ADD COLUMN IF NOT EXISTS pip BOOLEAN DEFAULT TRUE,
+    ADD COLUMN IF NOT EXISTS airplay BOOLEAN DEFAULT TRUE,
+    ADD COLUMN IF NOT EXISTS chromecast BOOLEAN DEFAULT TRUE,
+    ADD COLUMN IF NOT EXISTS encrytion_m3u8 BOOLEAN DEFAULT FALSE;
+
+-- Copy dữ liệu từ player_configs về (cho default config)
+UPDATE user_preferences up
+SET autoplay = pc.autoplay,
+    loop = pc.loop,
+    muted = pc.muted,
+    show_controls = pc.show_controls,
+    pip = pc.pip,
+    airplay = pc.airplay,
+    chromecast = pc.chromecast
+FROM player_configs pc
+WHERE pc.user_id = up.user_id AND pc.is_default = TRUE;
+
+-- Xóa bảng player_configs
+DROP TABLE IF EXISTS player_configs CASCADE;
+```
+
+## Files liên quan
+
+### Migration scripts:
+- `migrations/001_create_player_configs_table.sql` - Tạo bảng
+- `migrations/002_migrate_player_settings.sql` - Migrate data
+- `full_player_configs_migration.sql` - Kết hợp cả 2
+- `install_player_configs.sql` - Script đơn giản để chạy trực tiếp
+- `migrate_player_configs.sh` - Shell script tự động hóa
+
+### Models:
+- `internal/database/model/player_configs.gen.go` - Model mới
+- `internal/database/model/user_preferences.gen.go` - Model cũ (sẽ thay đổi)
+
+### Services:
+- `internal/rpc/app/service_user_features.go` - Player configs CRUD
+- `internal/rpc/app/service_admin_finance_catalog.go` - Admin player configs
+- `internal/api/preferences/service.go` - Legacy preferences (cần update)
+
+### Frontend:
+- `stream.ui/src/routes/settings/PlayerConfigs/PlayerConfigs.vue` - UI mới
+- `stream.ui/src/routes/settings/Settings.vue` - Menu navigation
+
+## Timeline khuyến nghị
+
+1. **Tuần 1**: Chạy migration trên staging, test kỹ
+2. **Tuần 2**: Cập nhật code backend (preferences service)
+3. **Tuần 3**: Cập nhật frontend nếu cần
+4. **Tuần 4**: Deploy production
+
+## Lưu ý
+
+- ✅ Backup database trước khi chạy migration
+- ✅ Test trên staging trước khi production
+- ✅ Migration có transaction, sẽ rollback nếu lỗi
+- ✅ Dữ liệu user_preferences được giữ nguyên cho notification settings
diff --git a/api b/api
index a1b9cc8..50ecd83 100755
Binary files a/api and b/api differ
diff --git a/bin/api b/bin/api
index 8bcd5dc..362acea 100755
Binary files a/bin/api and b/bin/api differ
diff --git a/buf.gen.yaml b/buf.gen.yaml
index 4f8d0b1..87b07bd 100644
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@@ -9,7 +9,7 @@ plugins:
     opt:
       - paths=source_relative
   - remote: buf.build/community/stephenh-ts-proto
-    out: ../stream-ui/src/server/gen/proto
+    out: ../stream.ui/src/server/gen/proto
     opt:
       - env=node
       - esModuleInterop=true
diff --git a/cmd/api/main.go b/cmd/api/main.go
index 3490a56..4cadcb0 100644
--- a/cmd/api/main.go
+++ b/cmd/api/main.go
@@ -8,9 +8,9 @@ import (
 	"os/signal"
 	"syscall"
 
+	bootstrap "stream.api/internal/app"
 	"stream.api/internal/config"
 	"stream.api/internal/database/query"
-	videoruntime "stream.api/internal/video/runtime"
 	"stream.api/pkg/cache"
 	"stream.api/pkg/database"
 	"stream.api/pkg/logger"
@@ -47,7 +47,7 @@ func main() {
 	tokenProvider := token.NewJWTProvider(cfg.JWT.Secret)
 	appLogger := logger.NewLogger(cfg.Server.Mode)
 
-	module, err := videoruntime.NewModule(context.Background(), cfg, db, rdb, tokenProvider, appLogger)
+	module, err := bootstrap.NewGRPCModule(context.Background(), cfg, db, rdb, tokenProvider, appLogger)
 	if err != nil {
 		log.Fatalf("Failed to setup gRPC runtime module: %v", err)
 	}
diff --git a/cmd/gendb/main.go b/cmd/gendb/main.go
index 5b31af9..1c7c41b 100644
--- a/cmd/gendb/main.go
+++ b/cmd/gendb/main.go
@@ -2,16 +2,22 @@ package main
 
 import (
 	"log"
-	"os"
 
+	"gorm.io/datatypes"
 	"gorm.io/driver/postgres"
 	"gorm.io/gen"
 	"gorm.io/gen/field"
 	"gorm.io/gorm"
+	"stream.api/internal/config"
 )
 
 func main() {
-	dsn := os.Getenv("APP_DATABASE_DSN")
+	cfg, err := config.LoadConfig()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	dsn := cfg.Database.DSN
 	if dsn == "" {
 		log.Fatal("APP_DATABASE_DSN is required")
 	}
@@ -21,42 +27,44 @@ func main() {
 		log.Fatal("Không thể kết nối database:", err)
 	}
 
-	// 2. CẤU HÌNH GENERATOR
 	g := gen.NewGenerator(gen.Config{
 		OutPath:      "internal/database/query",
 		ModelPkgPath: "internal/database/model",
-		Mode:         gen.WithDefaultQuery | gen.WithQueryInterface, // Tạo cả query mặc định và interface để dễ mock test
+		Mode:         gen.WithDefaultQuery | gen.WithQueryInterface,
 
-		// Tùy chọn sinh code cho Model
-		FieldNullable:     true, // Sinh pointer (*) cho các field có thể NULL trong DB
-		FieldCoverable:    true, // Sinh pointer cho tất cả field (hữu ích khi dùng hàm Update zero value)
-		FieldSignable:     true, // Hỗ trợ unsigned integer
-		FieldWithIndexTag: true, // Sinh tag gorm:index
-		FieldWithTypeTag:  true, // Sinh tag gorm:type
+		FieldNullable:     true,
+		FieldCoverable:    true,
+		FieldSignable:     true,
+		FieldWithIndexTag: true,
+		FieldWithTypeTag:  true,
 	})
 
 	g.UseDB(db)
 
-	// 3. XỬ LÝ KIỂU DỮ LIỆU (Data Mapping)
-	// Ví dụ: Map decimal sang float64 thay vì string hoặc mảng byte
-	dataMap := map[string]func(gorm.ColumnType) (dataType string){
-		"decimal": func(columnType gorm.ColumnType) (dataType string) {
-			return "float64" // Hoặc "decimal.Decimal" nếu dùng shopspring/decimal
-		},
-		"numeric": func(columnType gorm.ColumnType) (dataType string) {
+	dataMap := map[string]func(gorm.ColumnType) string{
+		"decimal": func(columnType gorm.ColumnType) string {
 			return "float64"
 		},
-		"text[]": func(columnType gorm.ColumnType) (dataType string) {
-			return "[]string"
+		"numeric": func(columnType gorm.ColumnType) string {
+			return "float64"
 		},
-		"_text": func(columnType gorm.ColumnType) (dataType string) {
-			return "[]string"
+		"text[]": func(columnType gorm.ColumnType) string {
+			return "pq.StringArray"
+		},
+		"_text": func(columnType gorm.ColumnType) string {
+			return "pq.StringArray"
+		},
+		"json": func(columnType gorm.ColumnType) string {
+			return "datatypes.JSON"
+		},
+		"jsonb": func(columnType gorm.ColumnType) string {
+			return "datatypes.JSON"
 		},
 	}
-	g.WithDataTypeMap(dataMap)
-	g.WithImportPkgPath("github.com/lib/pq")
 
-	// 4. CÁC TÙY CHỌN (OPTIONS)
+	g.WithDataTypeMap(dataMap)
+	g.WithImportPkgPath("github.com/lib/pq", "gorm.io/datatypes")
+
 	g.WithOpts(
 		gen.FieldType("id", "string"),
 		gen.FieldType("features", "pq.StringArray"),
@@ -64,26 +72,13 @@ func main() {
 		gen.FieldGORMTag("version", func(tag field.GormTag) field.GormTag {
 			return tag.Set("version", "")
 		}),
-
 		gen.FieldJSONTag("password", "-"),
 		gen.FieldJSONTag("version", "-"),
 	)
 
-	// 5. CHỌN TABLE ĐỂ GENERATE
-	// GenerateAllTable() sẽ lấy tất cả, bao gồm cả bảng migration nếu có.
-	// Nếu muốn loại trừ bảng nào đó, hãy dùng logic filter hoặc liệt kê cụ thể.
-
-	// Cách 1: Lấy tất cả (như code cũ)
 	allTables := g.GenerateAllTable()
-
-	// Cách 2: (Khuyên dùng) Lọc bỏ các bảng rác hoặc hệ thống
-	// var tableModels []interface{}
-	// for _, tbl := range allTables {
-	// 	  // Logic lọc bảng ở đây nếu cần
-	//    tableModels = append(tableModels, tbl)
-	// }
-
 	g.ApplyBasic(allTables...)
-
 	g.Execute()
+
+	_ = datatypes.JSON{} // tránh import bị báo unused trong vài trường hợp
 }
diff --git a/full_player_configs_migration.sql b/full_player_configs_migration.sql
new file mode 100644
index 0000000..3d1990a
--- /dev/null
+++ b/full_player_configs_migration.sql
@@ -0,0 +1,143 @@
+-- Full migration script for player_configs
+-- This combines all migrations into one file for easy execution
+-- Run: psql -h 47.84.63.130 -U postgres -d video_db -f full_player_configs_migration.sql
+
+\echo '=============================================='
+\echo 'Starting full player_configs migration...'
+\echo '=============================================='
+
+BEGIN;
+
+-- ============================================================
+-- PART 1: Create player_configs table
+-- ============================================================
+
+CREATE TABLE IF NOT EXISTS player_configs (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    user_id UUID NOT NULL REFERENCES "user"(id) ON DELETE CASCADE,
+    name TEXT NOT NULL,
+    description TEXT,
+    autoplay BOOLEAN NOT NULL DEFAULT FALSE,
+    loop BOOLEAN NOT NULL DEFAULT FALSE,
+    muted BOOLEAN NOT NULL DEFAULT FALSE,
+    show_controls BOOLEAN NOT NULL DEFAULT TRUE,
+    pip BOOLEAN NOT NULL DEFAULT TRUE,
+    airplay BOOLEAN NOT NULL DEFAULT TRUE,
+    chromecast BOOLEAN NOT NULL DEFAULT TRUE,
+    is_active BOOLEAN NOT NULL DEFAULT TRUE,
+    is_default BOOLEAN NOT NULL DEFAULT FALSE,
+    created_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL,
+    version BIGINT NOT NULL DEFAULT 1
+);
+
+CREATE INDEX IF NOT EXISTS idx_player_configs_user_id ON player_configs(user_id);
+CREATE INDEX IF NOT EXISTS idx_player_configs_is_default ON player_configs(is_default);
+CREATE INDEX IF NOT EXISTS idx_player_configs_user_default ON player_configs(user_id, is_default);
+
+CREATE OR REPLACE FUNCTION update_player_configs_updated_at()
+RETURNS TRIGGER AS $$
+BEGIN
+    NEW.updated_at = CURRENT_TIMESTAMP;
+    NEW.version = OLD.version + 1;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS trg_update_player_configs ON player_configs;
+
+CREATE TRIGGER trg_update_player_configs
+BEFORE UPDATE ON player_configs
+FOR EACH ROW
+EXECUTE FUNCTION update_player_configs_updated_at();
+
+-- ============================================================
+-- PART 2: Migrate data from user_preferences
+-- ============================================================
+
+INSERT INTO player_configs (
+    id, user_id, name, description,
+    autoplay, loop, muted,
+    show_controls, pip, airplay, chromecast,
+    is_active, is_default,
+    created_at, updated_at, version
+)
+SELECT
+    gen_random_uuid(),
+    up.user_id,
+    'Default Config',
+    'Migrated from user_preferences',
+    COALESCE(up.autoplay, FALSE),
+    COALESCE(up.loop, FALSE),
+    COALESCE(up.muted, FALSE),
+    COALESCE(up.show_controls, TRUE),
+    COALESCE(up.pip, TRUE),
+    COALESCE(up.airplay, TRUE),
+    COALESCE(up.chromecast, TRUE),
+    TRUE,
+    TRUE,
+    COALESCE(up.created_at, CURRENT_TIMESTAMP),
+    CURRENT_TIMESTAMP,
+    COALESCE(up.version, 1)
+FROM user_preferences up
+WHERE NOT EXISTS (
+    SELECT 1 FROM player_configs pc WHERE pc.user_id = up.user_id AND pc.is_default = TRUE
+);
+
+-- ============================================================
+-- PART 3: Remove old columns from user_preferences
+-- ============================================================
+
+ALTER TABLE user_preferences
+    DROP COLUMN IF EXISTS autoplay,
+    DROP COLUMN IF EXISTS loop,
+    DROP COLUMN IF EXISTS muted,
+    DROP COLUMN IF EXISTS show_controls,
+    DROP COLUMN IF EXISTS pip,
+    DROP COLUMN IF EXISTS airplay,
+    DROP COLUMN IF EXISTS chromecast,
+    DROP COLUMN IF EXISTS encrytion_m3u8;
+
+-- ============================================================
+-- PART 4: Add constraints
+-- ============================================================
+
+CREATE UNIQUE INDEX IF NOT EXISTS idx_player_configs_one_default_per_user
+ON player_configs(user_id)
+WHERE is_default = TRUE;
+
+-- ============================================================
+-- Verification
+-- ============================================================
+
+DO $$
+DECLARE
+    migrated_count INTEGER;
+    prefs_count INTEGER;
+BEGIN
+    SELECT COUNT(*) INTO migrated_count FROM player_configs WHERE description = 'Migrated from user_preferences';
+    SELECT COUNT(*) INTO prefs_count FROM user_preferences;
+
+    RAISE NOTICE '============================================';
+    RAISE NOTICE 'Migration completed!';
+    RAISE NOTICE 'User preferences rows: %', prefs_count;
+    RAISE NOTICE 'Player configs created: %', migrated_count;
+    RAISE NOTICE '============================================';
+END $$;
+
+COMMIT;
+
+-- Verify columns removed from user_preferences
+SELECT 'user_preferences columns:' AS info;
+SELECT column_name, data_type FROM information_schema.columns WHERE table_name = 'user_preferences' ORDER BY ordinal_position;
+
+-- Verify player_configs structure
+SELECT 'player_configs columns:' AS info;
+SELECT column_name, data_type FROM information_schema.columns WHERE table_name = 'player_configs' ORDER BY ordinal_position;
+
+-- Sample data
+SELECT 'Sample migrated data:' AS info;
+SELECT pc.user_id, pc.name, pc.autoplay, pc.loop, pc.muted, pc.show_controls, pc.is_default
+FROM player_configs pc
+WHERE pc.description = 'Migrated from user_preferences'
+LIMIT 5;
diff --git a/go.mod b/go.mod
index 261f1d7..928f1c1 100644
--- a/go.mod
+++ b/go.mod
@@ -19,6 +19,7 @@ require (
 	google.golang.org/grpc v1.79.2
 	google.golang.org/protobuf v1.36.11
 	gorm.io/driver/postgres v1.6.0
+	gorm.io/driver/sqlite v1.6.0
 	gorm.io/gen v0.3.27
 	gorm.io/gorm v1.31.1
 	gorm.io/plugin/dbresolver v1.6.2
@@ -44,6 +45,7 @@ require (
 	github.com/aws/smithy-go v1.24.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
@@ -54,7 +56,11 @@ require (
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-sqlite3 v1.14.22 // indirect
+	github.com/ncruces/go-strftime v1.0.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/sagikazarmark/locafero v0.11.0 // indirect
 	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
@@ -64,6 +70,7 @@ require (
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
 	golang.org/x/mod v0.32.0 // indirect
 	golang.org/x/net v0.49.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
@@ -74,4 +81,8 @@ require (
 	gorm.io/datatypes v1.2.4 // indirect
 	gorm.io/driver/mysql v1.5.7 // indirect
 	gorm.io/hints v1.1.0 // indirect
+	modernc.org/libc v1.67.6 // indirect
+	modernc.org/mathutil v1.7.1 // indirect
+	modernc.org/memory v1.11.0 // indirect
+	modernc.org/sqlite v1.46.1 // indirect
 )
diff --git a/go.sum b/go.sum
index e5b2c50..f21c9ed 100644
--- a/go.sum
+++ b/go.sum
@@ -51,6 +51,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/eclipse/paho.mqtt.golang v1.5.1 h1:/VSOv3oDLlpqR2Epjn1Q7b2bSTplJIeV2ISgCl2W7nE=
 github.com/eclipse/paho.mqtt.golang v1.5.1/go.mod h1:1/yJCneuyOoCOzKSsOTUc0AJfpsItBGWvYpBLimhArU=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
@@ -99,17 +101,23 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lib/pq v1.11.2 h1:x6gxUeu39V0BHZiugWe8LXZYZ+Utk7hSJGThs8sdzfs=
 github.com/lib/pq v1.11.2/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/microsoft/go-mssqldb v0.17.0 h1:Fto83dMZPnYv1Zwx5vHHxpNraeEaUlQ/hhHLgZiaenE=
 github.com/microsoft/go-mssqldb v0.17.0/go.mod h1:OkoNGhGEs8EZqchVTtochlXruEhEOaO4S0d2sB5aeGQ=
+github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
+github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
 github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/redis/go-redis/v9 v9.17.2 h1:P2EGsA4qVIM3Pp+aPocCJ7DguDHhqrXNhVcEp4ViluI=
 github.com/redis/go-redis/v9 v9.17.2/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc=
@@ -153,6 +161,8 @@ go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
 golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
+golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
+golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
 golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
 golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
 golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
@@ -161,6 +171,7 @@ golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
 golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
 golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
 golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
 golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
@@ -203,3 +214,11 @@ gorm.io/hints v1.1.0 h1:Lp4z3rxREufSdxn4qmkK3TLDltrM10FLTHiuqwDPvXw=
 gorm.io/hints v1.1.0/go.mod h1:lKQ0JjySsPBj3uslFzY3JhYDtqEwzm+G1hv8rWujB6Y=
 gorm.io/plugin/dbresolver v1.6.2 h1:F4b85TenghUeITqe3+epPSUtHH7RIk3fXr5l83DF8Pc=
 gorm.io/plugin/dbresolver v1.6.2/go.mod h1:tctw63jdrOezFR9HmrKnPkmig3m5Edem9fdxk9bQSzM=
+modernc.org/libc v1.67.6 h1:eVOQvpModVLKOdT+LvBPjdQqfrZq+pC39BygcT+E7OI=
+modernc.org/libc v1.67.6/go.mod h1:JAhxUVlolfYDErnwiqaLvUqc8nfb2r6S6slAgZOnaiE=
+modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
+modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
+modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
+modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
+modernc.org/sqlite v1.46.1 h1:eFJ2ShBLIEnUWlLy12raN0Z1plqmFX9Qe3rjQTKt6sU=
+modernc.org/sqlite v1.46.1/go.mod h1:CzbrU2lSB1DKUusvwGz7rqEKIq+NUd8GWuBBZDs9/nA=
diff --git a/install_player_configs.sql b/install_player_configs.sql
new file mode 100644
index 0000000..b5a9120
--- /dev/null
+++ b/install_player_configs.sql
@@ -0,0 +1,55 @@
+-- Quick install script for player_configs table
+-- Run this directly in your PostgreSQL database
+-- Usage: psql -d video_db -f install_player_configs.sql
+
+BEGIN;
+
+-- Create player_configs table
+CREATE TABLE IF NOT EXISTS player_configs (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    user_id UUID NOT NULL REFERENCES "user"(id) ON DELETE CASCADE,
+    name TEXT NOT NULL,
+    description TEXT,
+    autoplay BOOLEAN NOT NULL DEFAULT FALSE,
+    loop BOOLEAN NOT NULL DEFAULT FALSE,
+    muted BOOLEAN NOT NULL DEFAULT FALSE,
+    show_controls BOOLEAN NOT NULL DEFAULT TRUE,
+    pip BOOLEAN NOT NULL DEFAULT TRUE,
+    airplay BOOLEAN NOT NULL DEFAULT TRUE,
+    chromecast BOOLEAN NOT NULL DEFAULT TRUE,
+    is_active BOOLEAN NOT NULL DEFAULT TRUE,
+    is_default BOOLEAN NOT NULL DEFAULT FALSE,
+    created_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL,
+    version BIGINT NOT NULL DEFAULT 1
+);
+
+-- Indexes
+CREATE INDEX IF NOT EXISTS idx_player_configs_user_id ON player_configs(user_id);
+CREATE INDEX IF NOT EXISTS idx_player_configs_is_default ON player_configs(is_default);
+CREATE INDEX IF NOT EXISTS idx_player_configs_user_default ON player_configs(user_id, is_default);
+
+-- Trigger to auto-update updated_at and version
+CREATE OR REPLACE FUNCTION update_player_configs_updated_at()
+RETURNS TRIGGER AS $$
+BEGIN
+    NEW.updated_at = CURRENT_TIMESTAMP;
+    NEW.version = OLD.version + 1;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS trg_update_player_configs ON player_configs;
+
+CREATE TRIGGER trg_update_player_configs
+BEFORE UPDATE ON player_configs
+FOR EACH ROW
+EXECUTE FUNCTION update_player_configs_updated_at();
+
+COMMIT;
+
+-- Verify installation
+SELECT table_name, column_name, data_type
+FROM information_schema.columns
+WHERE table_name = 'player_configs'
+ORDER BY ordinal_position;
diff --git a/internal/api/admin/ad_templates.go b/internal/api/admin/ad_templates.go
deleted file mode 100644
index dfa19e6..0000000
--- a/internal/api/admin/ad_templates.go
+++ /dev/null
@@ -1,390 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package admin
-
-import (
-	"errors"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-
-	// "stream.api/internal/database/model"
-	"stream.api/internal/database/model"
-	"stream.api/pkg/response"
-)
-
-type AdminAdTemplatePayload struct {
-	ID          string `json:"id"`
-	UserID      string `json:"user_id"`
-	Name        string `json:"name"`
-	Description string `json:"description"`
-	VastTagURL  string `json:"vast_tag_url"`
-	AdFormat    string `json:"ad_format"`
-	Duration    *int64 `json:"duration,omitempty"`
-	IsActive    bool   `json:"is_active"`
-	IsDefault   bool   `json:"is_default"`
-	OwnerEmail  string `json:"owner_email,omitempty"`
-	CreatedAt   string `json:"created_at"`
-	UpdatedAt   string `json:"updated_at"`
-}
-
-type SaveAdminAdTemplateRequest struct {
-	UserID      string `json:"user_id" binding:"required"`
-	Name        string `json:"name" binding:"required"`
-	Description string `json:"description"`
-	VASTTagURL  string `json:"vast_tag_url" binding:"required"`
-	AdFormat    string `json:"ad_format"`
-	Duration    *int64 `json:"duration"`
-	IsActive    *bool  `json:"is_active"`
-	IsDefault   *bool  `json:"is_default"`
-}
-
-func normalizeAdminAdFormat(value string) string {
-	switch strings.TrimSpace(strings.ToLower(value)) {
-	case "mid-roll", "post-roll":
-		return strings.TrimSpace(strings.ToLower(value))
-	default:
-		return "pre-roll"
-	}
-}
-
-func unsetAdminDefaultTemplates(tx *gorm.DB, userID, excludeID string) error {
-	query := tx.Model(&model.AdTemplate{}).Where("user_id = ?", userID)
-	if excludeID != "" {
-		query = query.Where("id <> ?", excludeID)
-	}
-	return query.Update("is_default", false).Error
-}
-
-func validateAdminAdTemplateRequest(req *SaveAdminAdTemplateRequest) string {
-	if strings.TrimSpace(req.UserID) == "" {
-		return "User ID is required"
-	}
-	if strings.TrimSpace(req.Name) == "" || strings.TrimSpace(req.VASTTagURL) == "" {
-		return "Name and VAST URL are required"
-	}
-	format := normalizeAdminAdFormat(req.AdFormat)
-	if format == "mid-roll" && (req.Duration == nil || *req.Duration <= 0) {
-		return "Duration is required for mid-roll templates"
-	}
-	return ""
-}
-
-func (h *Handler) buildAdminAdTemplatePayload(ctx *gin.Context, item model.AdTemplate, ownerEmail string) AdminAdTemplatePayload {
-	return AdminAdTemplatePayload{
-		ID:          item.ID,
-		UserID:      item.UserID,
-		Name:        item.Name,
-		Description: adminStringValue(item.Description),
-		VastTagURL:  item.VastTagURL,
-		AdFormat:    adminStringValue(item.AdFormat),
-		Duration:    item.Duration,
-		IsActive:    adminBoolValue(item.IsActive, true),
-		IsDefault:   item.IsDefault,
-		OwnerEmail:  ownerEmail,
-		CreatedAt:   adminFormatTime(item.CreatedAt),
-		UpdatedAt:   adminFormatTime(item.UpdatedAt),
-	}
-}
-
-// @Summary      List All Ad Templates
-// @Description  Get paginated list of all ad templates across users (admin only)
-// @Tags         admin
-// @Produce      json
-// @Param        page query int false "Page" default(1)
-// @Param        limit query int false "Limit" default(20)
-// @Param        user_id query string false "Filter by user ID"
-// @Param        search query string false "Search by name"
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      403  {object}  response.Response
-// @Router       /admin/ad-templates [get]
-// @Security     BearerAuth
-func (h *Handler) ListAdTemplates(c *gin.Context) {
-	ctx := c.Request.Context()
-	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
-	if page < 1 {
-		page = 1
-	}
-	limit, _ := strconv.Atoi(c.DefaultQuery("limit", "20"))
-	if limit <= 0 {
-		limit = 20
-	}
-	if limit > 100 {
-		limit = 100
-	}
-	offset := (page - 1) * limit
-
-	search := strings.TrimSpace(c.Query("search"))
-	userID := strings.TrimSpace(c.Query("user_id"))
-
-	db := h.db.WithContext(ctx).Model(&model.AdTemplate{})
-	if search != "" {
-		like := "%" + search + "%"
-		db = db.Where("name ILIKE ?", like)
-	}
-	if userID != "" {
-		db = db.Where("user_id = ?", userID)
-	}
-
-	var total int64
-	if err := db.Count(&total).Error; err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to list ad templates")
-		return
-	}
-
-	var templates []model.AdTemplate
-	if err := db.Order("created_at DESC").Offset(offset).Limit(limit).Find(&templates).Error; err != nil {
-		h.logger.Error("Failed to list ad templates", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to list ad templates")
-		return
-	}
-
-	ownerIDs := map[string]bool{}
-	for _, t := range templates {
-		ownerIDs[t.UserID] = true
-	}
-	ownerEmails := map[string]string{}
-	if len(ownerIDs) > 0 {
-		ids := make([]string, 0, len(ownerIDs))
-		for id := range ownerIDs {
-			ids = append(ids, id)
-		}
-		var users []struct{ ID, Email string }
-		h.db.WithContext(ctx).Table("\"user\"").Select("id, email").Where("id IN ?", ids).Find(&users)
-		for _, u := range users {
-			ownerEmails[u.ID] = u.Email
-		}
-	}
-
-	result := make([]AdminAdTemplatePayload, 0, len(templates))
-	for _, t := range templates {
-		result = append(result, h.buildAdminAdTemplatePayload(c, t, ownerEmails[t.UserID]))
-	}
-
-	response.Success(c, gin.H{
-		"templates": result,
-		"total":     total,
-		"page":      page,
-		"limit":     limit,
-	})
-}
-
-// @Summary      Get Ad Template Detail
-// @Description  Get ad template detail (admin only)
-// @Tags         admin
-// @Produce      json
-// @Param        id path string true "Ad Template ID"
-// @Success      200  {object}  response.Response
-// @Router       /admin/ad-templates/{id} [get]
-// @Security     BearerAuth
-func (h *Handler) GetAdTemplate(c *gin.Context) {
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Ad template not found")
-		return
-	}
-
-	var item model.AdTemplate
-	if err := h.db.WithContext(c.Request.Context()).Where("id = ?", id).First(&item).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusNotFound, "Ad template not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to load ad template")
-		return
-	}
-
-	ownerEmail := ""
-	var user model.User
-	if err := h.db.WithContext(c.Request.Context()).Select("id, email").Where("id = ?", item.UserID).First(&user).Error; err == nil {
-		ownerEmail = user.Email
-	}
-
-	response.Success(c, gin.H{"template": h.buildAdminAdTemplatePayload(c, item, ownerEmail)})
-}
-
-// @Summary      Create Ad Template
-// @Description  Create an ad template for any user (admin only)
-// @Tags         admin
-// @Accept       json
-// @Produce      json
-// @Param        request body SaveAdminAdTemplateRequest true "Ad template payload"
-// @Success      201  {object}  response.Response
-// @Router       /admin/ad-templates [post]
-// @Security     BearerAuth
-func (h *Handler) CreateAdTemplate(c *gin.Context) {
-	var req SaveAdminAdTemplateRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-	if msg := validateAdminAdTemplateRequest(&req); msg != "" {
-		response.Error(c, http.StatusBadRequest, msg)
-		return
-	}
-
-	ctx := c.Request.Context()
-	var user model.User
-	if err := h.db.WithContext(ctx).Where("id = ?", strings.TrimSpace(req.UserID)).First(&user).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusBadRequest, "User not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to save ad template")
-		return
-	}
-
-	item := &model.AdTemplate{
-		ID:          uuid.New().String(),
-		UserID:      user.ID,
-		Name:        strings.TrimSpace(req.Name),
-		Description: adminStringPtr(req.Description),
-		VastTagURL:  strings.TrimSpace(req.VASTTagURL),
-		AdFormat:    model.StringPtr(normalizeAdminAdFormat(req.AdFormat)),
-		Duration:    req.Duration,
-		IsActive:    model.BoolPtr(req.IsActive == nil || *req.IsActive),
-		IsDefault:   req.IsDefault != nil && *req.IsDefault,
-	}
-	if !adminBoolValue(item.IsActive, true) {
-		item.IsDefault = false
-	}
-
-	if err := h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if item.IsDefault {
-			if err := unsetAdminDefaultTemplates(tx, item.UserID, ""); err != nil {
-				return err
-			}
-		}
-		return tx.Create(item).Error
-	}); err != nil {
-		h.logger.Error("Failed to create ad template", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to save ad template")
-		return
-	}
-
-	response.Created(c, gin.H{"template": h.buildAdminAdTemplatePayload(c, *item, user.Email)})
-}
-
-// @Summary      Update Ad Template
-// @Description  Update an ad template for any user (admin only)
-// @Tags         admin
-// @Accept       json
-// @Produce      json
-// @Param        id path string true "Ad Template ID"
-// @Param        request body SaveAdminAdTemplateRequest true "Ad template payload"
-// @Success      200  {object}  response.Response
-// @Router       /admin/ad-templates/{id} [put]
-// @Security     BearerAuth
-func (h *Handler) UpdateAdTemplate(c *gin.Context) {
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Ad template not found")
-		return
-	}
-
-	var req SaveAdminAdTemplateRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-	if msg := validateAdminAdTemplateRequest(&req); msg != "" {
-		response.Error(c, http.StatusBadRequest, msg)
-		return
-	}
-
-	ctx := c.Request.Context()
-	var user model.User
-	if err := h.db.WithContext(ctx).Where("id = ?", strings.TrimSpace(req.UserID)).First(&user).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusBadRequest, "User not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to save ad template")
-		return
-	}
-
-	var item model.AdTemplate
-	if err := h.db.WithContext(ctx).Where("id = ?", id).First(&item).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusNotFound, "Ad template not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to save ad template")
-		return
-	}
-
-	item.UserID = user.ID
-	item.Name = strings.TrimSpace(req.Name)
-	item.Description = adminStringPtr(req.Description)
-	item.VastTagURL = strings.TrimSpace(req.VASTTagURL)
-	item.AdFormat = model.StringPtr(normalizeAdminAdFormat(req.AdFormat))
-	item.Duration = req.Duration
-	if req.IsActive != nil {
-		item.IsActive = model.BoolPtr(*req.IsActive)
-	}
-	if req.IsDefault != nil {
-		item.IsDefault = *req.IsDefault
-	}
-	if !adminBoolValue(item.IsActive, true) {
-		item.IsDefault = false
-	}
-
-	if err := h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if item.IsDefault {
-			if err := unsetAdminDefaultTemplates(tx, item.UserID, item.ID); err != nil {
-				return err
-			}
-		}
-		return tx.Save(&item).Error
-	}); err != nil {
-		h.logger.Error("Failed to update ad template", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to save ad template")
-		return
-	}
-
-	response.Success(c, gin.H{"template": h.buildAdminAdTemplatePayload(c, item, user.Email)})
-}
-
-// @Summary      Delete Ad Template (Admin)
-// @Description  Delete any ad template by ID (admin only)
-// @Tags         admin
-// @Produce      json
-// @Param        id path string true "Ad Template ID"
-// @Success      200  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Router       /admin/ad-templates/{id} [delete]
-// @Security     BearerAuth
-func (h *Handler) DeleteAdTemplate(c *gin.Context) {
-	id := c.Param("id")
-
-	err := h.db.WithContext(c.Request.Context()).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Where("ad_template_id = ?", id).Delete(&model.VideoAdConfig{}).Error; err != nil {
-			return err
-		}
-		res := tx.Where("id = ?", id).Delete(&model.AdTemplate{})
-		if res.Error != nil {
-			return res.Error
-		}
-		if res.RowsAffected == 0 {
-			return gorm.ErrRecordNotFound
-		}
-		return nil
-	})
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			response.Error(c, http.StatusNotFound, "Ad template not found")
-			return
-		}
-		h.logger.Error("Failed to delete ad template", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to delete ad template")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "Ad template deleted"})
-}
diff --git a/internal/api/admin/common.go b/internal/api/admin/common.go
deleted file mode 100644
index fa9f893..0000000
--- a/internal/api/admin/common.go
+++ /dev/null
@@ -1,94 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package admin
-
-import (
-	"fmt"
-	"strings"
-	"time"
-)
-
-func adminFormatTime(value *time.Time) string {
-	if value == nil {
-		return ""
-	}
-	return value.UTC().Format(time.RFC3339)
-}
-
-func adminFormatTimeValue(value time.Time) string {
-	if value.IsZero() {
-		return ""
-	}
-	return value.UTC().Format(time.RFC3339)
-}
-
-func adminStringPtr(value string) *string {
-	trimmed := strings.TrimSpace(value)
-	if trimmed == "" {
-		return nil
-	}
-	return &trimmed
-}
-
-func adminStringValue(value *string) string {
-	if value == nil {
-		return ""
-	}
-	return strings.TrimSpace(*value)
-}
-
-func adminInt64Ptr(value *int64) *int64 {
-	if value == nil {
-		return nil
-	}
-	return value
-}
-
-func adminStringSlice(values []string) []string {
-	if len(values) == 0 {
-		return nil
-	}
-
-	result := make([]string, 0, len(values))
-	for _, value := range values {
-		trimmed := strings.TrimSpace(value)
-		if trimmed == "" {
-			continue
-		}
-		result = append(result, trimmed)
-	}
-
-	if len(result) == 0 {
-		return nil
-	}
-
-	return result
-}
-
-func adminStringSliceValue(values []string) []string {
-	if len(values) == 0 {
-		return []string{}
-	}
-
-	return append([]string(nil), values...)
-}
-
-func adminBoolValue(value *bool, fallback bool) bool {
-	if value == nil {
-		return fallback
-	}
-	return *value
-}
-
-func adminInvoiceID(id string) string {
-	trimmed := strings.ReplaceAll(strings.TrimSpace(id), "-", "")
-	if len(trimmed) > 12 {
-		trimmed = trimmed[:12]
-	}
-	return "INV-" + strings.ToUpper(trimmed)
-}
-
-func adminTransactionID(prefix string) string {
-	return fmt.Sprintf("%s_%d", prefix, time.Now().UnixNano())
-}
diff --git a/internal/api/admin/dashboard.go b/internal/api/admin/dashboard.go
deleted file mode 100644
index b7148e6..0000000
--- a/internal/api/admin/dashboard.go
+++ /dev/null
@@ -1,68 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package admin
-
-import (
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"stream.api/internal/database/model"
-	"stream.api/pkg/response"
-)
-
-type DashboardPayload struct {
-	TotalUsers          int64   `json:"total_users"`
-	TotalVideos         int64   `json:"total_videos"`
-	TotalStorageUsed    int64   `json:"total_storage_used"`
-	TotalPayments       int64   `json:"total_payments"`
-	TotalRevenue        float64 `json:"total_revenue"`
-	ActiveSubscriptions int64   `json:"active_subscriptions"`
-	TotalAdTemplates    int64   `json:"total_ad_templates"`
-	NewUsersToday       int64   `json:"new_users_today"`
-	NewVideosToday      int64   `json:"new_videos_today"`
-}
-
-// @Summary      Admin Dashboard
-// @Description  Get system-wide statistics for the admin dashboard
-// @Tags         admin
-// @Produce      json
-// @Success      200  {object}  response.Response{data=DashboardPayload}
-// @Failure      401  {object}  response.Response
-// @Failure      403  {object}  response.Response
-// @Router       /admin/dashboard [get]
-// @Security     BearerAuth
-func (h *Handler) Dashboard(c *gin.Context) {
-	ctx := c.Request.Context()
-	var payload DashboardPayload
-
-	h.db.WithContext(ctx).Model(&model.User{}).Count(&payload.TotalUsers)
-	h.db.WithContext(ctx).Model(&model.Video{}).Count(&payload.TotalVideos)
-
-	h.db.WithContext(ctx).Model(&model.User{}).
-		Select("COALESCE(SUM(storage_used), 0)").
-		Row().Scan(&payload.TotalStorageUsed)
-
-	h.db.WithContext(ctx).Model(&model.Payment{}).Count(&payload.TotalPayments)
-
-	h.db.WithContext(ctx).Model(&model.Payment{}).
-		Where("status = ?", "SUCCESS").
-		Select("COALESCE(SUM(amount), 0)").
-		Row().Scan(&payload.TotalRevenue)
-
-	h.db.WithContext(ctx).Model(&model.PlanSubscription{}).
-		Where("expires_at > ?", time.Now()).
-		Count(&payload.ActiveSubscriptions)
-
-	h.db.WithContext(ctx).Model(&model.AdTemplate{}).Count(&payload.TotalAdTemplates)
-
-	today := time.Now().Truncate(24 * time.Hour)
-	h.db.WithContext(ctx).Model(&model.User{}).
-		Where("created_at >= ?", today).
-		Count(&payload.NewUsersToday)
-	h.db.WithContext(ctx).Model(&model.Video{}).
-		Where("created_at >= ?", today).
-		Count(&payload.NewVideosToday)
-
-	response.Success(c, payload)
-}
diff --git a/internal/api/admin/handler.go b/internal/api/admin/handler.go
deleted file mode 100644
index 5616bcd..0000000
--- a/internal/api/admin/handler.go
+++ /dev/null
@@ -1,26 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package admin
-
-import (
-	"gorm.io/gorm"
-	runtimegrpc "stream.api/internal/video/runtime/grpc"
-	"stream.api/internal/video/runtime/services"
-	"stream.api/pkg/logger"
-)
-
-type RenderRuntime interface {
-	JobService() *services.JobService
-	AgentRuntime() *runtimegrpc.Server
-}
-
-type Handler struct {
-	logger  logger.Logger
-	db      *gorm.DB
-	runtime RenderRuntime
-}
-
-func NewHandler(l logger.Logger, db *gorm.DB, renderRuntime RenderRuntime) *Handler {
-	return &Handler{logger: l, db: db, runtime: renderRuntime}
-}
diff --git a/internal/api/admin/payments.go b/internal/api/admin/payments.go
deleted file mode 100644
index d05f254..0000000
--- a/internal/api/admin/payments.go
+++ /dev/null
@@ -1,521 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package admin
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-	"stream.api/internal/database/model"
-	"stream.api/pkg/response"
-)
-
-const (
-	adminWalletTransactionTypeTopup             = "topup"
-	adminWalletTransactionTypeSubscriptionDebit = "subscription_debit"
-	adminPaymentMethodWallet                    = "wallet"
-	adminPaymentMethodTopup                     = "topup"
-)
-
-var adminAllowedTermMonths = map[int32]struct{}{
-	1: {}, 3: {}, 6: {}, 12: {},
-}
-
-type AdminPaymentPayload struct {
-	ID            string   `json:"id"`
-	UserID        string   `json:"user_id"`
-	PlanID        *string  `json:"plan_id,omitempty"`
-	Amount        float64  `json:"amount"`
-	Currency      string   `json:"currency"`
-	Status        string   `json:"status"`
-	Provider      string   `json:"provider"`
-	TransactionID string   `json:"transaction_id,omitempty"`
-	UserEmail     string   `json:"user_email,omitempty"`
-	PlanName      string   `json:"plan_name,omitempty"`
-	InvoiceID     string   `json:"invoice_id"`
-	TermMonths    *int32   `json:"term_months,omitempty"`
-	PaymentMethod *string  `json:"payment_method,omitempty"`
-	ExpiresAt     *string  `json:"expires_at,omitempty"`
-	WalletAmount  *float64 `json:"wallet_amount,omitempty"`
-	TopupAmount   *float64 `json:"topup_amount,omitempty"`
-	CreatedAt     string   `json:"created_at"`
-	UpdatedAt     string   `json:"updated_at"`
-}
-
-type CreateAdminPaymentRequest struct {
-	UserID        string   `json:"user_id" binding:"required"`
-	PlanID        string   `json:"plan_id" binding:"required"`
-	TermMonths    int32    `json:"term_months" binding:"required"`
-	PaymentMethod string   `json:"payment_method" binding:"required"`
-	TopupAmount   *float64 `json:"topup_amount,omitempty"`
-}
-
-type UpdateAdminPaymentRequest struct {
-	Status string `json:"status" binding:"required"`
-}
-
-func normalizeAdminPaymentMethod(value string) string {
-	switch strings.ToLower(strings.TrimSpace(value)) {
-	case adminPaymentMethodWallet:
-		return adminPaymentMethodWallet
-	case adminPaymentMethodTopup:
-		return adminPaymentMethodTopup
-	default:
-		return ""
-	}
-}
-
-func normalizeAdminPaymentStatus(value string) string {
-	switch strings.ToUpper(strings.TrimSpace(value)) {
-	case "PENDING":
-		return "PENDING"
-	case "FAILED":
-		return "FAILED"
-	default:
-		return "SUCCESS"
-	}
-}
-
-func adminIsAllowedTermMonths(value int32) bool {
-	_, ok := adminAllowedTermMonths[value]
-	return ok
-}
-
-func (h *Handler) loadAdminPaymentPayload(ctx *gin.Context, payment model.Payment) (AdminPaymentPayload, error) {
-	payload := AdminPaymentPayload{
-		ID:            payment.ID,
-		UserID:        payment.UserID,
-		PlanID:        payment.PlanID,
-		Amount:        payment.Amount,
-		Currency:      strings.ToUpper(adminStringValue(payment.Currency)),
-		Status:        normalizeAdminPaymentStatus(adminStringValue(payment.Status)),
-		Provider:      strings.ToUpper(adminStringValue(payment.Provider)),
-		TransactionID: adminStringValue(payment.TransactionID),
-		InvoiceID:     adminInvoiceID(payment.ID),
-		CreatedAt:     adminFormatTime(payment.CreatedAt),
-		UpdatedAt:     adminFormatTimeValue(payment.UpdatedAt),
-	}
-	if payload.Currency == "" {
-		payload.Currency = "USD"
-	}
-
-	var user model.User
-	if err := h.db.WithContext(ctx.Request.Context()).Select("id, email").Where("id = ?", payment.UserID).First(&user).Error; err == nil {
-		payload.UserEmail = user.Email
-	}
-
-	if payment.PlanID != nil && strings.TrimSpace(*payment.PlanID) != "" {
-		var plan model.Plan
-		if err := h.db.WithContext(ctx.Request.Context()).Where("id = ?", *payment.PlanID).First(&plan).Error; err == nil {
-			payload.PlanName = plan.Name
-		}
-	}
-
-	var subscription model.PlanSubscription
-	if err := h.db.WithContext(ctx.Request.Context()).Where("payment_id = ?", payment.ID).Order("created_at DESC").First(&subscription).Error; err == nil {
-		payload.TermMonths = &subscription.TermMonths
-		method := subscription.PaymentMethod
-		payload.PaymentMethod = &method
-		expiresAt := subscription.ExpiresAt.UTC().Format(time.RFC3339)
-		payload.ExpiresAt = &expiresAt
-		payload.WalletAmount = &subscription.WalletAmount
-		payload.TopupAmount = &subscription.TopupAmount
-	}
-
-	return payload, nil
-}
-
-func (h *Handler) adminLockUserForUpdate(ctx *gin.Context, tx *gorm.DB, userID string) (*model.User, error) {
-	var user model.User
-	if err := tx.WithContext(ctx.Request.Context()).Clauses(clause.Locking{Strength: "UPDATE"}).Where("id = ?", userID).First(&user).Error; err != nil {
-		return nil, err
-	}
-	return &user, nil
-}
-
-func (h *Handler) adminCreateSubscriptionPayment(ctx *gin.Context, req CreateAdminPaymentRequest) (*model.Payment, *model.PlanSubscription, float64, error) {
-	planID := strings.TrimSpace(req.PlanID)
-	userID := strings.TrimSpace(req.UserID)
-	paymentMethod := normalizeAdminPaymentMethod(req.PaymentMethod)
-	if paymentMethod == "" {
-		return nil, nil, 0, errors.New("Payment method must be wallet or topup")
-	}
-	if !adminIsAllowedTermMonths(req.TermMonths) {
-		return nil, nil, 0, errors.New("Term months must be one of 1, 3, 6, or 12")
-	}
-
-	var planRecord model.Plan
-	if err := h.db.WithContext(ctx.Request.Context()).Where("id = ?", planID).First(&planRecord).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, nil, 0, errors.New("Plan not found")
-		}
-		return nil, nil, 0, err
-	}
-	if !adminBoolValue(planRecord.IsActive, true) {
-		return nil, nil, 0, errors.New("Plan is not active")
-	}
-
-	var user model.User
-	if err := h.db.WithContext(ctx.Request.Context()).Where("id = ?", userID).First(&user).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, nil, 0, errors.New("User not found")
-		}
-		return nil, nil, 0, err
-	}
-
-	totalAmount := planRecord.Price * float64(req.TermMonths)
-	status := "SUCCESS"
-	provider := "INTERNAL"
-	currency := "USD"
-	transactionID := adminTransactionID("sub")
-	now := time.Now().UTC()
-	payment := &model.Payment{
-		ID:            uuid.New().String(),
-		UserID:        user.ID,
-		PlanID:        &planRecord.ID,
-		Amount:        totalAmount,
-		Currency:      &currency,
-		Status:        &status,
-		Provider:      &provider,
-		TransactionID: &transactionID,
-	}
-
-	var subscription *model.PlanSubscription
-	var walletBalance float64
-	err := h.db.WithContext(ctx.Request.Context()).Transaction(func(tx *gorm.DB) error {
-		if _, err := h.adminLockUserForUpdate(ctx, tx, user.ID); err != nil {
-			return err
-		}
-
-		var currentSubscription model.PlanSubscription
-		hasCurrentSubscription := false
-		if err := tx.Where("user_id = ?", user.ID).Order("created_at DESC").First(&currentSubscription).Error; err == nil {
-			hasCurrentSubscription = true
-		} else if !errors.Is(err, gorm.ErrRecordNotFound) {
-			return err
-		}
-
-		baseExpiry := now
-		if hasCurrentSubscription && currentSubscription.ExpiresAt.After(baseExpiry) {
-			baseExpiry = currentSubscription.ExpiresAt.UTC()
-		}
-		newExpiry := baseExpiry.AddDate(0, int(req.TermMonths), 0)
-
-		currentWalletBalance, err := model.GetWalletBalance(ctx.Request.Context(), tx, user.ID)
-		if err != nil {
-			return err
-		}
-		shortfall := totalAmount - currentWalletBalance
-		if shortfall < 0 {
-			shortfall = 0
-		}
-		if paymentMethod == adminPaymentMethodWallet && shortfall > 0 {
-			return fmt.Errorf("Insufficient wallet balance")
-		}
-
-		topupAmount := 0.0
-		if paymentMethod == adminPaymentMethodTopup {
-			if req.TopupAmount == nil {
-				return fmt.Errorf("Top-up amount is required when payment method is topup")
-			}
-			topupAmount = *req.TopupAmount
-			if topupAmount <= 0 {
-				return fmt.Errorf("Top-up amount must be greater than 0")
-			}
-			if topupAmount < shortfall {
-				return fmt.Errorf("Top-up amount must be greater than or equal to the required shortfall")
-			}
-		}
-
-		if err := tx.Create(payment).Error; err != nil {
-			return err
-		}
-
-		if paymentMethod == adminPaymentMethodTopup {
-			topupTransaction := &model.WalletTransaction{
-				ID:         uuid.New().String(),
-				UserID:     user.ID,
-				Type:       adminWalletTransactionTypeTopup,
-				Amount:     topupAmount,
-				Currency:   model.StringPtr(currency),
-				Note:       model.StringPtr(fmt.Sprintf("Wallet top-up for %s (%d months)", planRecord.Name, req.TermMonths)),
-				PaymentID:  &payment.ID,
-				PlanID:     &planRecord.ID,
-				TermMonths: &req.TermMonths,
-			}
-			if err := tx.Create(topupTransaction).Error; err != nil {
-				return err
-			}
-		}
-
-		debitTransaction := &model.WalletTransaction{
-			ID:         uuid.New().String(),
-			UserID:     user.ID,
-			Type:       adminWalletTransactionTypeSubscriptionDebit,
-			Amount:     -totalAmount,
-			Currency:   model.StringPtr(currency),
-			Note:       model.StringPtr(fmt.Sprintf("Subscription payment for %s (%d months)", planRecord.Name, req.TermMonths)),
-			PaymentID:  &payment.ID,
-			PlanID:     &planRecord.ID,
-			TermMonths: &req.TermMonths,
-		}
-		if err := tx.Create(debitTransaction).Error; err != nil {
-			return err
-		}
-
-		subscription = &model.PlanSubscription{
-			ID:            uuid.New().String(),
-			UserID:        user.ID,
-			PaymentID:     payment.ID,
-			PlanID:        planRecord.ID,
-			TermMonths:    req.TermMonths,
-			PaymentMethod: paymentMethod,
-			WalletAmount:  totalAmount,
-			TopupAmount:   topupAmount,
-			StartedAt:     now,
-			ExpiresAt:     newExpiry,
-		}
-		if err := tx.Create(subscription).Error; err != nil {
-			return err
-		}
-
-		if err := tx.Model(&model.User{}).Where("id = ?", user.ID).Update("plan_id", planRecord.ID).Error; err != nil {
-			return err
-		}
-
-		notification := &model.Notification{
-			ID:       uuid.New().String(),
-			UserID:   user.ID,
-			Type:     "billing.subscription",
-			Title:    "Subscription activated",
-			Message:  fmt.Sprintf("Your subscription to %s is active until %s.", planRecord.Name, subscription.ExpiresAt.UTC().Format("2006-01-02")),
-			Metadata: model.StringPtr("{}"),
-		}
-		if err := tx.Create(notification).Error; err != nil {
-			return err
-		}
-
-		walletBalance, err = model.GetWalletBalance(ctx.Request.Context(), tx, user.ID)
-		if err != nil {
-			return err
-		}
-		return nil
-	})
-	if err != nil {
-		return nil, nil, 0, err
-	}
-	return payment, subscription, walletBalance, nil
-}
-
-// @Summary      List All Payments
-// @Description  Get paginated list of all payments across users (admin only)
-// @Tags         admin
-// @Produce      json
-// @Param        page query int false "Page" default(1)
-// @Param        limit query int false "Limit" default(20)
-// @Param        user_id query string false "Filter by user ID"
-// @Param        status query string false "Filter by status"
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      403  {object}  response.Response
-// @Router       /admin/payments [get]
-// @Security     BearerAuth
-func (h *Handler) ListPayments(c *gin.Context) {
-	ctx := c.Request.Context()
-	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
-	if page < 1 {
-		page = 1
-	}
-	limit, _ := strconv.Atoi(c.DefaultQuery("limit", "20"))
-	if limit <= 0 {
-		limit = 20
-	}
-	if limit > 100 {
-		limit = 100
-	}
-	offset := (page - 1) * limit
-
-	userID := strings.TrimSpace(c.Query("user_id"))
-	status := strings.TrimSpace(c.Query("status"))
-
-	db := h.db.WithContext(ctx).Model(&model.Payment{})
-	if userID != "" {
-		db = db.Where("user_id = ?", userID)
-	}
-	if status != "" {
-		db = db.Where("UPPER(status) = ?", strings.ToUpper(status))
-	}
-
-	var total int64
-	if err := db.Count(&total).Error; err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to list payments")
-		return
-	}
-
-	var payments []model.Payment
-	if err := db.Order("created_at DESC").Offset(offset).Limit(limit).Find(&payments).Error; err != nil {
-		h.logger.Error("Failed to list payments", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to list payments")
-		return
-	}
-
-	result := make([]AdminPaymentPayload, 0, len(payments))
-	for _, p := range payments {
-		payload, err := h.loadAdminPaymentPayload(c, p)
-		if err != nil {
-			response.Error(c, http.StatusInternalServerError, "Failed to list payments")
-			return
-		}
-		result = append(result, payload)
-	}
-
-	response.Success(c, gin.H{
-		"payments": result,
-		"total":    total,
-		"page":     page,
-		"limit":    limit,
-	})
-}
-
-// @Summary      Get Payment Detail
-// @Description  Get payment detail (admin only)
-// @Tags         admin
-// @Produce      json
-// @Param        id path string true "Payment ID"
-// @Success      200  {object}  response.Response
-// @Router       /admin/payments/{id} [get]
-// @Security     BearerAuth
-func (h *Handler) GetPayment(c *gin.Context) {
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Payment not found")
-		return
-	}
-
-	var payment model.Payment
-	if err := h.db.WithContext(c.Request.Context()).Where("id = ?", id).First(&payment).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusNotFound, "Payment not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to get payment")
-		return
-	}
-
-	payload, err := h.loadAdminPaymentPayload(c, payment)
-	if err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to get payment")
-		return
-	}
-
-	response.Success(c, gin.H{"payment": payload})
-}
-
-// @Summary      Create Payment
-// @Description  Create a model subscription charge for a user (admin only)
-// @Tags         admin
-// @Accept       json
-// @Produce      json
-// @Param        request body CreateAdminPaymentRequest true "Payment payload"
-// @Success      201  {object}  response.Response
-// @Router       /admin/payments [post]
-// @Security     BearerAuth
-func (h *Handler) CreatePayment(c *gin.Context) {
-	var req CreateAdminPaymentRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	payment, subscription, walletBalance, err := h.adminCreateSubscriptionPayment(c, req)
-	if err != nil {
-		switch err.Error() {
-		case "User not found", "Plan not found", "Plan is not active", "Payment method must be wallet or topup", "Term months must be one of 1, 3, 6, or 12", "Insufficient wallet balance", "Top-up amount is required when payment method is topup", "Top-up amount must be greater than 0", "Top-up amount must be greater than or equal to the required shortfall":
-			response.Error(c, http.StatusBadRequest, err.Error())
-			return
-		default:
-			h.logger.Error("Failed to create admin payment", "error", err)
-			response.Error(c, http.StatusInternalServerError, "Failed to create payment")
-			return
-		}
-	}
-
-	payload, err := h.loadAdminPaymentPayload(c, *payment)
-	if err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to create payment")
-		return
-	}
-
-	response.Created(c, gin.H{
-		"payment":        payload,
-		"subscription":   subscription,
-		"wallet_balance": walletBalance,
-		"invoice_id":     adminInvoiceID(payment.ID),
-	})
-}
-
-// @Summary      Update Payment
-// @Description  Update payment status safely without hard delete (admin only)
-// @Tags         admin
-// @Accept       json
-// @Produce      json
-// @Param        id path string true "Payment ID"
-// @Param        request body UpdateAdminPaymentRequest true "Payment update payload"
-// @Success      200  {object}  response.Response
-// @Router       /admin/payments/{id} [put]
-// @Security     BearerAuth
-func (h *Handler) UpdatePayment(c *gin.Context) {
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Payment not found")
-		return
-	}
-
-	var req UpdateAdminPaymentRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	newStatus := normalizeAdminPaymentStatus(req.Status)
-	var payment model.Payment
-	if err := h.db.WithContext(c.Request.Context()).Where("id = ?", id).First(&payment).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusNotFound, "Payment not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to update payment")
-		return
-	}
-
-	currentStatus := normalizeAdminPaymentStatus(adminStringValue(payment.Status))
-	if currentStatus != newStatus {
-		if (currentStatus == "FAILED" || currentStatus == "PENDING") && newStatus == "SUCCESS" {
-			response.Error(c, http.StatusBadRequest, "Cannot transition payment to SUCCESS from admin update; recreate through the payment flow instead")
-			return
-		}
-		payment.Status = &newStatus
-		if err := h.db.WithContext(c.Request.Context()).Save(&payment).Error; err != nil {
-			h.logger.Error("Failed to update payment", "error", err)
-			response.Error(c, http.StatusInternalServerError, "Failed to update payment")
-			return
-		}
-	}
-
-	payload, err := h.loadAdminPaymentPayload(c, payment)
-	if err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to update payment")
-		return
-	}
-
-	response.Success(c, gin.H{"payment": payload})
-}
diff --git a/internal/api/admin/plans.go b/internal/api/admin/plans.go
deleted file mode 100644
index 2505cb1..0000000
--- a/internal/api/admin/plans.go
+++ /dev/null
@@ -1,302 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package admin
-
-import (
-	"errors"
-	"net/http"
-	"strings"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-	"stream.api/internal/database/model"
-	"stream.api/pkg/response"
-)
-
-type AdminPlanPayload struct {
-	ID                string   `json:"id"`
-	Name              string   `json:"name"`
-	Description       string   `json:"description,omitempty"`
-	Features          []string `json:"features,omitempty"`
-	Price             float64  `json:"price"`
-	Cycle             string   `json:"cycle"`
-	StorageLimit      int64    `json:"storage_limit"`
-	UploadLimit       int32    `json:"upload_limit"`
-	DurationLimit     int32    `json:"duration_limit"`
-	QualityLimit      string   `json:"quality_limit"`
-	IsActive          bool     `json:"is_active"`
-	UserCount         int64    `json:"user_count"`
-	PaymentCount      int64    `json:"payment_count"`
-	SubscriptionCount int64    `json:"subscription_count"`
-}
-
-type SavePlanRequest struct {
-	Name         string   `json:"name" binding:"required"`
-	Description  string   `json:"description"`
-	Features     []string `json:"features"`
-	Price        float64  `json:"price" binding:"required"`
-	Cycle        string   `json:"cycle" binding:"required"`
-	StorageLimit int64    `json:"storage_limit" binding:"required"`
-	UploadLimit  int32    `json:"upload_limit" binding:"required"`
-	IsActive     *bool    `json:"is_active"`
-}
-
-func buildAdminPlanPayload(plan model.Plan, userCount, paymentCount, subscriptionCount int64) AdminPlanPayload {
-	return AdminPlanPayload{
-		ID:                plan.ID,
-		Name:              plan.Name,
-		Description:       adminStringValue(plan.Description),
-		Features:          adminStringSliceValue(plan.Features),
-		Price:             plan.Price,
-		Cycle:             plan.Cycle,
-		StorageLimit:      plan.StorageLimit,
-		UploadLimit:       plan.UploadLimit,
-		DurationLimit:     plan.DurationLimit,
-		QualityLimit:      plan.QualityLimit,
-		IsActive:          adminBoolValue(plan.IsActive, true),
-		UserCount:         userCount,
-		PaymentCount:      paymentCount,
-		SubscriptionCount: subscriptionCount,
-	}
-}
-
-func (h *Handler) loadPlanUsageCounts(ctx *gin.Context, planID string) (int64, int64, int64, error) {
-	var userCount int64
-	if err := h.db.WithContext(ctx.Request.Context()).Model(&model.User{}).Where("plan_id = ?", planID).Count(&userCount).Error; err != nil {
-		return 0, 0, 0, err
-	}
-
-	var paymentCount int64
-	if err := h.db.WithContext(ctx.Request.Context()).Model(&model.Payment{}).Where("plan_id = ?", planID).Count(&paymentCount).Error; err != nil {
-		return 0, 0, 0, err
-	}
-
-	var subscriptionCount int64
-	if err := h.db.WithContext(ctx.Request.Context()).Model(&model.PlanSubscription{}).Where("plan_id = ?", planID).Count(&subscriptionCount).Error; err != nil {
-		return 0, 0, 0, err
-	}
-
-	return userCount, paymentCount, subscriptionCount, nil
-}
-
-func validatePlanRequest(req *SavePlanRequest) string {
-	if strings.TrimSpace(req.Name) == "" {
-		return "Name is required"
-	}
-	if strings.TrimSpace(req.Cycle) == "" {
-		return "Cycle is required"
-	}
-	if req.Price < 0 {
-		return "Price must be greater than or equal to 0"
-	}
-	if req.StorageLimit <= 0 {
-		return "Storage limit must be greater than 0"
-	}
-	if req.UploadLimit <= 0 {
-		return "Upload limit must be greater than 0"
-	}
-	return ""
-}
-
-// @Summary      List Plans
-// @Description  Get all plans with usage counts (admin only)
-// @Tags         admin
-// @Produce      json
-// @Success      200  {object}  response.Response
-// @Router       /admin/plans [get]
-// @Security     BearerAuth
-func (h *Handler) ListPlans(c *gin.Context) {
-	ctx := c.Request.Context()
-	var plans []model.Plan
-	if err := h.db.WithContext(ctx).Order("price ASC").Find(&plans).Error; err != nil {
-		h.logger.Error("Failed to list plans", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to list plans")
-		return
-	}
-
-	result := make([]AdminPlanPayload, 0, len(plans))
-	for _, plan := range plans {
-		userCount, paymentCount, subscriptionCount, err := h.loadPlanUsageCounts(c, plan.ID)
-		if err != nil {
-			h.logger.Error("Failed to load plan usage", "error", err, "plan_id", plan.ID)
-			response.Error(c, http.StatusInternalServerError, "Failed to list plans")
-			return
-		}
-		result = append(result, buildAdminPlanPayload(plan, userCount, paymentCount, subscriptionCount))
-	}
-
-	response.Success(c, gin.H{"plans": result})
-}
-
-// @Summary      Create Plan
-// @Description  Create a plan (admin only)
-// @Tags         admin
-// @Accept       json
-// @Produce      json
-// @Param        request body SavePlanRequest true "Plan payload"
-// @Success      201  {object}  response.Response
-// @Router       /admin/plans [post]
-// @Security     BearerAuth
-func (h *Handler) CreatePlan(c *gin.Context) {
-	var req SavePlanRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-	if msg := validatePlanRequest(&req); msg != "" {
-		response.Error(c, http.StatusBadRequest, msg)
-		return
-	}
-
-	plan := &model.Plan{
-		ID:            uuid.New().String(),
-		Name:          strings.TrimSpace(req.Name),
-		Description:   adminStringPtr(req.Description),
-		Features:      adminStringSlice(req.Features),
-		Price:         req.Price,
-		Cycle:         strings.TrimSpace(req.Cycle),
-		StorageLimit:  req.StorageLimit,
-		UploadLimit:   req.UploadLimit,
-		DurationLimit: 0,
-		QualityLimit:  "",
-		IsActive: func() *bool {
-			value := true
-			if req.IsActive != nil {
-				value = *req.IsActive
-			}
-			return &value
-		}(),
-	}
-
-	if err := h.db.WithContext(c.Request.Context()).Create(plan).Error; err != nil {
-		h.logger.Error("Failed to create plan", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to create plan")
-		return
-	}
-
-	response.Created(c, gin.H{"plan": buildAdminPlanPayload(*plan, 0, 0, 0)})
-}
-
-// @Summary      Update Plan
-// @Description  Update a plan (admin only)
-// @Tags         admin
-// @Accept       json
-// @Produce      json
-// @Param        id path string true "Plan ID"
-// @Param        request body SavePlanRequest true "Plan payload"
-// @Success      200  {object}  response.Response
-// @Router       /admin/plans/{id} [put]
-// @Security     BearerAuth
-func (h *Handler) UpdatePlan(c *gin.Context) {
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Plan not found")
-		return
-	}
-
-	var req SavePlanRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-	if msg := validatePlanRequest(&req); msg != "" {
-		response.Error(c, http.StatusBadRequest, msg)
-		return
-	}
-
-	ctx := c.Request.Context()
-	var plan model.Plan
-	if err := h.db.WithContext(ctx).Where("id = ?", id).First(&plan).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusNotFound, "Plan not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to update plan")
-		return
-	}
-
-	plan.Name = strings.TrimSpace(req.Name)
-	plan.Description = adminStringPtr(req.Description)
-	plan.Features = adminStringSlice(req.Features)
-	plan.Price = req.Price
-	plan.Cycle = strings.TrimSpace(req.Cycle)
-	plan.StorageLimit = req.StorageLimit
-	plan.UploadLimit = req.UploadLimit
-	if req.IsActive != nil {
-		plan.IsActive = req.IsActive
-	}
-
-	if err := h.db.WithContext(ctx).Save(&plan).Error; err != nil {
-		h.logger.Error("Failed to update plan", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to update plan")
-		return
-	}
-
-	userCount, paymentCount, subscriptionCount, err := h.loadPlanUsageCounts(c, plan.ID)
-	if err != nil {
-		h.logger.Error("Failed to load plan usage", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to update plan")
-		return
-	}
-
-	response.Success(c, gin.H{"plan": buildAdminPlanPayload(plan, userCount, paymentCount, subscriptionCount)})
-}
-
-// @Summary      Delete Plan
-// @Description  Delete a plan, or deactivate it if already used (admin only)
-// @Tags         admin
-// @Produce      json
-// @Param        id path string true "Plan ID"
-// @Success      200  {object}  response.Response
-// @Router       /admin/plans/{id} [delete]
-// @Security     BearerAuth
-func (h *Handler) DeletePlan(c *gin.Context) {
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Plan not found")
-		return
-	}
-
-	ctx := c.Request.Context()
-	var plan model.Plan
-	if err := h.db.WithContext(ctx).Where("id = ?", id).First(&plan).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusNotFound, "Plan not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to delete plan")
-		return
-	}
-
-	var paymentCount int64
-	if err := h.db.WithContext(ctx).Model(&model.Payment{}).Where("plan_id = ?", id).Count(&paymentCount).Error; err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to delete plan")
-		return
-	}
-	var subscriptionCount int64
-	if err := h.db.WithContext(ctx).Model(&model.PlanSubscription{}).Where("plan_id = ?", id).Count(&subscriptionCount).Error; err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to delete plan")
-		return
-	}
-
-	if paymentCount > 0 || subscriptionCount > 0 {
-		inactive := false
-		if err := h.db.WithContext(ctx).Model(&model.Plan{}).Where("id = ?", id).Update("is_active", inactive).Error; err != nil {
-			h.logger.Error("Failed to deactivate plan", "error", err)
-			response.Error(c, http.StatusInternalServerError, "Failed to deactivate plan")
-			return
-		}
-		response.Success(c, gin.H{"message": "Plan deactivated", "mode": "deactivated"})
-		return
-	}
-
-	if err := h.db.WithContext(ctx).Where("id = ?", id).Delete(&model.Plan{}).Error; err != nil {
-		h.logger.Error("Failed to delete plan", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to delete plan")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "Plan deleted", "mode": "deleted"})
-}
diff --git a/internal/api/admin/render.go b/internal/api/admin/render.go
deleted file mode 100644
index f59cc96..0000000
--- a/internal/api/admin/render.go
+++ /dev/null
@@ -1,218 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package admin
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	"stream.api/pkg/response"
-)
-
-type createJobRequest struct {
-	Command   string            `json:"command"`
-	Image     string            `json:"image"`
-	Env       map[string]string `json:"env"`
-	Priority  int               `json:"priority"`
-	UserID    string            `json:"user_id"`
-	Name      string            `json:"name"`
-	TimeLimit int64             `json:"time_limit"`
-}
-
-// @Summary List render jobs
-// @Description Returns paginated render jobs for admin management
-// @Tags admin-render
-// @Security BearerAuth
-// @Produce json
-// @Param offset query int false "Offset"
-// @Param limit query int false "Limit"
-// @Param agent_id query string false "Agent ID"
-// @Success 200 {object} response.Response
-// @Failure 500 {object} response.Response
-// @Router /admin/jobs [get]
-func (h *Handler) ListJobs(c *gin.Context) {
-	offset := parseInt(c.Query("offset"), 0)
-	limit := parseInt(c.Query("limit"), 20)
-	if agentID := c.Query("agent_id"); agentID != "" {
-		items, err := h.runtime.JobService().ListJobsByAgent(c.Request.Context(), agentID, offset, limit)
-		if err != nil {
-			response.Error(c, http.StatusInternalServerError, "Failed to list jobs")
-			return
-		}
-		response.Success(c, items)
-		return
-	}
-	items, err := h.runtime.JobService().ListJobs(c.Request.Context(), offset, limit)
-	if err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to list jobs")
-		return
-	}
-	response.Success(c, items)
-}
-
-// @Summary Get render job detail
-// @Description Returns a render job by ID
-// @Tags admin-render
-// @Security BearerAuth
-// @Produce json
-// @Param id path string true "Job ID"
-// @Success 200 {object} response.Response
-// @Failure 404 {object} response.Response
-// @Router /admin/jobs/{id} [get]
-func (h *Handler) GetJob(c *gin.Context) {
-	job, err := h.runtime.JobService().GetJob(c.Request.Context(), c.Param("id"))
-	if err != nil {
-		response.Error(c, http.StatusNotFound, "Job not found")
-		return
-	}
-	response.Success(c, gin.H{"job": job})
-}
-
-// @Summary Get render job logs
-// @Description Returns plain text logs for a render job
-// @Tags admin-render
-// @Security BearerAuth
-// @Produce plain
-// @Param id path string true "Job ID"
-// @Success 200 {string} string
-// @Failure 404 {object} response.Response
-// @Router /admin/jobs/{id}/logs [get]
-func (h *Handler) GetJobLogs(c *gin.Context) {
-	job, err := h.runtime.JobService().GetJob(c.Request.Context(), c.Param("id"))
-	if err != nil {
-		response.Error(c, http.StatusNotFound, "Job not found")
-		return
-	}
-	c.String(http.StatusOK, job.Logs)
-}
-
-// @Summary Create render job
-// @Description Queues a new render job for agents
-// @Tags admin-render
-// @Security BearerAuth
-// @Accept json
-// @Produce json
-// @Param payload body createJobRequest true "Job payload"
-// @Success 201 {object} response.Response
-// @Failure 400 {object} response.Response
-// @Failure 500 {object} response.Response
-// @Router /admin/jobs [post]
-func (h *Handler) CreateJob(c *gin.Context) {
-	var req createJobRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-	if req.Command == "" {
-		response.Error(c, http.StatusBadRequest, "Command is required")
-		return
-	}
-	if req.Image == "" {
-		req.Image = "alpine"
-	}
-	if req.Name == "" {
-		req.Name = req.Command
-	}
-	payload, _ := json.Marshal(map[string]interface{}{"image": req.Image, "commands": []string{req.Command}, "environment": req.Env})
-	job, err := h.runtime.JobService().CreateJob(c.Request.Context(), req.UserID, req.Name, payload, req.Priority, req.TimeLimit)
-	if err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to create job")
-		return
-	}
-	response.Created(c, gin.H{"job": job})
-}
-
-// @Summary Cancel render job
-// @Description Cancels a pending or running render job
-// @Tags admin-render
-// @Security BearerAuth
-// @Produce json
-// @Param id path string true "Job ID"
-// @Success 200 {object} response.Response
-// @Failure 400 {object} response.Response
-// @Router /admin/jobs/{id}/cancel [post]
-func (h *Handler) CancelJob(c *gin.Context) {
-	if err := h.runtime.JobService().CancelJob(c.Request.Context(), c.Param("id")); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-	response.Success(c, gin.H{"status": "cancelled", "job_id": c.Param("id")})
-}
-
-// @Summary Retry render job
-// @Description Retries a failed or cancelled render job
-// @Tags admin-render
-// @Security BearerAuth
-// @Produce json
-// @Param id path string true "Job ID"
-// @Success 200 {object} response.Response
-// @Failure 400 {object} response.Response
-// @Router /admin/jobs/{id}/retry [post]
-func (h *Handler) RetryJob(c *gin.Context) {
-	job, err := h.runtime.JobService().RetryJob(c.Request.Context(), c.Param("id"))
-	if err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-	response.Success(c, gin.H{"job": job})
-}
-
-// @Summary List connected render agents
-// @Description Returns currently connected render agents and current runtime stats
-// @Tags admin-render
-// @Security BearerAuth
-// @Produce json
-// @Success 200 {object} response.Response
-// @Failure 500 {object} response.Response
-// @Router /admin/agents [get]
-func (h *Handler) ListAgents(c *gin.Context) {
-	response.Success(c, gin.H{"agents": h.runtime.AgentRuntime().ListAgentsWithStats()})
-}
-
-// @Summary Restart connected render agent
-// @Description Sends a restart command to a currently connected render agent
-// @Tags admin-render
-// @Security BearerAuth
-// @Produce json
-// @Param id path string true "Agent ID"
-// @Success 200 {object} response.Response
-// @Failure 503 {object} response.Response
-// @Router /admin/agents/{id}/restart [post]
-func (h *Handler) RestartAgent(c *gin.Context) {
-	if ok := h.runtime.AgentRuntime().SendCommand(c.Param("id"), "restart"); !ok {
-		response.Error(c, http.StatusServiceUnavailable, "Agent not active or command channel full")
-		return
-	}
-	response.Success(c, gin.H{"status": "restart command sent"})
-}
-
-// @Summary Update connected render agent
-// @Description Sends an update command to a currently connected render agent
-// @Tags admin-render
-// @Security BearerAuth
-// @Produce json
-// @Param id path string true "Agent ID"
-// @Success 200 {object} response.Response
-// @Failure 503 {object} response.Response
-// @Router /admin/agents/{id}/update [post]
-func (h *Handler) UpdateAgent(c *gin.Context) {
-	if ok := h.runtime.AgentRuntime().SendCommand(c.Param("id"), "update"); !ok {
-		response.Error(c, http.StatusServiceUnavailable, "Agent not active or command channel full")
-		return
-	}
-	response.Success(c, gin.H{"status": "update command sent"})
-}
-
-func parseInt(value string, fallback int) int {
-	if value == "" {
-		return fallback
-	}
-	var result int
-	if _, err := fmt.Sscanf(value, "%d", &result); err != nil {
-		return fallback
-	}
-	return result
-}
diff --git a/internal/api/admin/users.go b/internal/api/admin/users.go
deleted file mode 100644
index 67d12da..0000000
--- a/internal/api/admin/users.go
+++ /dev/null
@@ -1,522 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package admin
-
-import (
-	"errors"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"golang.org/x/crypto/bcrypt"
-	"gorm.io/gorm"
-	"stream.api/internal/database/model"
-	"stream.api/pkg/response"
-)
-
-type AdminUserPayload struct {
-	ID            string  `json:"id"`
-	Email         string  `json:"email"`
-	Username      *string `json:"username"`
-	Avatar        *string `json:"avatar"`
-	Role          *string `json:"role"`
-	PlanID        *string `json:"plan_id"`
-	PlanName      string  `json:"plan_name,omitempty"`
-	StorageUsed   int64   `json:"storage_used"`
-	VideoCount    int64   `json:"video_count"`
-	WalletBalance float64 `json:"wallet_balance"`
-	CreatedAt     string  `json:"created_at"`
-	UpdatedAt     string  `json:"updated_at"`
-}
-
-type CreateAdminUserRequest struct {
-	Email    string  `json:"email" binding:"required,email"`
-	Username string  `json:"username"`
-	Password string  `json:"password" binding:"required,min=6"`
-	Role     string  `json:"role"`
-	PlanID   *string `json:"plan_id"`
-}
-
-type UpdateAdminUserRequest struct {
-	Email    *string `json:"email"`
-	Username *string `json:"username"`
-	Password *string `json:"password"`
-	Role     *string `json:"role"`
-	PlanID   *string `json:"plan_id"`
-}
-
-type UpdateUserRoleRequest struct {
-	Role string `json:"role" binding:"required"`
-}
-
-func normalizeAdminRole(value string) string {
-	role := strings.ToUpper(strings.TrimSpace(value))
-	if role == "" {
-		return "USER"
-	}
-	return role
-}
-
-func isValidAdminRole(role string) bool {
-	switch normalizeAdminRole(role) {
-	case "USER", "ADMIN", "BLOCK":
-		return true
-	default:
-		return false
-	}
-}
-
-func (h *Handler) ensurePlanExists(ctx *gin.Context, planID *string) error {
-	if planID == nil {
-		return nil
-	}
-	trimmed := strings.TrimSpace(*planID)
-	if trimmed == "" {
-		return nil
-	}
-	var count int64
-	if err := h.db.WithContext(ctx.Request.Context()).Model(&model.Plan{}).Where("id = ?", trimmed).Count(&count).Error; err != nil {
-		return err
-	}
-	if count == 0 {
-		return gorm.ErrRecordNotFound
-	}
-	return nil
-}
-
-// @Summary      List Users
-// @Description  Get paginated list of all users (admin only)
-// @Tags         admin
-// @Produce      json
-// @Param        page query int false "Page" default(1)
-// @Param        limit query int false "Limit" default(20)
-// @Param        search query string false "Search by email or username"
-// @Param        role query string false "Filter by role"
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      403  {object}  response.Response
-// @Router       /admin/users [get]
-// @Security     BearerAuth
-func (h *Handler) ListUsers(c *gin.Context) {
-	ctx := c.Request.Context()
-	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
-	if page < 1 {
-		page = 1
-	}
-	limit, _ := strconv.Atoi(c.DefaultQuery("limit", "20"))
-	if limit <= 0 {
-		limit = 20
-	}
-	if limit > 100 {
-		limit = 100
-	}
-	offset := (page - 1) * limit
-
-	search := strings.TrimSpace(c.Query("search"))
-	role := strings.TrimSpace(c.Query("role"))
-
-	db := h.db.WithContext(ctx).Model(&model.User{})
-	if search != "" {
-		like := "%" + search + "%"
-		db = db.Where("email ILIKE ? OR username ILIKE ?", like, like)
-	}
-	if role != "" {
-		db = db.Where("UPPER(role) = ?", strings.ToUpper(role))
-	}
-
-	var total int64
-	if err := db.Count(&total).Error; err != nil {
-		h.logger.Error("Failed to count users", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to list users")
-		return
-	}
-
-	var users []model.User
-	if err := db.Order("created_at DESC").Offset(offset).Limit(limit).Find(&users).Error; err != nil {
-		h.logger.Error("Failed to list users", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to list users")
-		return
-	}
-
-	planIDs := map[string]bool{}
-	for _, u := range users {
-		if u.PlanID != nil && strings.TrimSpace(*u.PlanID) != "" {
-			planIDs[*u.PlanID] = true
-		}
-	}
-	planNames := map[string]string{}
-	if len(planIDs) > 0 {
-		ids := make([]string, 0, len(planIDs))
-		for id := range planIDs {
-			ids = append(ids, id)
-		}
-		var plans []model.Plan
-		h.db.WithContext(ctx).Where("id IN ?", ids).Find(&plans)
-		for _, p := range plans {
-			planNames[p.ID] = p.Name
-		}
-	}
-
-	result := make([]AdminUserPayload, 0, len(users))
-	for _, u := range users {
-		payload := AdminUserPayload{
-			ID:          u.ID,
-			Email:       u.Email,
-			Username:    u.Username,
-			Avatar:      u.Avatar,
-			Role:        u.Role,
-			PlanID:      u.PlanID,
-			StorageUsed: u.StorageUsed,
-			CreatedAt:   adminFormatTime(u.CreatedAt),
-			UpdatedAt:   adminFormatTimeValue(u.UpdatedAt),
-		}
-		if u.PlanID != nil {
-			payload.PlanName = planNames[*u.PlanID]
-		}
-		h.db.WithContext(ctx).Model(&model.Video{}).Where("user_id = ?", u.ID).Count(&payload.VideoCount)
-		payload.WalletBalance, _ = model.GetWalletBalance(ctx, h.db, u.ID)
-		result = append(result, payload)
-	}
-
-	response.Success(c, gin.H{
-		"users": result,
-		"total": total,
-		"page":  page,
-		"limit": limit,
-	})
-}
-
-// @Summary      Create User
-// @Description  Create a user from admin panel (admin only)
-// @Tags         admin
-// @Accept       json
-// @Produce      json
-// @Param        request body CreateAdminUserRequest true "User payload"
-// @Success      201  {object}  response.Response
-// @Router       /admin/users [post]
-// @Security     BearerAuth
-func (h *Handler) CreateUser(c *gin.Context) {
-	var req CreateAdminUserRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	role := normalizeAdminRole(req.Role)
-	if !isValidAdminRole(role) {
-		response.Error(c, http.StatusBadRequest, "Invalid role. Must be USER, ADMIN, or BLOCK")
-		return
-	}
-	if err := h.ensurePlanExists(c, req.PlanID); err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusBadRequest, "Plan not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to create user")
-		return
-	}
-
-	email := strings.TrimSpace(req.Email)
-	username := strings.TrimSpace(req.Username)
-	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
-	if err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to hash password")
-		return
-	}
-	password := string(hashedPassword)
-
-	user := &model.User{
-		ID:       uuid.New().String(),
-		Email:    email,
-		Password: &password,
-		Username: adminStringPtr(username),
-		Role:     &role,
-		PlanID:   nil,
-	}
-	if req.PlanID != nil && strings.TrimSpace(*req.PlanID) != "" {
-		planID := strings.TrimSpace(*req.PlanID)
-		user.PlanID = &planID
-	}
-
-	if err := h.db.WithContext(c.Request.Context()).Create(user).Error; err != nil {
-		if errors.Is(err, gorm.ErrDuplicatedKey) {
-			response.Error(c, http.StatusBadRequest, "Email already registered")
-			return
-		}
-		h.logger.Error("Failed to create user", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to create user")
-		return
-	}
-
-	response.Created(c, gin.H{"user": user})
-}
-
-// @Summary      Get User Detail
-// @Description  Get detailed info about a single user (admin only)
-// @Tags         admin
-// @Produce      json
-// @Param        id path string true "User ID"
-// @Success      200  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Router       /admin/users/{id} [get]
-// @Security     BearerAuth
-func (h *Handler) GetUser(c *gin.Context) {
-	ctx := c.Request.Context()
-	id := c.Param("id")
-
-	var user model.User
-	if err := h.db.WithContext(ctx).Where("id = ?", id).First(&user).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			response.Error(c, http.StatusNotFound, "User not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to get user")
-		return
-	}
-
-	var videoCount int64
-	h.db.WithContext(ctx).Model(&model.Video{}).Where("user_id = ?", id).Count(&videoCount)
-	balance, _ := model.GetWalletBalance(ctx, h.db, id)
-
-	planName := ""
-	if user.PlanID != nil {
-		var plan model.Plan
-		if err := h.db.WithContext(ctx).Where("id = ?", *user.PlanID).First(&plan).Error; err == nil {
-			planName = plan.Name
-		}
-	}
-
-	var subscription *model.PlanSubscription
-	var sub model.PlanSubscription
-	if err := h.db.WithContext(ctx).Where("user_id = ?", id).Order("created_at DESC").First(&sub).Error; err == nil {
-		subscription = &sub
-	}
-
-	response.Success(c, gin.H{
-		"user": gin.H{
-			"id":           user.ID,
-			"email":        user.Email,
-			"username":     user.Username,
-			"avatar":       user.Avatar,
-			"role":         user.Role,
-			"plan_id":      user.PlanID,
-			"plan_name":    planName,
-			"storage_used": user.StorageUsed,
-			"created_at":   user.CreatedAt,
-			"updated_at":   user.UpdatedAt,
-		},
-		"video_count":    videoCount,
-		"wallet_balance": balance,
-		"subscription":   subscription,
-	})
-}
-
-// @Summary      Update User
-// @Description  Update a user from admin panel (admin only)
-// @Tags         admin
-// @Accept       json
-// @Produce      json
-// @Param        id path string true "User ID"
-// @Param        request body UpdateAdminUserRequest true "User payload"
-// @Success      200  {object}  response.Response
-// @Router       /admin/users/{id} [put]
-// @Security     BearerAuth
-func (h *Handler) UpdateUser(c *gin.Context) {
-	id := c.Param("id")
-	currentUserID := c.GetString("userID")
-
-	var req UpdateAdminUserRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	updates := map[string]interface{}{}
-	if req.Email != nil {
-		email := strings.TrimSpace(*req.Email)
-		if email == "" {
-			response.Error(c, http.StatusBadRequest, "Email is required")
-			return
-		}
-		updates["email"] = email
-	}
-	if req.Username != nil {
-		updates["username"] = strings.TrimSpace(*req.Username)
-	}
-	if req.Role != nil {
-		role := normalizeAdminRole(*req.Role)
-		if !isValidAdminRole(role) {
-			response.Error(c, http.StatusBadRequest, "Invalid role. Must be USER, ADMIN, or BLOCK")
-			return
-		}
-		if id == currentUserID && role != "ADMIN" {
-			response.Error(c, http.StatusBadRequest, "Cannot change your own role")
-			return
-		}
-		updates["role"] = role
-	}
-	if req.PlanID != nil {
-		if err := h.ensurePlanExists(c, req.PlanID); err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				response.Error(c, http.StatusBadRequest, "Plan not found")
-				return
-			}
-			response.Error(c, http.StatusInternalServerError, "Failed to update user")
-			return
-		}
-		trimmed := strings.TrimSpace(*req.PlanID)
-		if trimmed == "" {
-			updates["plan_id"] = nil
-		} else {
-			updates["plan_id"] = trimmed
-		}
-	}
-	if req.Password != nil {
-		if strings.TrimSpace(*req.Password) == "" {
-			response.Error(c, http.StatusBadRequest, "Password must not be empty")
-			return
-		}
-		hashedPassword, err := bcrypt.GenerateFromPassword([]byte(*req.Password), bcrypt.DefaultCost)
-		if err != nil {
-			response.Error(c, http.StatusInternalServerError, "Failed to hash password")
-			return
-		}
-		updates["password"] = string(hashedPassword)
-	}
-
-	if len(updates) == 0 {
-		response.Success(c, gin.H{"message": "No changes provided"})
-		return
-	}
-
-	result := h.db.WithContext(c.Request.Context()).Model(&model.User{}).Where("id = ?", id).Updates(updates)
-	if result.Error != nil {
-		if errors.Is(result.Error, gorm.ErrDuplicatedKey) {
-			response.Error(c, http.StatusBadRequest, "Email already registered")
-			return
-		}
-		h.logger.Error("Failed to update user", "error", result.Error)
-		response.Error(c, http.StatusInternalServerError, "Failed to update user")
-		return
-	}
-	if result.RowsAffected == 0 {
-		response.Error(c, http.StatusNotFound, "User not found")
-		return
-	}
-
-	var user model.User
-	if err := h.db.WithContext(c.Request.Context()).Where("id = ?", id).First(&user).Error; err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to reload user")
-		return
-	}
-
-	response.Success(c, gin.H{"user": user})
-}
-
-// @Summary      Update User Role
-// @Description  Change user role (admin only). Valid: USER, ADMIN, BLOCK
-// @Tags         admin
-// @Accept       json
-// @Produce      json
-// @Param        id path string true "User ID"
-// @Param        request body UpdateUserRoleRequest true "Role payload"
-// @Success      200  {object}  response.Response
-// @Failure      400  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Router       /admin/users/{id}/role [put]
-// @Security     BearerAuth
-func (h *Handler) UpdateUserRole(c *gin.Context) {
-	id := c.Param("id")
-	currentUserID := c.GetString("userID")
-	if id == currentUserID {
-		response.Error(c, http.StatusBadRequest, "Cannot change your own role")
-		return
-	}
-
-	var req UpdateUserRoleRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	role := normalizeAdminRole(req.Role)
-	if !isValidAdminRole(role) {
-		response.Error(c, http.StatusBadRequest, "Invalid role. Must be USER, ADMIN, or BLOCK")
-		return
-	}
-
-	result := h.db.WithContext(c.Request.Context()).Model(&model.User{}).Where("id = ?", id).Update("role", role)
-	if result.Error != nil {
-		h.logger.Error("Failed to update user role", "error", result.Error)
-		response.Error(c, http.StatusInternalServerError, "Failed to update role")
-		return
-	}
-	if result.RowsAffected == 0 {
-		response.Error(c, http.StatusNotFound, "User not found")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "Role updated", "role": role})
-}
-
-// @Summary      Delete User
-// @Description  Delete a user and their data (admin only)
-// @Tags         admin
-// @Produce      json
-// @Param        id path string true "User ID"
-// @Success      200  {object}  response.Response
-// @Failure      400  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Router       /admin/users/{id} [delete]
-// @Security     BearerAuth
-func (h *Handler) DeleteUser(c *gin.Context) {
-	id := c.Param("id")
-	currentUserID := c.GetString("userID")
-	if id == currentUserID {
-		response.Error(c, http.StatusBadRequest, "Cannot delete your own account")
-		return
-	}
-
-	var user model.User
-	if err := h.db.WithContext(c.Request.Context()).Where("id = ?", id).First(&user).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			response.Error(c, http.StatusNotFound, "User not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to find user")
-		return
-	}
-
-	err := h.db.WithContext(c.Request.Context()).Transaction(func(tx *gorm.DB) error {
-		tables := []struct {
-			model interface{}
-			where string
-		}{
-			{&model.VideoAdConfig{}, "user_id = ?"},
-			{&model.AdTemplate{}, "user_id = ?"},
-			{&model.Notification{}, "user_id = ?"},
-			{&model.Domain{}, "user_id = ?"},
-			{&model.WalletTransaction{}, "user_id = ?"},
-			{&model.PlanSubscription{}, "user_id = ?"},
-			{&model.UserPreference{}, "user_id = ?"},
-			{&model.Video{}, "user_id = ?"},
-			{&model.Payment{}, "user_id = ?"},
-		}
-		for _, t := range tables {
-			if err := tx.Where(t.where, id).Delete(t.model).Error; err != nil {
-				return err
-			}
-		}
-		return tx.Where("id = ?", id).Delete(&model.User{}).Error
-	})
-	if err != nil {
-		h.logger.Error("Failed to delete user", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to delete user")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "User deleted"})
-}
diff --git a/internal/api/admin/videos.go b/internal/api/admin/videos.go
deleted file mode 100644
index 868b823..0000000
--- a/internal/api/admin/videos.go
+++ /dev/null
@@ -1,477 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package admin
-
-import (
-	"errors"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-
-	"stream.api/internal/database/model"
-	"stream.api/pkg/response"
-)
-
-type AdminVideoPayload struct {
-	ID             string  `json:"id"`
-	UserID         string  `json:"user_id"`
-	Title          string  `json:"title"`
-	Description    string  `json:"description,omitempty"`
-	URL            string  `json:"url"`
-	Status         string  `json:"status"`
-	Size           int64   `json:"size"`
-	Duration       int32   `json:"duration"`
-	Format         string  `json:"format"`
-	OwnerEmail     string  `json:"owner_email,omitempty"`
-	AdTemplateID   *string `json:"ad_template_id,omitempty"`
-	AdTemplateName string  `json:"ad_template_name,omitempty"`
-	CreatedAt      string  `json:"created_at"`
-	UpdatedAt      string  `json:"updated_at"`
-}
-
-type SaveAdminVideoRequest struct {
-	UserID       string  `json:"user_id" binding:"required"`
-	Title        string  `json:"title" binding:"required"`
-	Description  string  `json:"description"`
-	URL          string  `json:"url" binding:"required"`
-	Size         int64   `json:"size" binding:"required"`
-	Duration     int32   `json:"duration"`
-	Format       string  `json:"format"`
-	Status       string  `json:"status"`
-	AdTemplateID *string `json:"ad_template_id,omitempty"`
-}
-
-func normalizeAdminVideoStatus(value string) string {
-	switch strings.ToLower(strings.TrimSpace(value)) {
-	case "processing", "pending":
-		return "processing"
-	case "failed", "error":
-		return "failed"
-	default:
-		return "ready"
-	}
-}
-
-func (h *Handler) loadAdminVideoPayload(ctx *gin.Context, video model.Video) (AdminVideoPayload, error) {
-	payload := AdminVideoPayload{
-		ID:          video.ID,
-		UserID:      video.UserID,
-		Title:       video.Title,
-		Description: adminStringValue(video.Description),
-		URL:         video.URL,
-		Status:      adminStringValue(video.Status),
-		Size:        video.Size,
-		Duration:    video.Duration,
-		Format:      video.Format,
-		CreatedAt:   adminFormatTime(video.CreatedAt),
-		UpdatedAt:   adminFormatTimeValue(video.UpdatedAt),
-	}
-
-	var user model.User
-	if err := h.db.WithContext(ctx.Request.Context()).Select("id, email").Where("id = ?", video.UserID).First(&user).Error; err == nil {
-		payload.OwnerEmail = user.Email
-	}
-
-	var adConfig model.VideoAdConfig
-	if err := h.db.WithContext(ctx.Request.Context()).Where("video_id = ?", video.ID).First(&adConfig).Error; err == nil {
-		payload.AdTemplateID = &adConfig.AdTemplateID
-		var template model.AdTemplate
-		if err := h.db.WithContext(ctx.Request.Context()).Where("id = ?", adConfig.AdTemplateID).First(&template).Error; err == nil {
-			payload.AdTemplateName = template.Name
-		}
-	}
-
-	return payload, nil
-}
-
-func (h *Handler) saveAdminVideoAdConfig(tx *gorm.DB, videoID, userID string, adTemplateID *string) error {
-	if adTemplateID == nil {
-		return nil
-	}
-	trimmed := strings.TrimSpace(*adTemplateID)
-	if trimmed == "" {
-		return tx.Where("video_id = ? AND user_id = ?", videoID, userID).Delete(&model.VideoAdConfig{}).Error
-	}
-
-	var template model.AdTemplate
-	if err := tx.Where("id = ? AND user_id = ?", trimmed, userID).First(&template).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return &gin.Error{Err: errors.New("Ad template not found"), Type: gin.ErrorTypeBind}
-		}
-		return err
-	}
-
-	var existing model.VideoAdConfig
-	if err := tx.Where("video_id = ? AND user_id = ?", videoID, userID).First(&existing).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return tx.Create(&model.VideoAdConfig{
-				VideoID:      videoID,
-				UserID:       userID,
-				AdTemplateID: template.ID,
-				VastTagURL:   template.VastTagURL,
-				AdFormat:     template.AdFormat,
-				Duration:     template.Duration,
-			}).Error
-		}
-		return err
-	}
-
-	existing.AdTemplateID = template.ID
-	existing.VastTagURL = template.VastTagURL
-	existing.AdFormat = template.AdFormat
-	existing.Duration = template.Duration
-	return tx.Save(&existing).Error
-}
-
-// @Summary      List All Videos
-// @Description  Get paginated list of all videos across users (admin only)
-// @Tags         admin
-// @Produce      json
-// @Param        page query int false "Page" default(1)
-// @Param        limit query int false "Limit" default(20)
-// @Param        search query string false "Search by title"
-// @Param        user_id query string false "Filter by user ID"
-// @Param        status query string false "Filter by status"
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      403  {object}  response.Response
-// @Router       /admin/videos [get]
-// @Security     BearerAuth
-func (h *Handler) ListVideos(c *gin.Context) {
-	ctx := c.Request.Context()
-	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
-	if page < 1 {
-		page = 1
-	}
-	limit, _ := strconv.Atoi(c.DefaultQuery("limit", "20"))
-	if limit <= 0 {
-		limit = 20
-	}
-	if limit > 100 {
-		limit = 100
-	}
-	offset := (page - 1) * limit
-
-	search := strings.TrimSpace(c.Query("search"))
-	userID := strings.TrimSpace(c.Query("user_id"))
-	status := strings.TrimSpace(c.Query("status"))
-
-	db := h.db.WithContext(ctx).Model(&model.Video{})
-	if search != "" {
-		like := "%" + search + "%"
-		db = db.Where("title ILIKE ?", like)
-	}
-	if userID != "" {
-		db = db.Where("user_id = ?", userID)
-	}
-	if status != "" && !strings.EqualFold(status, "all") {
-		db = db.Where("status = ?", normalizeAdminVideoStatus(status))
-	}
-
-	var total int64
-	if err := db.Count(&total).Error; err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to list videos")
-		return
-	}
-
-	var videos []model.Video
-	if err := db.Order("created_at DESC").Offset(offset).Limit(limit).Find(&videos).Error; err != nil {
-		h.logger.Error("Failed to list videos", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to list videos")
-		return
-	}
-
-	result := make([]AdminVideoPayload, 0, len(videos))
-	for _, v := range videos {
-		payload, err := h.loadAdminVideoPayload(c, v)
-		if err != nil {
-			response.Error(c, http.StatusInternalServerError, "Failed to list videos")
-			return
-		}
-		result = append(result, payload)
-	}
-
-	response.Success(c, gin.H{
-		"videos": result,
-		"total":  total,
-		"page":   page,
-		"limit":  limit,
-	})
-}
-
-// @Summary      Get Video Detail
-// @Description  Get video detail by ID (admin only)
-// @Tags         admin
-// @Produce      json
-// @Param        id path string true "Video ID"
-// @Success      200  {object}  response.Response
-// @Router       /admin/videos/{id} [get]
-// @Security     BearerAuth
-func (h *Handler) GetVideo(c *gin.Context) {
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Video not found")
-		return
-	}
-
-	var video model.Video
-	if err := h.db.WithContext(c.Request.Context()).Where("id = ?", id).First(&video).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusNotFound, "Video not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to get video")
-		return
-	}
-
-	payload, err := h.loadAdminVideoPayload(c, video)
-	if err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to get video")
-		return
-	}
-
-	response.Success(c, gin.H{"video": payload})
-}
-
-// @Summary      Create Video
-// @Description  Create a model video record for a user (admin only)
-// @Tags         admin
-// @Accept       json
-// @Produce      json
-// @Param        request body SaveAdminVideoRequest true "Video payload"
-// @Success      201  {object}  response.Response
-// @Router       /admin/videos [post]
-// @Security     BearerAuth
-func (h *Handler) CreateVideo(c *gin.Context) {
-	var req SaveAdminVideoRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	if strings.TrimSpace(req.UserID) == "" || strings.TrimSpace(req.Title) == "" || strings.TrimSpace(req.URL) == "" {
-		response.Error(c, http.StatusBadRequest, "User ID, title, and URL are required")
-		return
-	}
-	if req.Size < 0 {
-		response.Error(c, http.StatusBadRequest, "Size must be greater than or equal to 0")
-		return
-	}
-
-	ctx := c.Request.Context()
-	var user model.User
-	if err := h.db.WithContext(ctx).Where("id = ?", strings.TrimSpace(req.UserID)).First(&user).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusBadRequest, "User not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to create video")
-		return
-	}
-
-	status := normalizeAdminVideoStatus(req.Status)
-	processingStatus := strings.ToUpper(status)
-	storageType := "WORKER"
-	video := &model.Video{
-		ID:               uuid.New().String(),
-		UserID:           user.ID,
-		Name:             strings.TrimSpace(req.Title),
-		Title:            strings.TrimSpace(req.Title),
-		Description:      adminStringPtr(req.Description),
-		URL:              strings.TrimSpace(req.URL),
-		Size:             req.Size,
-		Duration:         req.Duration,
-		Format:           strings.TrimSpace(req.Format),
-		Status:           &status,
-		ProcessingStatus: &processingStatus,
-		StorageType:      &storageType,
-	}
-
-	if err := h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Create(video).Error; err != nil {
-			return err
-		}
-		if err := tx.Model(&model.User{}).Where("id = ?", user.ID).UpdateColumn("storage_used", gorm.Expr("storage_used + ?", video.Size)).Error; err != nil {
-			return err
-		}
-		if err := h.saveAdminVideoAdConfig(tx, video.ID, user.ID, req.AdTemplateID); err != nil {
-			return err
-		}
-		return nil
-	}); err != nil {
-		if strings.Contains(err.Error(), "Ad template not found") {
-			response.Error(c, http.StatusBadRequest, "Ad template not found")
-			return
-		}
-		h.logger.Error("Failed to create video", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to create video")
-		return
-	}
-
-	payload, err := h.loadAdminVideoPayload(c, *video)
-	if err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to create video")
-		return
-	}
-
-	response.Created(c, gin.H{"video": payload})
-}
-
-// @Summary      Update Video
-// @Description  Update video metadata and status (admin only)
-// @Tags         admin
-// @Accept       json
-// @Produce      json
-// @Param        id path string true "Video ID"
-// @Param        request body SaveAdminVideoRequest true "Video payload"
-// @Success      200  {object}  response.Response
-// @Router       /admin/videos/{id} [put]
-// @Security     BearerAuth
-func (h *Handler) UpdateVideo(c *gin.Context) {
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Video not found")
-		return
-	}
-
-	var req SaveAdminVideoRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-	if strings.TrimSpace(req.UserID) == "" || strings.TrimSpace(req.Title) == "" || strings.TrimSpace(req.URL) == "" {
-		response.Error(c, http.StatusBadRequest, "User ID, title, and URL are required")
-		return
-	}
-	if req.Size < 0 {
-		response.Error(c, http.StatusBadRequest, "Size must be greater than or equal to 0")
-		return
-	}
-
-	ctx := c.Request.Context()
-	var video model.Video
-	if err := h.db.WithContext(ctx).Where("id = ?", id).First(&video).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusNotFound, "Video not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to update video")
-		return
-	}
-
-	var user model.User
-	if err := h.db.WithContext(ctx).Where("id = ?", strings.TrimSpace(req.UserID)).First(&user).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusBadRequest, "User not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to update video")
-		return
-	}
-
-	oldSize := video.Size
-	oldUserID := video.UserID
-	status := normalizeAdminVideoStatus(req.Status)
-	processingStatus := strings.ToUpper(status)
-	video.UserID = user.ID
-	video.Name = strings.TrimSpace(req.Title)
-	video.Title = strings.TrimSpace(req.Title)
-	video.Description = adminStringPtr(req.Description)
-	video.URL = strings.TrimSpace(req.URL)
-	video.Size = req.Size
-	video.Duration = req.Duration
-	video.Format = strings.TrimSpace(req.Format)
-	video.Status = &status
-	video.ProcessingStatus = &processingStatus
-
-	if err := h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Save(&video).Error; err != nil {
-			return err
-		}
-		if oldUserID == user.ID {
-			delta := video.Size - oldSize
-			if delta != 0 {
-				if err := tx.Model(&model.User{}).Where("id = ?", user.ID).UpdateColumn("storage_used", gorm.Expr("GREATEST(storage_used + ?, 0)", delta)).Error; err != nil {
-					return err
-				}
-			}
-		} else {
-			if err := tx.Model(&model.User{}).Where("id = ?", oldUserID).UpdateColumn("storage_used", gorm.Expr("GREATEST(storage_used - ?, 0)", oldSize)).Error; err != nil {
-				return err
-			}
-			if err := tx.Model(&model.User{}).Where("id = ?", user.ID).UpdateColumn("storage_used", gorm.Expr("storage_used + ?", video.Size)).Error; err != nil {
-				return err
-			}
-		}
-		if oldUserID != user.ID {
-			if err := tx.Model(&model.VideoAdConfig{}).Where("video_id = ?", video.ID).Update("user_id", user.ID).Error; err != nil {
-				return err
-			}
-		}
-		if err := h.saveAdminVideoAdConfig(tx, video.ID, user.ID, req.AdTemplateID); err != nil {
-			return err
-		}
-		return nil
-	}); err != nil {
-		if strings.Contains(err.Error(), "Ad template not found") {
-			response.Error(c, http.StatusBadRequest, "Ad template not found")
-			return
-		}
-		h.logger.Error("Failed to update video", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to update video")
-		return
-	}
-
-	payload, err := h.loadAdminVideoPayload(c, video)
-	if err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to update video")
-		return
-	}
-
-	response.Success(c, gin.H{"video": payload})
-}
-
-// @Summary      Delete Video (Admin)
-// @Description  Delete any video by ID (admin only)
-// @Tags         admin
-// @Produce      json
-// @Param        id path string true "Video ID"
-// @Success      200  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Router       /admin/videos/{id} [delete]
-// @Security     BearerAuth
-func (h *Handler) DeleteVideo(c *gin.Context) {
-	id := c.Param("id")
-
-	var video model.Video
-	if err := h.db.WithContext(c.Request.Context()).Where("id = ?", id).First(&video).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			response.Error(c, http.StatusNotFound, "Video not found")
-			return
-		}
-		response.Error(c, http.StatusInternalServerError, "Failed to find video")
-		return
-	}
-
-	err := h.db.WithContext(c.Request.Context()).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Where("video_id = ?", video.ID).Delete(&model.VideoAdConfig{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("id = ?", video.ID).Delete(&model.Video{}).Error; err != nil {
-			return err
-		}
-		return tx.Model(&model.User{}).Where("id = ?", video.UserID).UpdateColumn("storage_used", gorm.Expr("GREATEST(storage_used - ?, 0)", video.Size)).Error
-	})
-	if err != nil {
-		h.logger.Error("Failed to delete video", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to delete video")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "Video deleted"})
-}
diff --git a/internal/api/adtemplates/handler.go b/internal/api/adtemplates/handler.go
deleted file mode 100644
index 11112bc..0000000
--- a/internal/api/adtemplates/handler.go
+++ /dev/null
@@ -1,338 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package adtemplates
-
-import (
-	"net/http"
-	"strings"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-	"stream.api/internal/database/model"
-	"stream.api/pkg/logger"
-	"stream.api/pkg/response"
-)
-
-const upgradeRequiredMessage = "Upgrade required to manage Ads & VAST"
-
-type Handler struct {
-	logger logger.Logger
-	db     *gorm.DB
-}
-
-type SaveAdTemplateRequest struct {
-	Name        string `json:"name" binding:"required"`
-	Description string `json:"description"`
-	VASTTagURL  string `json:"vast_tag_url" binding:"required"`
-	AdFormat    string `json:"ad_format"`
-	Duration    *int   `json:"duration"`
-	IsActive    *bool  `json:"is_active"`
-	IsDefault   *bool  `json:"is_default"`
-}
-
-type TemplatePayload struct {
-	Template *model.AdTemplate `json:"template"`
-}
-
-type TemplateListPayload struct {
-	Templates []model.AdTemplate `json:"templates"`
-}
-
-func NewHandler(l logger.Logger, db *gorm.DB) *Handler {
-	return &Handler{logger: l, db: db}
-}
-
-// @Summary      List Ad Templates
-// @Description  Get all VAST ad templates for the current user
-// @Tags         ad-templates
-// @Produce      json
-// @Success      200  {object}  response.Response{data=TemplateListPayload}
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /ad-templates [get]
-// @Security     BearerAuth
-func (h *Handler) ListTemplates(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	var items []model.AdTemplate
-	if err := h.db.WithContext(c.Request.Context()).
-		Where("user_id = ?", userID).
-		Order("is_default DESC").
-		Order("created_at DESC").
-		Find(&items).Error; err != nil {
-		h.logger.Error("Failed to list ad templates", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to load ad templates")
-		return
-	}
-
-	response.Success(c, gin.H{"templates": items})
-}
-
-// @Summary      Create Ad Template
-// @Description  Create a VAST ad template for the current user
-// @Tags         ad-templates
-// @Accept       json
-// @Produce      json
-// @Param        request body SaveAdTemplateRequest true "Ad template payload"
-// @Success      201  {object}  response.Response{data=TemplatePayload}
-// @Failure      400  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      403  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /ad-templates [post]
-// @Security     BearerAuth
-func (h *Handler) CreateTemplate(c *gin.Context) {
-	h.saveTemplate(c, true)
-}
-
-// @Summary      Update Ad Template
-// @Description  Update a VAST ad template for the current user
-// @Tags         ad-templates
-// @Accept       json
-// @Produce      json
-// @Param        id path string true "Ad Template ID"
-// @Param        request body SaveAdTemplateRequest true "Ad template payload"
-// @Success      200  {object}  response.Response{data=TemplatePayload}
-// @Failure      400  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      403  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /ad-templates/{id} [put]
-// @Security     BearerAuth
-func (h *Handler) UpdateTemplate(c *gin.Context) {
-	h.saveTemplate(c, false)
-}
-
-// @Summary      Delete Ad Template
-// @Description  Delete a VAST ad template for the current user
-// @Tags         ad-templates
-// @Produce      json
-// @Param        id path string true "Ad Template ID"
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      403  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /ad-templates/{id} [delete]
-// @Security     BearerAuth
-func (h *Handler) DeleteTemplate(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-	if !requirePaidPlan(c) {
-		return
-	}
-
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Ad template not found")
-		return
-	}
-
-	result := h.db.WithContext(c.Request.Context()).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Where("ad_template_id = ? AND user_id = ?", id, userID).
-			Delete(&model.VideoAdConfig{}).Error; err != nil {
-			return err
-		}
-
-		res := tx.Where("id = ? AND user_id = ?", id, userID).Delete(&model.AdTemplate{})
-		if res.Error != nil {
-			return res.Error
-		}
-		if res.RowsAffected == 0 {
-			return gorm.ErrRecordNotFound
-		}
-		return nil
-	})
-	if result != nil {
-		if result == gorm.ErrRecordNotFound {
-			response.Error(c, http.StatusNotFound, "Ad template not found")
-			return
-		}
-		h.logger.Error("Failed to delete ad template", "error", result)
-		response.Error(c, http.StatusInternalServerError, "Failed to delete ad template")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "Ad template deleted"})
-}
-
-func (h *Handler) saveTemplate(c *gin.Context, create bool) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-	if !requirePaidPlan(c) {
-		return
-	}
-
-	var req SaveAdTemplateRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	name := strings.TrimSpace(req.Name)
-	vastURL := strings.TrimSpace(req.VASTTagURL)
-	if name == "" || vastURL == "" {
-		response.Error(c, http.StatusBadRequest, "Name and VAST URL are required")
-		return
-	}
-
-	format := normalizeAdFormat(req.AdFormat)
-	if format == "mid-roll" && (req.Duration == nil || *req.Duration <= 0) {
-		response.Error(c, http.StatusBadRequest, "Duration is required for mid-roll templates")
-		return
-	}
-
-	ctx := c.Request.Context()
-	if create {
-		item := &model.AdTemplate{
-			ID:          uuid.New().String(),
-			UserID:      userID,
-			Name:        name,
-			Description: stringPointer(strings.TrimSpace(req.Description)),
-			VastTagURL:  vastURL,
-			AdFormat:    model.StringPtr(format),
-			Duration:    intPtrToInt64Ptr(req.Duration),
-			IsActive:    model.BoolPtr(req.IsActive == nil || *req.IsActive),
-			IsDefault:   req.IsDefault != nil && *req.IsDefault,
-		}
-		if !adTemplateIsActive(item.IsActive) {
-			item.IsDefault = false
-		}
-
-		if err := h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-			if item.IsDefault {
-				if err := unsetDefaultTemplates(tx, userID, ""); err != nil {
-					return err
-				}
-			}
-
-			return tx.Create(item).Error
-		}); err != nil {
-			h.logger.Error("Failed to create ad template", "error", err)
-			response.Error(c, http.StatusInternalServerError, "Failed to save ad template")
-			return
-		}
-
-		response.Created(c, gin.H{"template": item})
-		return
-	}
-
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Ad template not found")
-		return
-	}
-
-	var item model.AdTemplate
-	if err := h.db.WithContext(ctx).Where("id = ? AND user_id = ?", id, userID).First(&item).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			response.Error(c, http.StatusNotFound, "Ad template not found")
-			return
-		}
-		h.logger.Error("Failed to load ad template", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to save ad template")
-		return
-	}
-
-	item.Name = name
-	item.Description = stringPointer(strings.TrimSpace(req.Description))
-	item.VastTagURL = vastURL
-	item.AdFormat = model.StringPtr(format)
-	item.Duration = intPtrToInt64Ptr(req.Duration)
-	if req.IsActive != nil {
-		item.IsActive = model.BoolPtr(*req.IsActive)
-	}
-	if req.IsDefault != nil {
-		item.IsDefault = *req.IsDefault
-	}
-	if !adTemplateIsActive(item.IsActive) {
-		item.IsDefault = false
-	}
-
-	if err := h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if item.IsDefault {
-			if err := unsetDefaultTemplates(tx, userID, item.ID); err != nil {
-				return err
-			}
-		}
-
-		return tx.Save(&item).Error
-	}); err != nil {
-		h.logger.Error("Failed to update ad template", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to save ad template")
-		return
-	}
-
-	response.Success(c, gin.H{"template": item})
-}
-
-func requirePaidPlan(c *gin.Context) bool {
-	userValue, exists := c.Get("user")
-	if !exists {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return false
-	}
-
-	user, ok := userValue.(*model.User)
-	if !ok || user == nil {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return false
-	}
-
-	if user.PlanID == nil || strings.TrimSpace(*user.PlanID) == "" {
-		response.Error(c, http.StatusForbidden, upgradeRequiredMessage)
-		return false
-	}
-
-	return true
-}
-
-func unsetDefaultTemplates(tx *gorm.DB, userID, excludeID string) error {
-	query := tx.Model(&model.AdTemplate{}).Where("user_id = ?", userID)
-	if excludeID != "" {
-		query = query.Where("id <> ?", excludeID)
-	}
-
-	return query.Update("is_default", false).Error
-}
-
-func normalizeAdFormat(value string) string {
-	switch strings.TrimSpace(strings.ToLower(value)) {
-	case "mid-roll", "post-roll":
-		return strings.TrimSpace(strings.ToLower(value))
-	default:
-		return "pre-roll"
-	}
-}
-
-func stringPointer(value string) *string {
-	if value == "" {
-		return nil
-	}
-	return &value
-}
-
-func intPtrToInt64Ptr(value *int) *int64 {
-	if value == nil {
-		return nil
-	}
-	converted := int64(*value)
-	return &converted
-}
-
-func adTemplateIsActive(value *bool) bool {
-	return value == nil || *value
-}
diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go
deleted file mode 100644
index 7a3ebf2..0000000
--- a/internal/api/auth/auth.go
+++ /dev/null
@@ -1,745 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package auth
-
-import (
-	"crypto/rand"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"golang.org/x/crypto/bcrypt"
-	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/google"
-	"gorm.io/gorm"
-	"stream.api/internal/config"
-	"stream.api/internal/database/model"
-	"stream.api/internal/database/query"
-	"stream.api/pkg/cache"
-	"stream.api/pkg/logger"
-	"stream.api/pkg/response"
-	"stream.api/pkg/token"
-)
-
-type handler struct {
-	cache              cache.Cache
-	token              token.Provider
-	logger             logger.Logger
-	db                 *gorm.DB
-	googleOauth        *oauth2.Config
-	googleStateTTL     time.Duration
-	frontendBaseURL    string
-	googleFinalizePath string
-}
-
-// NewHandler creates a new instance of Handler
-func NewHandler(c cache.Cache, t token.Provider, l logger.Logger, cfg *config.Config, db *gorm.DB) AuthHandler {
-	stateTTL := time.Duration(cfg.Google.StateTTLMinute) * time.Minute
-	if stateTTL <= 0 {
-		stateTTL = 10 * time.Minute
-	}
-
-	return &handler{
-		cache:              c,
-		token:              t,
-		logger:             l,
-		db:                 db,
-		googleStateTTL:     stateTTL,
-		frontendBaseURL:    strings.TrimRight(cfg.Frontend.BaseURL, "/"),
-		googleFinalizePath: cfg.Frontend.GoogleAuthFinalizePath,
-		googleOauth: &oauth2.Config{
-			ClientID:     cfg.Google.ClientID,
-			ClientSecret: cfg.Google.ClientSecret,
-			RedirectURL:  cfg.Google.RedirectURL,
-			Scopes: []string{
-				"https://www.googleapis.com/auth/userinfo.email",
-				"https://www.googleapis.com/auth/userinfo.profile",
-			},
-			Endpoint: google.Endpoint,
-		},
-	}
-}
-
-// @Summary      Login
-// @Description  Login with email and password
-// @Tags         auth
-// @Accept       json
-// @Produce      json
-// @Param        request  body      LoginRequest  true  "Login payload"
-// @Success      200      {object}  response.Response{data=UserPayload}
-// @Failure      400      {object}  response.Response
-// @Failure      401      {object}  response.Response
-// @Router       /auth/login [post]
-func (h *handler) Login(c *gin.Context) {
-	var req LoginRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	u := query.User
-	user, err := u.WithContext(c.Request.Context()).Where(u.Email.Eq(req.Email)).First()
-	if err != nil {
-		response.Error(c, http.StatusUnauthorized, "Invalid credentials")
-		return
-	}
-
-	// Verify password (if user has password, google users might not)
-	if user.Password == nil || *user.Password == "" {
-		response.Error(c, http.StatusUnauthorized, "Please login with Google")
-		return
-	}
-
-	if err := bcrypt.CompareHashAndPassword([]byte(*user.Password), []byte(req.Password)); err != nil {
-		response.Error(c, http.StatusUnauthorized, "Invalid credentials")
-		return
-	}
-
-	if err := h.generateAndSetTokens(c, user.ID, user.Email, safeRole(user.Role)); err != nil {
-		return
-	}
-	h.respondWithUserPayload(c, user)
-}
-
-// @Summary      Logout
-// @Description  Logout user and clear cookies
-// @Tags         auth
-// @Produce      json
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Router       /auth/logout [post]
-// @Security     BearerAuth
-func (h *handler) Logout(c *gin.Context) {
-	refreshToken, err := c.Cookie("refresh_token")
-	if err == nil {
-		claims, err := h.token.ParseMapToken(refreshToken)
-		if err == nil {
-			if refreshUUID, ok := claims["refresh_uuid"].(string); ok {
-				h.cache.Del(c.Request.Context(), "refresh_uuid:"+refreshUUID)
-			}
-		}
-	}
-
-	c.SetCookie("access_token", "", -1, "/", "", false, true)
-	c.SetCookie("refresh_token", "", -1, "/", "", false, true)
-	response.Success(c, "Logged out")
-}
-
-// @Summary      Register
-// @Description  Register a new user
-// @Tags         auth
-// @Accept       json
-// @Produce      json
-// @Param        request  body      RegisterRequest  true  "Registration payload"
-// @Success      201      {object}  response.Response
-// @Failure      400      {object}  response.Response
-// @Failure      500      {object}  response.Response
-// @Router       /auth/register [post]
-func (h *handler) Register(c *gin.Context) {
-	var req RegisterRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	u := query.User
-	// Check existing
-	count, _ := u.WithContext(c.Request.Context()).Where(u.Email.Eq(req.Email)).Count()
-	if count > 0 {
-		response.Error(c, http.StatusBadRequest, "Email already registered")
-		return
-	}
-
-	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
-	if err != nil {
-		response.Fail(c, "Failed to hash password")
-		return
-	}
-
-	password := string(hashedPassword)
-	role := "USER"
-	newUser := &model.User{
-		ID:       uuid.New().String(),
-		Email:    req.Email,
-		Password: &password,
-		Username: &req.Username,
-		Role:     &role,
-	}
-
-	if err := u.WithContext(c.Request.Context()).Create(newUser); err != nil {
-		response.Fail(c, "Failed to create user")
-		return
-	}
-
-	response.Created(c, "User registered")
-}
-
-// @Summary      Forgot Password
-// @Description  Request password reset link
-// @Tags         auth
-// @Accept       json
-// @Produce      json
-// @Param        request  body      ForgotPasswordRequest  true  "Forgot password payload"
-// @Success      200      {object}  response.Response
-// @Failure      400      {object}  response.Response
-// @Failure      500      {object}  response.Response
-// @Router       /auth/forgot-password [post]
-func (h *handler) ForgotPassword(c *gin.Context) {
-	var req ForgotPasswordRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	u := query.User
-	user, err := u.WithContext(c.Request.Context()).Where(u.Email.Eq(req.Email)).First()
-	if err != nil {
-		// Do not reveal
-		response.Success(c, "If email exists, a reset link has been sent")
-		return
-	}
-
-	tokenID := uuid.New().String()
-	err = h.cache.Set(c.Request.Context(), "reset_pw:"+tokenID, user.ID, 15*time.Minute)
-	if err != nil {
-		h.logger.Error("Failed to set reset token", "error", err)
-		response.Fail(c, "Try again later")
-		return
-	}
-
-	// log.Printf replaced with logger
-	h.logger.Info("Sending Password Reset Email", "email", req.Email, "token", tokenID)
-	response.Success(c, gin.H{"message": "If email exists, a reset link has been sent", "debug_token": tokenID})
-}
-
-// @Summary      Reset Password
-// @Description  Reset password using token
-// @Tags         auth
-// @Accept       json
-// @Produce      json
-// @Param        request  body      ResetPasswordRequest  true  "Reset password payload"
-// @Success      200      {object}  response.Response
-// @Failure      400      {object}  response.Response
-// @Failure      500      {object}  response.Response
-// @Router       /auth/reset-password [post]
-func (h *handler) ResetPassword(c *gin.Context) {
-	var req ResetPasswordRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	userID, err := h.cache.Get(c.Request.Context(), "reset_pw:"+req.Token)
-	if err != nil {
-		// Cache interface should likely separate "Not Found" vs "Error" or return error compatible with checking
-		// If implementation returns redis.Nil equivalent.
-		// Our Cache interface Get returns (string, error).
-		// Redis implementation returns redis.Nil which is an error.
-		// We'll need to check if generic cache supports "not found" check.
-		// For now, simple error check.
-		response.Error(c, http.StatusBadRequest, "Invalid or expired token")
-		return
-	}
-
-	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.NewPassword), bcrypt.DefaultCost)
-	if err != nil {
-		response.Fail(c, "Internal Error")
-		return
-	}
-
-	u := query.User
-	_, err = u.WithContext(c.Request.Context()).Where(u.ID.Eq(userID)).Update(u.Password, string(hashedPassword))
-	if err != nil {
-		response.Fail(c, "Failed to update password")
-		return
-	}
-
-	h.cache.Del(c.Request.Context(), "reset_pw:"+req.Token)
-	response.Success(c, "Password reset successfully")
-}
-
-// @Summary      Google Login
-// @Description  Redirect to Google for Login
-// @Tags         auth
-// @Router       /auth/google/login [get]
-func (h *handler) LoginGoogle(c *gin.Context) {
-	state, err := generateOAuthState()
-	if err != nil {
-		h.logger.Error("Failed to generate Google OAuth state", "error", err)
-		response.Fail(c, "Failed to start Google login")
-		return
-	}
-
-	if err := h.cache.Set(c.Request.Context(), googleOAuthStateCacheKey(state), "1", h.googleStateTTL); err != nil {
-		h.logger.Error("Failed to persist Google OAuth state", "error", err)
-		response.Fail(c, "Failed to start Google login")
-		return
-	}
-
-	url := h.googleOauth.AuthCodeURL(state, oauth2.AccessTypeOffline)
-	c.Redirect(http.StatusTemporaryRedirect, url)
-}
-
-// @Summary      Google Callback
-// @Description  Callback for Google Login
-// @Tags         auth
-// @Success      307
-// @Failure      400  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /auth/google/callback [get]
-func (h *handler) GoogleCallback(c *gin.Context) {
-	if oauthError := strings.TrimSpace(c.Query("error")); oauthError != "" {
-		h.redirectToGoogleFinalize(c, "error", oauthError)
-		return
-	}
-
-	state := strings.TrimSpace(c.Query("state"))
-	if state == "" {
-		h.redirectToGoogleFinalize(c, "error", "missing_state")
-		return
-	}
-
-	cachedState, err := h.cache.Get(c.Request.Context(), googleOAuthStateCacheKey(state))
-	if err != nil || cachedState == "" {
-		h.redirectToGoogleFinalize(c, "error", "invalid_state")
-		return
-	}
-	_ = h.cache.Del(c.Request.Context(), googleOAuthStateCacheKey(state))
-
-	code := strings.TrimSpace(c.Query("code"))
-	if code == "" {
-		h.redirectToGoogleFinalize(c, "error", "missing_code")
-		return
-	}
-
-	tokenResp, err := h.googleOauth.Exchange(c.Request.Context(), code)
-	if err != nil {
-		h.logger.Error("Failed to exchange Google OAuth token", "error", err)
-		h.redirectToGoogleFinalize(c, "error", "exchange_failed")
-		return
-	}
-
-	client := h.googleOauth.Client(c.Request.Context(), tokenResp)
-	resp, err := client.Get("https://www.googleapis.com/oauth2/v2/userinfo")
-	if err != nil {
-		h.logger.Error("Failed to fetch Google user info", "error", err)
-		h.redirectToGoogleFinalize(c, "error", "userinfo_failed")
-		return
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		h.logger.Error("Google user info returned non-200", "status", resp.StatusCode)
-		h.redirectToGoogleFinalize(c, "error", "userinfo_failed")
-		return
-	}
-
-	var googleUser struct {
-		ID      string `json:"id"`
-		Email   string `json:"email"`
-		Name    string `json:"name"`
-		Picture string `json:"picture"`
-	}
-	if err := json.NewDecoder(resp.Body).Decode(&googleUser); err != nil {
-		h.logger.Error("Failed to decode Google user info", "error", err)
-		h.redirectToGoogleFinalize(c, "error", "userinfo_parse_failed")
-		return
-	}
-
-	if strings.TrimSpace(googleUser.Email) == "" {
-		h.redirectToGoogleFinalize(c, "error", "missing_email")
-		return
-	}
-
-	u := query.User
-	user, err := u.WithContext(c.Request.Context()).Where(u.Email.Eq(googleUser.Email)).First()
-	if err != nil {
-		role := "USER"
-		user = &model.User{
-			ID:       uuid.New().String(),
-			Email:    googleUser.Email,
-			Username: stringPointerOrNil(googleUser.Name),
-			GoogleID: stringPointerOrNil(googleUser.ID),
-			Avatar:   stringPointerOrNil(googleUser.Picture),
-			Role:     &role,
-		}
-		if err := u.WithContext(c.Request.Context()).Create(user); err != nil {
-			h.logger.Error("Failed to create Google user", "error", err)
-			h.redirectToGoogleFinalize(c, "error", "create_user_failed")
-			return
-		}
-	} else {
-		updates := map[string]interface{}{}
-		if user.GoogleID == nil || strings.TrimSpace(*user.GoogleID) == "" {
-			updates["google_id"] = googleUser.ID
-		}
-		if user.Avatar == nil || strings.TrimSpace(*user.Avatar) == "" {
-			updates["avatar"] = googleUser.Picture
-		}
-		if user.Username == nil || strings.TrimSpace(*user.Username) == "" {
-			updates["username"] = googleUser.Name
-		}
-		if len(updates) > 0 {
-			if err := h.db.WithContext(c.Request.Context()).Model(&model.User{}).Where("id = ?", user.ID).Updates(updates).Error; err != nil {
-				h.logger.Error("Failed to update Google user", "error", err)
-				h.redirectToGoogleFinalize(c, "error", "update_user_failed")
-				return
-			}
-			user, err = u.WithContext(c.Request.Context()).Where(u.ID.Eq(user.ID)).First()
-			if err != nil {
-				h.logger.Error("Failed to reload Google user", "error", err)
-				h.redirectToGoogleFinalize(c, "error", "reload_user_failed")
-				return
-			}
-		}
-	}
-
-	if err := h.generateAndSetTokens(c, user.ID, user.Email, safeRole(user.Role)); err != nil {
-		h.redirectToGoogleFinalize(c, "error", "session_failed")
-		return
-	}
-
-	if h.frontendBaseURL == "" {
-		h.respondWithUserPayload(c, user)
-		return
-	}
-
-	h.redirectToGoogleFinalize(c, "success", "")
-}
-
-// @Summary      Get Current User
-// @Description  Get the authenticated user's profile payload
-// @Tags         auth
-// @Produce      json
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Router       /me [get]
-// @Security     BearerAuth
-func (h *handler) GetMe(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	u := query.User
-	user, err := u.WithContext(c.Request.Context()).Where(u.ID.Eq(userID)).First()
-	if err != nil {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	h.respondWithUserPayload(c, user)
-}
-
-// @Summary      Update Current User
-// @Description  Update the authenticated user's profile information
-// @Tags         auth
-// @Accept       json
-// @Produce      json
-// @Param        request body UpdateMeRequest true "Profile payload"
-// @Success      200  {object}  response.Response
-// @Failure      400  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /me [put]
-// @Security     BearerAuth
-func (h *handler) UpdateMe(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	var req UpdateMeRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	user, err := UpdateUserProfile(c.Request.Context(), h.db, h.logger, userID, UpdateProfileInput{
-		Username: req.Username,
-		Email:    req.Email,
-		Language: req.Language,
-		Locale:   req.Locale,
-	})
-	if err != nil {
-		switch {
-		case errors.Is(err, ErrEmailRequired):
-			response.Error(c, http.StatusBadRequest, err.Error())
-		case errors.Is(err, ErrEmailAlreadyRegistered):
-			response.Error(c, http.StatusBadRequest, err.Error())
-		default:
-			response.Fail(c, "Failed to update profile")
-		}
-		return
-	}
-
-	h.respondWithUserPayload(c, user)
-}
-
-// @Summary      Change Password
-// @Description  Change the authenticated user's local password
-// @Tags         auth
-// @Accept       json
-// @Produce      json
-// @Param        request body ChangePasswordRequest true "Password payload"
-// @Success      200  {object}  response.Response
-// @Failure      400  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /auth/change-password [post]
-// @Security     BearerAuth
-func (h *handler) ChangePassword(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	var req ChangePasswordRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	u := query.User
-	user, err := u.WithContext(c.Request.Context()).Where(u.ID.Eq(userID)).First()
-	if err != nil {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	if user.Password == nil || strings.TrimSpace(*user.Password) == "" {
-		response.Error(c, http.StatusBadRequest, "This account does not have a local password")
-		return
-	}
-
-	if err := bcrypt.CompareHashAndPassword([]byte(*user.Password), []byte(req.CurrentPassword)); err != nil {
-		response.Error(c, http.StatusBadRequest, "Current password is incorrect")
-		return
-	}
-
-	if req.CurrentPassword == req.NewPassword {
-		response.Error(c, http.StatusBadRequest, "New password must be different")
-		return
-	}
-
-	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.NewPassword), bcrypt.DefaultCost)
-	if err != nil {
-		response.Fail(c, "Failed to hash password")
-		return
-	}
-
-	if _, err := u.WithContext(c.Request.Context()).Where(u.ID.Eq(userID)).Update(u.Password, string(hashedPassword)); err != nil {
-		h.logger.Error("Failed to change password", "error", err)
-		response.Fail(c, "Failed to change password")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "Password changed successfully"})
-}
-
-// @Summary      Clear My Data
-// @Description  Remove videos and settings-related resources for the authenticated user
-// @Tags         auth
-// @Produce      json
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /me/clear-data [post]
-// @Security     BearerAuth
-func (h *handler) ClearMyData(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	ctx := c.Request.Context()
-	if err := h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Where("user_id = ?", userID).Delete(&model.Notification{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.Domain{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.AdTemplate{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.VideoAdConfig{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.Video{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Model(&model.User{}).Where("id = ?", userID).Updates(map[string]interface{}{"storage_used": 0}).Error; err != nil {
-			return err
-		}
-		return nil
-	}); err != nil {
-		h.logger.Error("Failed to clear user data", "error", err)
-		response.Fail(c, "Failed to clear data")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "Data cleared successfully"})
-}
-
-// @Summary      Delete My Account
-// @Description  Permanently delete the authenticated user's account and related data
-// @Tags         auth
-// @Produce      json
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /me [delete]
-// @Security     BearerAuth
-func (h *handler) DeleteMe(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	ctx := c.Request.Context()
-	if err := h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Where("user_id = ?", userID).Delete(&model.Notification{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.Domain{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.AdTemplate{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.VideoAdConfig{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.WalletTransaction{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.PlanSubscription{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.UserPreference{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.Payment{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.Video{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("id = ?", userID).Delete(&model.User{}).Error; err != nil {
-			return err
-		}
-		return nil
-	}); err != nil {
-		h.logger.Error("Failed to delete user", "error", err)
-		response.Fail(c, "Failed to delete account")
-		return
-	}
-
-	c.SetCookie("access_token", "", -1, "/", "", false, true)
-	c.SetCookie("refresh_token", "", -1, "/", "", false, true)
-	response.Success(c, gin.H{"message": "Account deleted successfully"})
-}
-
-func (h *handler) generateAndSetTokens(c *gin.Context, userID, email, role string) error {
-	td, err := h.token.GenerateTokenPair(userID, email, role)
-	if err != nil {
-		h.logger.Error("Token generation failed", "error", err)
-		response.Fail(c, "Error generating tokens")
-		return err
-	}
-
-	// Store Refresh UUID in Redis
-	err = h.cache.Set(c.Request.Context(), "refresh_uuid:"+td.RefreshUUID, userID, time.Until(time.Unix(td.RtExpires, 0)))
-	if err != nil {
-		h.logger.Error("Session storage failed", "error", err)
-		response.Fail(c, "Error storing session")
-		return err
-	}
-
-	c.SetCookie("access_token", td.AccessToken, int(td.AtExpires-time.Now().Unix()), "/", "", false, true)
-	c.SetCookie("refresh_token", td.RefreshToken, int(td.RtExpires-time.Now().Unix()), "/", "", false, true)
-	return nil
-}
-
-func (h *handler) respondWithUserPayload(c *gin.Context, user *model.User) {
-	payload, err := BuildUserPayload(c.Request.Context(), h.db, user)
-	if err != nil {
-		h.logger.Error("Failed to build user payload", "error", err)
-		response.Fail(c, "Failed to build user payload")
-		return
-	}
-
-	response.Success(c, gin.H{"user": payload})
-}
-
-func safeRole(role *string) string {
-	if role == nil || strings.TrimSpace(*role) == "" {
-		return "USER"
-	}
-	return *role
-}
-
-func generateOAuthState() (string, error) {
-	buffer := make([]byte, 32)
-	if _, err := rand.Read(buffer); err != nil {
-		return "", err
-	}
-	return base64.RawURLEncoding.EncodeToString(buffer), nil
-}
-
-func googleOAuthStateCacheKey(state string) string {
-	return "google_oauth_state:" + state
-}
-
-func stringPointerOrNil(value string) *string {
-	trimmed := strings.TrimSpace(value)
-	if trimmed == "" {
-		return nil
-	}
-	return &trimmed
-}
-
-func (h *handler) redirectToGoogleFinalize(c *gin.Context, status, reason string) {
-	finalizeURL := h.googleFinalizeURL(status, reason)
-	if finalizeURL == "" {
-		response.Error(c, http.StatusBadRequest, reason)
-		return
-	}
-	c.Redirect(http.StatusTemporaryRedirect, finalizeURL)
-}
-
-func (h *handler) googleFinalizeURL(status, reason string) string {
-	if h.frontendBaseURL == "" {
-		return ""
-	}
-
-	finalizePath := h.googleFinalizePath
-	if strings.TrimSpace(finalizePath) == "" {
-		finalizePath = "/auth/google/finalize"
-	}
-	if !strings.HasPrefix(finalizePath, "/") {
-		finalizePath = "/" + finalizePath
-	}
-
-	values := url.Values{}
-	values.Set("status", status)
-	if strings.TrimSpace(reason) != "" {
-		values.Set("reason", reason)
-	}
-
-	return fmt.Sprintf("%s%s?%s", h.frontendBaseURL, finalizePath, values.Encode())
-}
diff --git a/internal/api/auth/interface.go b/internal/api/auth/interface.go
deleted file mode 100644
index 771f428..0000000
--- a/internal/api/auth/interface.go
+++ /dev/null
@@ -1,58 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package auth
-
-import "github.com/gin-gonic/gin"
-
-// AuthHandler defines the interface for authentication operations
-type AuthHandler interface {
-	Login(c *gin.Context)
-	Logout(c *gin.Context)
-	Register(c *gin.Context)
-	ForgotPassword(c *gin.Context)
-	ResetPassword(c *gin.Context)
-	LoginGoogle(c *gin.Context)
-	GoogleCallback(c *gin.Context)
-	GetMe(c *gin.Context)
-	UpdateMe(c *gin.Context)
-	ChangePassword(c *gin.Context)
-	DeleteMe(c *gin.Context)
-	ClearMyData(c *gin.Context)
-}
-
-// LoginRequest defines the payload for login
-type LoginRequest struct {
-	Email    string `json:"email" binding:"required,email"`
-	Password string `json:"password" binding:"required"`
-}
-
-// RegisterRequest defines the payload for registration
-type RegisterRequest struct {
-	Email    string `json:"email" binding:"required,email"`
-	Password string `json:"password" binding:"required,min=6"`
-	Username string `json:"username" binding:"required"`
-}
-
-// ForgotPasswordRequest defines the payload for requesting a password reset
-type ForgotPasswordRequest struct {
-	Email string `json:"email" binding:"required,email"`
-}
-
-// ResetPasswordRequest defines the payload for resetting the password
-type ResetPasswordRequest struct {
-	Token       string `json:"token" binding:"required"`
-	NewPassword string `json:"new_password" binding:"required,min=6"`
-}
-
-type UpdateMeRequest struct {
-	Username *string `json:"username"`
-	Email    *string `json:"email"`
-	Language *string `json:"language"`
-	Locale   *string `json:"locale"`
-}
-
-type ChangePasswordRequest struct {
-	CurrentPassword string `json:"current_password" binding:"required"`
-	NewPassword     string `json:"new_password" binding:"required,min=6"`
-}
diff --git a/internal/api/auth/types.go b/internal/api/auth/types.go
deleted file mode 100644
index 9379111..0000000
--- a/internal/api/auth/types.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package auth
-
-type LoginRequest struct {
-	Email    string `json:"email" binding:"required,email"`
-	Password string `json:"password" binding:"required"`
-}
-
-type RegisterRequest struct {
-	Email    string `json:"email" binding:"required,email"`
-	Password string `json:"password" binding:"required,min=6"`
-	Username string `json:"username" binding:"required"`
-}
-
-type ForgotPasswordRequest struct {
-	Email string `json:"email" binding:"required,email"`
-}
-
-type ResetPasswordRequest struct {
-	Token       string `json:"token" binding:"required"`
-	NewPassword string `json:"new_password" binding:"required,min=6"`
-}
-
-type UpdateMeRequest struct {
-	Username *string `json:"username"`
-	Email    *string `json:"email"`
-	Language *string `json:"language"`
-	Locale   *string `json:"locale"`
-}
-
-type ChangePasswordRequest struct {
-	CurrentPassword string `json:"current_password" binding:"required"`
-	NewPassword     string `json:"new_password" binding:"required,min=6"`
-}
diff --git a/internal/api/domains/handler.go b/internal/api/domains/handler.go
deleted file mode 100644
index 48e97f4..0000000
--- a/internal/api/domains/handler.go
+++ /dev/null
@@ -1,166 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package domains
-
-import (
-	"net/http"
-	"strings"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-	"stream.api/internal/database/model"
-	"stream.api/pkg/logger"
-	"stream.api/pkg/response"
-)
-
-type Handler struct {
-	logger logger.Logger
-	db     *gorm.DB
-}
-
-type CreateDomainRequest struct {
-	Name string `json:"name" binding:"required"`
-}
-
-func NewHandler(l logger.Logger, db *gorm.DB) *Handler {
-	return &Handler{logger: l, db: db}
-}
-
-// @Summary      List Domains
-// @Description  Get all whitelisted domains for the current user
-// @Tags         domains
-// @Produce      json
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /domains [get]
-// @Security     BearerAuth
-func (h *Handler) ListDomains(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	var items []model.Domain
-	if err := h.db.WithContext(c.Request.Context()).
-		Where("user_id = ?", userID).
-		Order("created_at DESC").
-		Find(&items).Error; err != nil {
-		h.logger.Error("Failed to list domains", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to load domains")
-		return
-	}
-
-	response.Success(c, gin.H{"domains": items})
-}
-
-// @Summary      Create Domain
-// @Description  Add a domain to the current user's whitelist
-// @Tags         domains
-// @Accept       json
-// @Produce      json
-// @Param        request body CreateDomainRequest true "Domain payload"
-// @Success      201  {object}  response.Response
-// @Failure      400  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /domains [post]
-// @Security     BearerAuth
-func (h *Handler) CreateDomain(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	var req CreateDomainRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	name := normalizeDomain(req.Name)
-	if name == "" || !strings.Contains(name, ".") || strings.ContainsAny(name, "/ ") {
-		response.Error(c, http.StatusBadRequest, "Invalid domain")
-		return
-	}
-
-	var count int64
-	if err := h.db.WithContext(c.Request.Context()).
-		Model(&model.Domain{}).
-		Where("user_id = ? AND name = ?", userID, name).
-		Count(&count).Error; err != nil {
-		h.logger.Error("Failed to validate domain", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to create domain")
-		return
-	}
-	if count > 0 {
-		response.Error(c, http.StatusBadRequest, "Domain already exists")
-		return
-	}
-
-	item := &model.Domain{
-		ID:     uuid.New().String(),
-		UserID: userID,
-		Name:   name,
-	}
-	if err := h.db.WithContext(c.Request.Context()).Create(item).Error; err != nil {
-		h.logger.Error("Failed to create domain", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to create domain")
-		return
-	}
-
-	response.Created(c, gin.H{"domain": item})
-}
-
-// @Summary      Delete Domain
-// @Description  Remove a domain from the current user's whitelist
-// @Tags         domains
-// @Produce      json
-// @Param        id path string true "Domain ID"
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /domains/{id} [delete]
-// @Security     BearerAuth
-func (h *Handler) DeleteDomain(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Domain not found")
-		return
-	}
-
-	result := h.db.WithContext(c.Request.Context()).
-		Where("id = ? AND user_id = ?", id, userID).
-		Delete(&model.Domain{})
-	if result.Error != nil {
-		h.logger.Error("Failed to delete domain", "error", result.Error)
-		response.Error(c, http.StatusInternalServerError, "Failed to delete domain")
-		return
-	}
-	if result.RowsAffected == 0 {
-		response.Error(c, http.StatusNotFound, "Domain not found")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "Domain deleted"})
-}
-
-func normalizeDomain(value string) string {
-	normalized := strings.TrimSpace(strings.ToLower(value))
-	normalized = strings.TrimPrefix(normalized, "https://")
-	normalized = strings.TrimPrefix(normalized, "http://")
-	normalized = strings.TrimPrefix(normalized, "www.")
-	normalized = strings.TrimSuffix(normalized, "/")
-	return normalized
-}
diff --git a/internal/api/notifications/handler.go b/internal/api/notifications/handler.go
deleted file mode 100644
index 6090616..0000000
--- a/internal/api/notifications/handler.go
+++ /dev/null
@@ -1,246 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package notifications
-
-import (
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"gorm.io/gorm"
-	"stream.api/internal/database/model"
-	"stream.api/pkg/logger"
-	"stream.api/pkg/response"
-)
-
-type Handler struct {
-	logger logger.Logger
-	db     *gorm.DB
-}
-
-type NotificationItem struct {
-	ID          string    `json:"id"`
-	Type        string    `json:"type"`
-	Title       string    `json:"title"`
-	Message     string    `json:"message"`
-	Read        bool      `json:"read"`
-	ActionURL   string    `json:"actionUrl,omitempty"`
-	ActionLabel string    `json:"actionLabel,omitempty"`
-	CreatedAt   time.Time `json:"created_at"`
-}
-
-func NewHandler(l logger.Logger, db *gorm.DB) *Handler {
-	return &Handler{logger: l, db: db}
-}
-
-// @Summary      List Notifications
-// @Description  Get notifications for the current user
-// @Tags         notifications
-// @Produce      json
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /notifications [get]
-// @Security     BearerAuth
-func (h *Handler) ListNotifications(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	var rows []model.Notification
-	if err := h.db.WithContext(c.Request.Context()).
-		Where("user_id = ?", userID).
-		Order("created_at DESC").
-		Find(&rows).Error; err != nil {
-		h.logger.Error("Failed to list notifications", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to load notifications")
-		return
-	}
-
-	items := make([]NotificationItem, 0, len(rows))
-	for _, row := range rows {
-		items = append(items, mapNotification(row))
-	}
-
-	response.Success(c, gin.H{"notifications": items})
-}
-
-// @Summary      Mark Notification Read
-// @Description  Mark a single notification as read for the current user
-// @Tags         notifications
-// @Produce      json
-// @Param        id path string true "Notification ID"
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /notifications/{id}/read [post]
-// @Security     BearerAuth
-func (h *Handler) MarkRead(c *gin.Context) {
-	h.updateReadState(c, true, false)
-}
-
-// @Summary      Mark All Notifications Read
-// @Description  Mark all notifications as read for the current user
-// @Tags         notifications
-// @Produce      json
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /notifications/read-all [post]
-// @Security     BearerAuth
-func (h *Handler) MarkAllRead(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	if err := h.db.WithContext(c.Request.Context()).
-		Model(&model.Notification{}).
-		Where("user_id = ? AND is_read = ?", userID, false).
-		Update("is_read", true).Error; err != nil {
-		h.logger.Error("Failed to mark all notifications as read", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to update notifications")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "All notifications marked as read"})
-}
-
-// @Summary      Delete Notification
-// @Description  Delete a single notification for the current user
-// @Tags         notifications
-// @Produce      json
-// @Param        id path string true "Notification ID"
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /notifications/{id} [delete]
-// @Security     BearerAuth
-func (h *Handler) DeleteNotification(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Notification not found")
-		return
-	}
-
-	result := h.db.WithContext(c.Request.Context()).
-		Where("id = ? AND user_id = ?", id, userID).
-		Delete(&model.Notification{})
-	if result.Error != nil {
-		h.logger.Error("Failed to delete notification", "error", result.Error)
-		response.Error(c, http.StatusInternalServerError, "Failed to delete notification")
-		return
-	}
-	if result.RowsAffected == 0 {
-		response.Error(c, http.StatusNotFound, "Notification not found")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "Notification deleted"})
-}
-
-// @Summary      Clear Notifications
-// @Description  Delete all notifications for the current user
-// @Tags         notifications
-// @Produce      json
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /notifications [delete]
-// @Security     BearerAuth
-func (h *Handler) ClearNotifications(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	if err := h.db.WithContext(c.Request.Context()).Where("user_id = ?", userID).Delete(&model.Notification{}).Error; err != nil {
-		h.logger.Error("Failed to clear notifications", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to clear notifications")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "All notifications deleted"})
-}
-
-func (h *Handler) updateReadState(c *gin.Context, value bool, silentNotFound bool) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Notification not found")
-		return
-	}
-
-	result := h.db.WithContext(c.Request.Context()).
-		Model(&model.Notification{}).
-		Where("id = ? AND user_id = ?", id, userID).
-		Update("is_read", value)
-	if result.Error != nil {
-		h.logger.Error("Failed to update notification", "error", result.Error)
-		response.Error(c, http.StatusInternalServerError, "Failed to update notification")
-		return
-	}
-	if result.RowsAffected == 0 && !silentNotFound {
-		response.Error(c, http.StatusNotFound, "Notification not found")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "Notification updated"})
-}
-
-func mapNotification(item model.Notification) NotificationItem {
-	createdAt := time.Time{}
-	if item.CreatedAt != nil {
-		createdAt = item.CreatedAt.UTC()
-	}
-
-	return NotificationItem{
-		ID:          item.ID,
-		Type:        normalizeType(item.Type),
-		Title:       item.Title,
-		Message:     item.Message,
-		Read:        item.IsRead,
-		ActionURL:   model.StringValue(item.ActionURL),
-		ActionLabel: model.StringValue(item.ActionLabel),
-		CreatedAt:   createdAt,
-	}
-}
-
-func normalizeType(value string) string {
-	lower := strings.ToLower(strings.TrimSpace(value))
-	switch {
-	case strings.Contains(lower, "video"):
-		return "video"
-	case strings.Contains(lower, "payment"), strings.Contains(lower, "billing"):
-		return "payment"
-	case strings.Contains(lower, "warning"):
-		return "warning"
-	case strings.Contains(lower, "error"):
-		return "error"
-	case strings.Contains(lower, "success"):
-		return "success"
-	case strings.Contains(lower, "system"):
-		return "system"
-	default:
-		return "info"
-	}
-}
diff --git a/internal/api/payment/handler.go b/internal/api/payment/handler.go
deleted file mode 100644
index 38fd1ae..0000000
--- a/internal/api/payment/handler.go
+++ /dev/null
@@ -1,806 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package payment
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-	"stream.api/internal/config"
-	"stream.api/internal/database/model"
-	"stream.api/internal/database/query"
-	"stream.api/pkg/logger"
-	"stream.api/pkg/response"
-)
-
-const (
-	walletTransactionTypeTopup             = "topup"
-	walletTransactionTypeSubscriptionDebit = "subscription_debit"
-	paymentMethodWallet                    = "wallet"
-	paymentMethodTopup                     = "topup"
-	paymentKindSubscription                = "subscription"
-	paymentKindWalletTopup                 = "wallet_topup"
-)
-
-var allowedTermMonths = map[int32]struct{}{
-	1:  {},
-	3:  {},
-	6:  {},
-	12: {},
-}
-
-type Handler struct {
-	logger logger.Logger
-	cfg    *config.Config
-	db     *gorm.DB
-}
-
-type paymentRow struct {
-	ID            string     `gorm:"column:id"`
-	Amount        float64    `gorm:"column:amount"`
-	Currency      *string    `gorm:"column:currency"`
-	Status        *string    `gorm:"column:status"`
-	PlanID        *string    `gorm:"column:plan_id"`
-	PlanName      *string    `gorm:"column:plan_name"`
-	TermMonths    *int32     `gorm:"column:term_months"`
-	PaymentMethod *string    `gorm:"column:payment_method"`
-	ExpiresAt     *time.Time `gorm:"column:expires_at"`
-	CreatedAt     *time.Time `gorm:"column:created_at"`
-}
-
-type paymentInvoiceDetails struct {
-	PlanName      string
-	TermMonths    *int32
-	PaymentMethod string
-	ExpiresAt     *time.Time
-	WalletAmount  float64
-	TopupAmount   float64
-}
-
-type paymentError struct {
-	Code    int
-	Message string
-	Data    interface{}
-}
-
-func (e *paymentError) Error() string {
-	return e.Message
-}
-
-func NewHandler(l logger.Logger, cfg *config.Config, db *gorm.DB) PaymentHandler {
-	return &Handler{
-		logger: l,
-		cfg:    cfg,
-		db:     db,
-	}
-}
-
-// @Summary      Create Payment
-// @Description  Create a new payment for buying or renewing a plan
-// @Tags         payment
-// @Accept       json
-// @Produce      json
-// @Param        request body CreatePaymentRequest true "Payment Info"
-// @Success      201  {object}  response.Response
-// @Failure      400  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /payments [post]
-// @Security     BearerAuth
-func (h *Handler) CreatePayment(c *gin.Context) {
-	var req CreatePaymentRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	planID := strings.TrimSpace(req.PlanID)
-	if planID == "" {
-		response.Error(c, http.StatusBadRequest, "Plan ID is required")
-		return
-	}
-	if !isAllowedTermMonths(req.TermMonths) {
-		response.Error(c, http.StatusBadRequest, "Term months must be one of 1, 3, 6, or 12")
-		return
-	}
-
-	paymentMethod := normalizePaymentMethod(req.PaymentMethod)
-	if paymentMethod == "" {
-		response.Error(c, http.StatusBadRequest, "Payment method must be wallet or topup")
-		return
-	}
-
-	ctx := c.Request.Context()
-	var planRecord model.Plan
-	if err := h.db.WithContext(ctx).Where("id = ?", planID).First(&planRecord).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusNotFound, "Plan not found")
-			return
-		}
-		h.logger.Error("Failed to load plan", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to create payment")
-		return
-	}
-
-	if planRecord.IsActive == nil || !*planRecord.IsActive {
-		response.Error(c, http.StatusBadRequest, "Plan is not active")
-		return
-	}
-
-	totalAmount := planRecord.Price * float64(req.TermMonths)
-	if totalAmount < 0 {
-		response.Error(c, http.StatusBadRequest, "Amount must be greater than or equal to 0")
-		return
-	}
-
-	status := "SUCCESS"
-	provider := "INTERNAL"
-	currency := normalizeCurrency(nil)
-	transactionID := buildTransactionID("sub")
-	now := time.Now().UTC()
-
-	payment := &model.Payment{
-		ID:            uuid.New().String(),
-		UserID:        userID,
-		PlanID:        &planRecord.ID,
-		Amount:        totalAmount,
-		Currency:      &currency,
-		Status:        &status,
-		Provider:      &provider,
-		TransactionID: &transactionID,
-	}
-
-	invoiceID := buildInvoiceID(payment.ID)
-	var subscription *model.PlanSubscription
-	var walletBalance float64
-
-	err := h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if _, err := lockUserForUpdate(ctx, tx, userID); err != nil {
-			return err
-		}
-
-		currentSubscription, err := model.GetLatestPlanSubscription(ctx, tx, userID)
-		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-			return err
-		}
-
-		baseExpiry := now
-		if currentSubscription != nil && currentSubscription.ExpiresAt.After(baseExpiry) {
-			baseExpiry = currentSubscription.ExpiresAt.UTC()
-		}
-		newExpiry := baseExpiry.AddDate(0, int(req.TermMonths), 0)
-
-		currentWalletBalance, err := model.GetWalletBalance(ctx, tx, userID)
-		if err != nil {
-			return err
-		}
-		shortfall := maxFloat(totalAmount-currentWalletBalance, 0)
-
-		if paymentMethod == paymentMethodWallet && shortfall > 0 {
-			return &paymentError{
-				Code:    http.StatusBadRequest,
-				Message: "Insufficient wallet balance",
-				Data: gin.H{
-					"payment_method": paymentMethod,
-					"wallet_balance": currentWalletBalance,
-					"total_amount":   totalAmount,
-					"shortfall":      shortfall,
-				},
-			}
-		}
-
-		topupAmount := 0.0
-		if paymentMethod == paymentMethodTopup {
-			if req.TopupAmount == nil {
-				return &paymentError{
-					Code:    http.StatusBadRequest,
-					Message: "Top-up amount is required when payment method is topup",
-					Data: gin.H{
-						"payment_method": paymentMethod,
-						"wallet_balance": currentWalletBalance,
-						"total_amount":   totalAmount,
-						"shortfall":      shortfall,
-					},
-				}
-			}
-
-			topupAmount = maxFloat(*req.TopupAmount, 0)
-			if topupAmount <= 0 {
-				return &paymentError{
-					Code:    http.StatusBadRequest,
-					Message: "Top-up amount must be greater than 0",
-					Data: gin.H{
-						"payment_method": paymentMethod,
-						"wallet_balance": currentWalletBalance,
-						"total_amount":   totalAmount,
-						"shortfall":      shortfall,
-					},
-				}
-			}
-			if topupAmount < shortfall {
-				return &paymentError{
-					Code:    http.StatusBadRequest,
-					Message: "Top-up amount must be greater than or equal to the required shortfall",
-					Data: gin.H{
-						"payment_method": paymentMethod,
-						"wallet_balance": currentWalletBalance,
-						"total_amount":   totalAmount,
-						"shortfall":      shortfall,
-						"topup_amount":   topupAmount,
-					},
-				}
-			}
-		}
-
-		if err := tx.Create(payment).Error; err != nil {
-			return err
-		}
-
-		walletUsedAmount := totalAmount
-
-		if paymentMethod == paymentMethodTopup {
-			topupTransaction := &model.WalletTransaction{
-				ID:         uuid.New().String(),
-				UserID:     userID,
-				Type:       walletTransactionTypeTopup,
-				Amount:     topupAmount,
-				Currency:   model.StringPtr(currency),
-				Note:       model.StringPtr(fmt.Sprintf("Wallet top-up for %s (%d months)", planRecord.Name, req.TermMonths)),
-				PaymentID:  &payment.ID,
-				PlanID:     &planRecord.ID,
-				TermMonths: &req.TermMonths,
-			}
-			if err := tx.Create(topupTransaction).Error; err != nil {
-				return err
-			}
-		}
-
-		debitTransaction := &model.WalletTransaction{
-			ID:         uuid.New().String(),
-			UserID:     userID,
-			Type:       walletTransactionTypeSubscriptionDebit,
-			Amount:     -totalAmount,
-			Currency:   model.StringPtr(currency),
-			Note:       model.StringPtr(fmt.Sprintf("Subscription payment for %s (%d months)", planRecord.Name, req.TermMonths)),
-			PaymentID:  &payment.ID,
-			PlanID:     &planRecord.ID,
-			TermMonths: &req.TermMonths,
-		}
-		if err := tx.Create(debitTransaction).Error; err != nil {
-			return err
-		}
-
-		subscription = &model.PlanSubscription{
-			ID:            uuid.New().String(),
-			UserID:        userID,
-			PaymentID:     payment.ID,
-			PlanID:        planRecord.ID,
-			TermMonths:    req.TermMonths,
-			PaymentMethod: paymentMethod,
-			WalletAmount:  walletUsedAmount,
-			TopupAmount:   topupAmount,
-			StartedAt:     now,
-			ExpiresAt:     newExpiry,
-		}
-		if err := tx.Create(subscription).Error; err != nil {
-			return err
-		}
-
-		if err := tx.Model(&model.User{}).
-			Where("id = ?", userID).
-			Update("plan_id", planRecord.ID).Error; err != nil {
-			return err
-		}
-
-		notification := buildSubscriptionNotification(userID, payment.ID, invoiceID, &planRecord, subscription)
-		if err := tx.Create(notification).Error; err != nil {
-			return err
-		}
-
-		walletBalance, err = model.GetWalletBalance(ctx, tx, userID)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-	if err != nil {
-		var paymentErr *paymentError
-		if errors.As(err, &paymentErr) {
-			c.AbortWithStatusJSON(paymentErr.Code, response.Response{
-				Code:    paymentErr.Code,
-				Message: paymentErr.Message,
-				Data:    paymentErr.Data,
-			})
-			return
-		}
-
-		h.logger.Error("Failed to create payment", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to create payment")
-		return
-	}
-
-	response.Created(c, gin.H{
-		"payment":        payment,
-		"subscription":   subscription,
-		"wallet_balance": walletBalance,
-		"invoice_id":     invoiceID,
-		"message":        "Payment completed successfully",
-	})
-}
-
-// @Summary      List Payment History
-// @Description  Get payment history for the current user
-// @Tags         payment
-// @Produce      json
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /payments/history [get]
-// @Security     BearerAuth
-func (h *Handler) ListPaymentHistory(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	var rows []paymentRow
-	if err := h.db.WithContext(c.Request.Context()).
-		Table("payment AS p").
-		Select("p.id, p.amount, p.currency, p.status, p.plan_id, pl.name AS plan_name, ps.term_months, ps.payment_method, ps.expires_at, p.created_at").
-		Joins("LEFT JOIN plan AS pl ON pl.id = p.plan_id").
-		Joins("LEFT JOIN plan_subscriptions AS ps ON ps.payment_id = p.id").
-		Where("p.user_id = ?", userID).
-		Order("p.created_at DESC").
-		Scan(&rows).Error; err != nil {
-		h.logger.Error("Failed to fetch payment history", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to fetch payment history")
-		return
-	}
-
-	items := make([]PaymentHistoryItem, 0, len(rows))
-	for _, row := range rows {
-		items = append(items, PaymentHistoryItem{
-			ID:            row.ID,
-			Amount:        row.Amount,
-			Currency:      normalizeCurrency(row.Currency),
-			Status:        normalizePaymentStatus(row.Status),
-			PlanID:        row.PlanID,
-			PlanName:      row.PlanName,
-			InvoiceID:     buildInvoiceID(row.ID),
-			Kind:          paymentKindSubscription,
-			TermMonths:    row.TermMonths,
-			PaymentMethod: normalizeOptionalPaymentMethod(row.PaymentMethod),
-			ExpiresAt:     row.ExpiresAt,
-			CreatedAt:     row.CreatedAt,
-		})
-	}
-
-	var topups []model.WalletTransaction
-	if err := h.db.WithContext(c.Request.Context()).
-		Where("user_id = ? AND type = ? AND payment_id IS NULL", userID, walletTransactionTypeTopup).
-		Order("created_at DESC").
-		Find(&topups).Error; err != nil {
-		h.logger.Error("Failed to fetch wallet topups", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to fetch payment history")
-		return
-	}
-
-	for _, topup := range topups {
-		createdAt := topup.CreatedAt
-		items = append(items, PaymentHistoryItem{
-			ID:        topup.ID,
-			Amount:    topup.Amount,
-			Currency:  normalizeCurrency(topup.Currency),
-			Status:    "success",
-			InvoiceID: buildInvoiceID(topup.ID),
-			Kind:      paymentKindWalletTopup,
-			CreatedAt: createdAt,
-		})
-	}
-
-	sortPaymentHistory(items)
-	response.Success(c, gin.H{"payments": items})
-}
-
-// @Summary      Top Up Wallet
-// @Description  Add funds to wallet balance for the current user
-// @Tags         payment
-// @Accept       json
-// @Produce      json
-// @Param        request body TopupWalletRequest true "Topup Info"
-// @Success      201  {object}  response.Response
-// @Failure      400  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /wallet/topups [post]
-// @Security     BearerAuth
-func (h *Handler) TopupWallet(c *gin.Context) {
-	var req TopupWalletRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	amount := req.Amount
-	if amount < 1 {
-		response.Error(c, http.StatusBadRequest, "Amount must be at least 1")
-		return
-	}
-
-	transaction := &model.WalletTransaction{
-		ID:       uuid.New().String(),
-		UserID:   userID,
-		Type:     walletTransactionTypeTopup,
-		Amount:   amount,
-		Currency: model.StringPtr("USD"),
-		Note:     model.StringPtr(fmt.Sprintf("Wallet top-up of %.2f USD", amount)),
-	}
-
-	notification := &model.Notification{
-		ID:      uuid.New().String(),
-		UserID:  userID,
-		Type:    "billing.topup",
-		Title:   "Wallet credited",
-		Message: fmt.Sprintf("Your wallet has been credited with %.2f USD.", amount),
-		Metadata: model.StringPtr(mustMarshalJSON(gin.H{
-			"wallet_transaction_id": transaction.ID,
-			"invoice_id":            buildInvoiceID(transaction.ID),
-		})),
-	}
-
-	if err := h.db.WithContext(c.Request.Context()).Transaction(func(tx *gorm.DB) error {
-		if _, err := lockUserForUpdate(c.Request.Context(), tx, userID); err != nil {
-			return err
-		}
-		if err := tx.Create(transaction).Error; err != nil {
-			return err
-		}
-		if err := tx.Create(notification).Error; err != nil {
-			return err
-		}
-		return nil
-	}); err != nil {
-		h.logger.Error("Failed to top up wallet", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to top up wallet")
-		return
-	}
-
-	balance, err := model.GetWalletBalance(c.Request.Context(), h.db, userID)
-	if err != nil {
-		h.logger.Error("Failed to calculate wallet balance", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to top up wallet")
-		return
-	}
-
-	response.Created(c, gin.H{
-		"wallet_transaction": transaction,
-		"wallet_balance":     balance,
-		"invoice_id":         buildInvoiceID(transaction.ID),
-	})
-}
-
-// @Summary      Download Invoice
-// @Description  Download invoice text for a payment or wallet top-up
-// @Tags         payment
-// @Produce      plain
-// @Param        id path string true "Payment ID"
-// @Success      200  {string}  string
-// @Failure      401  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /payments/{id}/invoice [get]
-// @Security     BearerAuth
-func (h *Handler) DownloadInvoice(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	id := strings.TrimSpace(c.Param("id"))
-	if id == "" {
-		response.Error(c, http.StatusNotFound, "Invoice not found")
-		return
-	}
-
-	ctx := c.Request.Context()
-	paymentRecord, err := query.Payment.WithContext(ctx).
-		Where(query.Payment.ID.Eq(id), query.Payment.UserID.Eq(userID)).
-		First()
-	if err == nil {
-		invoiceText, filename, buildErr := h.buildPaymentInvoice(ctx, paymentRecord)
-		if buildErr != nil {
-			h.logger.Error("Failed to build payment invoice", "error", buildErr)
-			response.Error(c, http.StatusInternalServerError, "Failed to download invoice")
-			return
-		}
-		serveInvoiceText(c, filename, invoiceText)
-		return
-	}
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		h.logger.Error("Failed to load payment invoice", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to download invoice")
-		return
-	}
-
-	var topup model.WalletTransaction
-	if err := h.db.WithContext(ctx).
-		Where("id = ? AND user_id = ? AND type = ? AND payment_id IS NULL", id, userID, walletTransactionTypeTopup).
-		First(&topup).Error; err == nil {
-		invoiceText := buildTopupInvoice(&topup)
-		serveInvoiceText(c, buildInvoiceFilename(topup.ID), invoiceText)
-		return
-	} else if !errors.Is(err, gorm.ErrRecordNotFound) {
-		h.logger.Error("Failed to load topup invoice", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to download invoice")
-		return
-	}
-
-	response.Error(c, http.StatusNotFound, "Invoice not found")
-}
-
-func normalizePaymentStatus(status *string) string {
-	value := strings.ToLower(strings.TrimSpace(stringValue(status)))
-	switch value {
-	case "success", "succeeded", "paid":
-		return "success"
-	case "failed", "error", "canceled", "cancelled":
-		return "failed"
-	case "pending", "processing":
-		return "pending"
-	default:
-		if value == "" {
-			return "success"
-		}
-		return value
-	}
-}
-
-func normalizeCurrency(currency *string) string {
-	value := strings.ToUpper(strings.TrimSpace(stringValue(currency)))
-	if value == "" {
-		return "USD"
-	}
-	return value
-}
-
-func normalizePaymentMethod(value string) string {
-	switch strings.ToLower(strings.TrimSpace(value)) {
-	case paymentMethodWallet:
-		return paymentMethodWallet
-	case paymentMethodTopup:
-		return paymentMethodTopup
-	default:
-		return ""
-	}
-}
-
-func normalizeOptionalPaymentMethod(value *string) *string {
-	normalized := normalizePaymentMethod(stringValue(value))
-	if normalized == "" {
-		return nil
-	}
-	return &normalized
-}
-
-func buildInvoiceID(id string) string {
-	trimmed := strings.ReplaceAll(strings.TrimSpace(id), "-", "")
-	if len(trimmed) > 12 {
-		trimmed = trimmed[:12]
-	}
-	return "INV-" + strings.ToUpper(trimmed)
-}
-
-func buildTransactionID(prefix string) string {
-	return fmt.Sprintf("%s_%d", prefix, time.Now().UnixNano())
-}
-
-func buildInvoiceFilename(id string) string {
-	return fmt.Sprintf("invoice-%s.txt", id)
-}
-
-func stringValue(value *string) string {
-	if value == nil {
-		return ""
-	}
-	return *value
-}
-
-func sortPaymentHistory(items []PaymentHistoryItem) {
-	for i := 0; i < len(items); i++ {
-		for j := i + 1; j < len(items); j++ {
-			left := time.Time{}
-			right := time.Time{}
-			if items[i].CreatedAt != nil {
-				left = *items[i].CreatedAt
-			}
-			if items[j].CreatedAt != nil {
-				right = *items[j].CreatedAt
-			}
-			if right.After(left) {
-				items[i], items[j] = items[j], items[i]
-			}
-		}
-	}
-}
-
-func serveInvoiceText(c *gin.Context, filename string, content string) {
-	c.Header("Content-Type", "text/plain; charset=utf-8")
-	c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=%q", filename))
-	c.String(http.StatusOK, content)
-}
-
-func (h *Handler) buildPaymentInvoice(ctx context.Context, paymentRecord *model.Payment) (string, string, error) {
-	details, err := h.loadPaymentInvoiceDetails(ctx, paymentRecord)
-	if err != nil {
-		return "", "", err
-	}
-
-	createdAt := formatOptionalTimestamp(paymentRecord.CreatedAt)
-	lines := []string{
-		"Stream API Invoice",
-		fmt.Sprintf("Invoice ID: %s", buildInvoiceID(paymentRecord.ID)),
-		fmt.Sprintf("Payment ID: %s", paymentRecord.ID),
-		fmt.Sprintf("User ID: %s", paymentRecord.UserID),
-		fmt.Sprintf("Plan: %s", details.PlanName),
-		fmt.Sprintf("Amount: %.2f %s", paymentRecord.Amount, normalizeCurrency(paymentRecord.Currency)),
-		fmt.Sprintf("Status: %s", strings.ToUpper(normalizePaymentStatus(paymentRecord.Status))),
-		fmt.Sprintf("Provider: %s", strings.ToUpper(stringValue(paymentRecord.Provider))),
-		fmt.Sprintf("Payment Method: %s", strings.ToUpper(details.PaymentMethod)),
-		fmt.Sprintf("Transaction ID: %s", stringValue(paymentRecord.TransactionID)),
-	}
-
-	if details.TermMonths != nil {
-		lines = append(lines, fmt.Sprintf("Term: %d month(s)", *details.TermMonths))
-	}
-	if details.ExpiresAt != nil {
-		lines = append(lines, fmt.Sprintf("Valid Until: %s", details.ExpiresAt.UTC().Format(time.RFC3339)))
-	}
-	if details.WalletAmount > 0 {
-		lines = append(lines, fmt.Sprintf("Wallet Applied: %.2f %s", details.WalletAmount, normalizeCurrency(paymentRecord.Currency)))
-	}
-	if details.TopupAmount > 0 {
-		lines = append(lines, fmt.Sprintf("Top-up Added: %.2f %s", details.TopupAmount, normalizeCurrency(paymentRecord.Currency)))
-	}
-	lines = append(lines, fmt.Sprintf("Created At: %s", createdAt))
-
-	return strings.Join(lines, "\n"), buildInvoiceFilename(paymentRecord.ID), nil
-}
-
-func buildTopupInvoice(transaction *model.WalletTransaction) string {
-	createdAt := formatOptionalTimestamp(transaction.CreatedAt)
-	return strings.Join([]string{
-		"Stream API Wallet Top-up Invoice",
-		fmt.Sprintf("Invoice ID: %s", buildInvoiceID(transaction.ID)),
-		fmt.Sprintf("Wallet Transaction ID: %s", transaction.ID),
-		fmt.Sprintf("User ID: %s", transaction.UserID),
-		fmt.Sprintf("Amount: %.2f %s", transaction.Amount, normalizeCurrency(transaction.Currency)),
-		"Status: SUCCESS",
-		fmt.Sprintf("Type: %s", strings.ToUpper(transaction.Type)),
-		fmt.Sprintf("Note: %s", model.StringValue(transaction.Note)),
-		fmt.Sprintf("Created At: %s", createdAt),
-	}, "\n")
-}
-
-func (h *Handler) loadPaymentInvoiceDetails(ctx context.Context, paymentRecord *model.Payment) (*paymentInvoiceDetails, error) {
-	details := &paymentInvoiceDetails{
-		PlanName:      "Unknown plan",
-		PaymentMethod: paymentMethodWallet,
-	}
-
-	if paymentRecord.PlanID != nil && strings.TrimSpace(*paymentRecord.PlanID) != "" {
-		var planRecord model.Plan
-		if err := h.db.WithContext(ctx).Where("id = ?", *paymentRecord.PlanID).First(&planRecord).Error; err != nil {
-			if !errors.Is(err, gorm.ErrRecordNotFound) {
-				return nil, err
-			}
-		} else {
-			details.PlanName = planRecord.Name
-		}
-	}
-
-	var subscription model.PlanSubscription
-	if err := h.db.WithContext(ctx).
-		Where("payment_id = ?", paymentRecord.ID).
-		Order("created_at DESC").
-		First(&subscription).Error; err != nil {
-		if !errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, err
-		}
-		return details, nil
-	}
-
-	details.TermMonths = &subscription.TermMonths
-	details.PaymentMethod = normalizePaymentMethod(subscription.PaymentMethod)
-	if details.PaymentMethod == "" {
-		details.PaymentMethod = paymentMethodWallet
-	}
-	details.ExpiresAt = &subscription.ExpiresAt
-	details.WalletAmount = subscription.WalletAmount
-	details.TopupAmount = subscription.TopupAmount
-
-	return details, nil
-}
-
-func buildSubscriptionNotification(userID string, paymentID string, invoiceID string, planRecord *model.Plan, subscription *model.PlanSubscription) *model.Notification {
-	return &model.Notification{
-		ID:      uuid.New().String(),
-		UserID:  userID,
-		Type:    "billing.subscription",
-		Title:   "Subscription activated",
-		Message: fmt.Sprintf("Your subscription to %s is active until %s.", planRecord.Name, subscription.ExpiresAt.UTC().Format("2006-01-02")),
-		Metadata: model.StringPtr(mustMarshalJSON(gin.H{
-			"payment_id":      paymentID,
-			"invoice_id":      invoiceID,
-			"plan_id":         planRecord.ID,
-			"term_months":     subscription.TermMonths,
-			"payment_method":  subscription.PaymentMethod,
-			"wallet_amount":   subscription.WalletAmount,
-			"topup_amount":    subscription.TopupAmount,
-			"plan_expires_at": subscription.ExpiresAt.UTC().Format(time.RFC3339),
-		})),
-	}
-}
-
-func isAllowedTermMonths(value int32) bool {
-	_, ok := allowedTermMonths[value]
-	return ok
-}
-
-func lockUserForUpdate(ctx context.Context, tx *gorm.DB, userID string) (*model.User, error) {
-	var user model.User
-	if err := tx.WithContext(ctx).
-		Clauses(clause.Locking{Strength: "UPDATE"}).
-		Where("id = ?", userID).
-		First(&user).Error; err != nil {
-		return nil, err
-	}
-	return &user, nil
-}
-
-func maxFloat(left float64, right float64) float64 {
-	if left > right {
-		return left
-	}
-	return right
-}
-
-func formatOptionalTimestamp(value *time.Time) string {
-	if value == nil {
-		return ""
-	}
-	return value.UTC().Format(time.RFC3339)
-}
-
-func mustMarshalJSON(value interface{}) string {
-	encoded, err := json.Marshal(value)
-	if err != nil {
-		return "{}"
-	}
-	return string(encoded)
-}
diff --git a/internal/api/payment/http_types.go b/internal/api/payment/http_types.go
deleted file mode 100644
index 3c49f9d..0000000
--- a/internal/api/payment/http_types.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package payment
-
-type CreatePaymentRequest struct {
-	PlanID        string   `json:"plan_id" binding:"required"`
-	TermMonths    int32    `json:"term_months" binding:"required"`
-	PaymentMethod string   `json:"payment_method" binding:"required"`
-	TopupAmount   *float64 `json:"topup_amount,omitempty"`
-}
-
-type TopupWalletRequest struct {
-	Amount float64 `json:"amount" binding:"required"`
-}
diff --git a/internal/api/payment/interface.go b/internal/api/payment/interface.go
deleted file mode 100644
index 953f2d5..0000000
--- a/internal/api/payment/interface.go
+++ /dev/null
@@ -1,26 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package payment
-
-import "github.com/gin-gonic/gin"
-
-// PaymentHandler defines the interface for payment operations
-type PaymentHandler interface {
-	CreatePayment(c *gin.Context)
-	ListPaymentHistory(c *gin.Context)
-	TopupWallet(c *gin.Context)
-	DownloadInvoice(c *gin.Context)
-}
-
-// CreatePaymentRequest defines the payload for creating a payment
-type CreatePaymentRequest struct {
-	PlanID        string   `json:"plan_id" binding:"required"`
-	TermMonths    int32    `json:"term_months" binding:"required"`
-	PaymentMethod string   `json:"payment_method" binding:"required"`
-	TopupAmount   *float64 `json:"topup_amount,omitempty"`
-}
-
-type TopupWalletRequest struct {
-	Amount float64 `json:"amount" binding:"required"`
-}
diff --git a/internal/api/payment/types.go b/internal/api/payment/types.go
deleted file mode 100644
index 5f719c9..0000000
--- a/internal/api/payment/types.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package payment
-
-import "time"
-
-type PaymentHistoryItem struct {
-	ID            string     `json:"id"`
-	Amount        float64    `json:"amount"`
-	Currency      string     `json:"currency"`
-	Status        string     `json:"status"`
-	PlanID        *string    `json:"plan_id,omitempty"`
-	PlanName      *string    `json:"plan_name,omitempty"`
-	InvoiceID     string     `json:"invoice_id"`
-	Kind          string     `json:"kind"`
-	TermMonths    *int32     `json:"term_months,omitempty"`
-	PaymentMethod *string    `json:"payment_method,omitempty"`
-	ExpiresAt     *time.Time `json:"expires_at,omitempty"`
-	CreatedAt     *time.Time `json:"created_at,omitempty"`
-}
diff --git a/internal/api/plan/handler.go b/internal/api/plan/handler.go
deleted file mode 100644
index 671974a..0000000
--- a/internal/api/plan/handler.go
+++ /dev/null
@@ -1,48 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package plan
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	"gorm.io/gorm"
-	"stream.api/internal/config"
-	"stream.api/internal/database/model"
-	"stream.api/pkg/logger"
-	"stream.api/pkg/response"
-)
-
-type Handler struct {
-	logger logger.Logger
-	cfg    *config.Config
-	db     *gorm.DB
-}
-
-func NewHandler(l logger.Logger, cfg *config.Config, db *gorm.DB) PlanHandler {
-	return &Handler{
-		logger: l,
-		cfg:    cfg,
-		db:     db,
-	}
-}
-
-// @Summary      List Plans
-// @Description  Get all active plans
-// @Tags         plan
-// @Produce      json
-// @Success      200  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /plans [get]
-// @Security     BearerAuth
-func (h *Handler) ListPlans(c *gin.Context) {
-	var plans []model.Plan
-	if err := h.db.WithContext(c.Request.Context()).Where("is_active = ?", true).Find(&plans).Error; err != nil {
-		h.logger.Error("Failed to fetch plans", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to fetch plans")
-		return
-	}
-
-	response.Success(c, gin.H{"plans": plans})
-}
diff --git a/internal/api/plan/interface.go b/internal/api/plan/interface.go
deleted file mode 100644
index 7e7fc4f..0000000
--- a/internal/api/plan/interface.go
+++ /dev/null
@@ -1,11 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package plan
-
-import "github.com/gin-gonic/gin"
-
-// PlanHandler defines the interface for plan operations
-type PlanHandler interface {
-	ListPlans(c *gin.Context)
-}
diff --git a/internal/api/preferences/handler.go b/internal/api/preferences/handler.go
deleted file mode 100644
index b7edc5c..0000000
--- a/internal/api/preferences/handler.go
+++ /dev/null
@@ -1,112 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package preferences
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	"gorm.io/gorm"
-	"stream.api/pkg/logger"
-	"stream.api/pkg/response"
-)
-
-type Handler struct {
-	logger logger.Logger
-	db     *gorm.DB
-}
-
-type SettingsPreferencesRequest struct {
-	EmailNotifications     *bool   `json:"email_notifications"`
-	PushNotifications      *bool   `json:"push_notifications"`
-	MarketingNotifications *bool   `json:"marketing_notifications"`
-	TelegramNotifications  *bool   `json:"telegram_notifications"`
-	Autoplay               *bool   `json:"autoplay"`
-	Loop                   *bool   `json:"loop"`
-	Muted                  *bool   `json:"muted"`
-	ShowControls           *bool   `json:"show_controls"`
-	Pip                    *bool   `json:"pip"`
-	Airplay                *bool   `json:"airplay"`
-	Chromecast             *bool   `json:"chromecast"`
-	Language               *string `json:"language"`
-	Locale                 *string `json:"locale"`
-}
-
-func NewHandler(l logger.Logger, db *gorm.DB) *Handler {
-	return &Handler{logger: l, db: db}
-}
-
-// @Summary      Get Preferences
-// @Description  Get notification, player, and locale preferences for the current user
-// @Tags         settings
-// @Produce      json
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /settings/preferences [get]
-// @Security     BearerAuth
-func (h *Handler) GetPreferences(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	pref, err := LoadUserPreferences(c.Request.Context(), h.db, userID)
-	if err != nil {
-		h.logger.Error("Failed to load preferences", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to load preferences")
-		return
-	}
-
-	response.Success(c, gin.H{"preferences": pref})
-}
-
-// @Summary      Update Preferences
-// @Description  Update notification, player, and locale preferences for the current user
-// @Tags         settings
-// @Accept       json
-// @Produce      json
-// @Param        request body SettingsPreferencesRequest true "Preferences payload"
-// @Success      200  {object}  response.Response
-// @Failure      400  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /settings/preferences [put]
-// @Security     BearerAuth
-func (h *Handler) UpdatePreferences(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	var req SettingsPreferencesRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	pref, err := UpdateUserPreferences(c.Request.Context(), h.db, h.logger, userID, UpdateInput{
-		EmailNotifications:     req.EmailNotifications,
-		PushNotifications:      req.PushNotifications,
-		MarketingNotifications: req.MarketingNotifications,
-		TelegramNotifications:  req.TelegramNotifications,
-		Autoplay:               req.Autoplay,
-		Loop:                   req.Loop,
-		Muted:                  req.Muted,
-		ShowControls:           req.ShowControls,
-		Pip:                    req.Pip,
-		Airplay:                req.Airplay,
-		Chromecast:             req.Chromecast,
-		Language:               req.Language,
-		Locale:                 req.Locale,
-	})
-	if err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to save preferences")
-		return
-	}
-
-	response.Success(c, gin.H{"preferences": pref})
-}
diff --git a/internal/api/usage/handler.go b/internal/api/usage/handler.go
deleted file mode 100644
index 09186a4..0000000
--- a/internal/api/usage/handler.go
+++ /dev/null
@@ -1,63 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package usage
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	"gorm.io/gorm"
-	"stream.api/internal/database/model"
-	"stream.api/pkg/logger"
-	"stream.api/pkg/response"
-)
-
-type Handler struct {
-	logger logger.Logger
-	db     *gorm.DB
-}
-
-func NewHandler(l logger.Logger, db *gorm.DB) UsageHandler {
-	return &Handler{
-		logger: l,
-		db:     db,
-	}
-}
-
-// @Summary      Get Usage
-// @Description  Get the authenticated user's total video count and total storage usage
-// @Tags         usage
-// @Produce      json
-// @Success      200  {object}  response.Response{data=UsagePayload}
-// @Failure      401  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /usage [get]
-// @Security     BearerAuth
-func (h *Handler) GetUsage(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	user, ok := c.Get("user")
-	if !ok {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	currentUser, ok := user.(*model.User)
-	if !ok || currentUser == nil || currentUser.ID != userID {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	payload, err := LoadUsage(c.Request.Context(), h.db, h.logger, currentUser)
-	if err != nil {
-		response.Error(c, http.StatusInternalServerError, "Failed to load usage")
-		return
-	}
-
-	response.Success(c, payload)
-}
diff --git a/internal/api/usage/interface.go b/internal/api/usage/interface.go
deleted file mode 100644
index a060142..0000000
--- a/internal/api/usage/interface.go
+++ /dev/null
@@ -1,11 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package usage
-
-import "github.com/gin-gonic/gin"
-
-// UsageHandler defines the interface for usage operations
-type UsageHandler interface {
-	GetUsage(c *gin.Context)
-}
diff --git a/internal/api/usage/types.go b/internal/api/usage/types.go
deleted file mode 100644
index b5c2e2d..0000000
--- a/internal/api/usage/types.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package usage
-
-type UsagePayload struct {
-	UserID       string `json:"user_id"`
-	TotalVideos  int64  `json:"total_videos"`
-	TotalStorage int64  `json:"total_storage"`
-}
diff --git a/internal/api/video/handler.go b/internal/api/video/handler.go
deleted file mode 100644
index c8e98db..0000000
--- a/internal/api/video/handler.go
+++ /dev/null
@@ -1,583 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package video
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-	"stream.api/internal/config"
-	"stream.api/internal/database/model"
-	"stream.api/pkg/logger"
-	"stream.api/pkg/response"
-	"stream.api/pkg/storage"
-)
-
-type Handler struct {
-	logger  logger.Logger
-	cfg     *config.Config
-	db      *gorm.DB
-	storage storage.Provider
-}
-
-type videoError struct {
-	Code    int
-	Message string
-}
-
-func (e *videoError) Error() string { return e.Message }
-
-func NewHandler(l logger.Logger, cfg *config.Config, db *gorm.DB, s storage.Provider) VideoHandler {
-	return &Handler{
-		logger:  l,
-		cfg:     cfg,
-		db:      db,
-		storage: s,
-	}
-}
-
-// @Summary      Get Upload URL
-// @Description  Generate presigned URL for video upload
-// @Tags         video
-// @Accept       json
-// @Produce      json
-// @Param        request body UploadURLRequest true "File Info"
-// @Success      200  {object}  response.Response
-// @Failure      400  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /videos/upload-url [post]
-// @Security     BearerAuth
-func (h *Handler) GetUploadURL(c *gin.Context) {
-	var req UploadURLRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	userID := c.GetString("userID")
-	fileID := uuid.New().String()
-	key := fmt.Sprintf("videos/%s/%s-%s", userID, fileID, req.Filename)
-
-	url, err := h.storage.GeneratePresignedURL(key, 15*time.Minute)
-	if err != nil {
-		h.logger.Error("Failed to generate presigned URL", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Storage error")
-		return
-	}
-
-	response.Success(c, gin.H{
-		"upload_url": url,
-		"key":        key,
-		"file_id":    fileID,
-	})
-}
-
-// @Summary      Create Video
-// @Description  Create video record after upload
-// @Tags         video
-// @Accept       json
-// @Produce      json
-// @Param        request body CreateVideoRequest true "Video Info"
-// @Success      201  {object}  response.Response{data=model.Video}
-// @Failure      400  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /videos [post]
-// @Security     BearerAuth
-func (h *Handler) CreateVideo(c *gin.Context) {
-	var req CreateVideoRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	title := strings.TrimSpace(req.Title)
-	if title == "" {
-		response.Error(c, http.StatusBadRequest, "Title is required")
-		return
-	}
-
-	videoURL := strings.TrimSpace(req.URL)
-	if videoURL == "" {
-		response.Error(c, http.StatusBadRequest, "URL is required")
-		return
-	}
-
-	status := "ready"
-	processingStatus := "READY"
-	storageType := detectStorageType(videoURL)
-	description := strings.TrimSpace(req.Description)
-	format := strings.TrimSpace(req.Format)
-
-	video := &model.Video{
-		ID:               uuid.New().String(),
-		UserID:           userID,
-		Name:             title,
-		Title:            title,
-		Description:      stringPointer(description),
-		URL:              videoURL,
-		Size:             req.Size,
-		Duration:         req.Duration,
-		Format:           format,
-		Status:           &status,
-		ProcessingStatus: &processingStatus,
-		StorageType:      &storageType,
-	}
-
-	err := h.db.WithContext(c.Request.Context()).Transaction(func(tx *gorm.DB) error {
-		var defaultTemplate model.AdTemplate
-		hasDefaultTemplate := false
-
-		if err := tx.Where("user_id = ? AND is_default = ? AND is_active = ?", userID, true, true).
-			Order("updated_at DESC").
-			First(&defaultTemplate).Error; err != nil {
-			if !errors.Is(err, gorm.ErrRecordNotFound) {
-				return err
-			}
-		} else {
-			hasDefaultTemplate = true
-		}
-
-		if err := tx.Create(video).Error; err != nil {
-			return err
-		}
-
-		if err := tx.Model(&model.User{}).
-			Where("id = ?", userID).
-			UpdateColumn("storage_used", gorm.Expr("storage_used + ?", video.Size)).Error; err != nil {
-			return err
-		}
-
-		if hasDefaultTemplate {
-			videoAdConfig := &model.VideoAdConfig{
-				VideoID:      video.ID,
-				UserID:       userID,
-				AdTemplateID: defaultTemplate.ID,
-				VastTagURL:   defaultTemplate.VastTagURL,
-				AdFormat:     defaultTemplate.AdFormat,
-				Duration:     defaultTemplate.Duration,
-			}
-
-			if err := tx.Create(videoAdConfig).Error; err != nil {
-				return err
-			}
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		h.logger.Error("Failed to create video record", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to create video")
-		return
-	}
-
-	response.Created(c, gin.H{"video": video})
-}
-
-// @Summary      List Videos
-// @Description  Get paginated videos
-// @Tags         video
-// @Produce      json
-// @Param        page query int false "Page number" default(1)
-// @Param        limit query int false "Page size" default(10)
-// @Success      200  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /videos [get]
-// @Security     BearerAuth
-func (h *Handler) ListVideos(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
-	if page < 1 {
-		page = 1
-	}
-	limit, _ := strconv.Atoi(c.DefaultQuery("limit", "10"))
-	if limit <= 0 {
-		limit = 10
-	}
-	if limit > 100 {
-		limit = 100
-	}
-	offset := (page - 1) * limit
-
-	search := strings.TrimSpace(c.Query("search"))
-	status := strings.TrimSpace(c.Query("status"))
-
-	db := h.db.WithContext(c.Request.Context()).Model(&model.Video{}).Where("user_id = ?", userID)
-	if search != "" {
-		like := "%" + search + "%"
-		db = db.Where("title ILIKE ? OR description ILIKE ?", like, like)
-	}
-	if status != "" && !strings.EqualFold(status, "all") {
-		db = db.Where("status = ?", normalizeVideoStatus(status))
-	}
-
-	var total int64
-	if err := db.Count(&total).Error; err != nil {
-		h.logger.Error("Failed to count videos", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to fetch videos")
-		return
-	}
-
-	var videos []*model.Video
-	if err := db.Order("created_at DESC").Offset(offset).Limit(limit).Find(&videos).Error; err != nil {
-		h.logger.Error("Failed to fetch videos", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to fetch videos")
-		return
-	}
-
-	response.Success(c, gin.H{
-		"videos": videos,
-		"total":  total,
-		"page":   page,
-		"limit":  limit,
-	})
-}
-
-// @Summary      Get Video
-// @Description  Get video details by ID
-// @Tags         video
-// @Produce      json
-// @Param        id path string true "Video ID"
-// @Success      200  {object}  response.Response{data=model.Video}
-// @Failure      404  {object}  response.Response
-// @Router       /videos/{id} [get]
-// @Security     BearerAuth
-func (h *Handler) GetVideo(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	id := c.Param("id")
-
-	h.db.WithContext(c.Request.Context()).Model(&model.Video{}).
-		Where("id = ? AND user_id = ?", id, userID).
-		UpdateColumn("views", gorm.Expr("views + ?", 1))
-
-	var video model.Video
-	if err := h.db.WithContext(c.Request.Context()).Where("id = ? AND user_id = ?", id, userID).First(&video).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			response.Error(c, http.StatusNotFound, "Video not found")
-			return
-		}
-		h.logger.Error("Failed to fetch video", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to fetch video")
-		return
-	}
-
-	result := gin.H{"video": &video}
-
-	var adConfig model.VideoAdConfig
-	if err := h.db.WithContext(c.Request.Context()).
-		Where("video_id = ? AND user_id = ?", id, userID).
-		First(&adConfig).Error; err == nil {
-		adPayload := VideoAdConfigPayload{
-			AdTemplateID: adConfig.AdTemplateID,
-			VASTTagURL:   adConfig.VastTagURL,
-			AdFormat:     model.StringValue(adConfig.AdFormat),
-			Duration:     int64PtrToIntPtr(adConfig.Duration),
-		}
-
-		var template model.AdTemplate
-		if err := h.db.WithContext(c.Request.Context()).
-			Where("id = ? AND user_id = ?", adConfig.AdTemplateID, userID).
-			First(&template).Error; err == nil {
-			adPayload.TemplateName = template.Name
-		}
-
-		result["ad_config"] = adPayload
-	}
-
-	response.Success(c, result)
-}
-
-// @Summary      Update Video
-// @Description  Update title and description for a video owned by the current user
-// @Tags         video
-// @Accept       json
-// @Produce      json
-// @Param        id path string true "Video ID"
-// @Param        request body UpdateVideoRequest true "Video payload"
-// @Success      200  {object}  response.Response
-// @Failure      400  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /videos/{id} [put]
-// @Security     BearerAuth
-func (h *Handler) UpdateVideo(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	id := c.Param("id")
-	var req UpdateVideoRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		response.Error(c, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	title := strings.TrimSpace(req.Title)
-	if title == "" {
-		response.Error(c, http.StatusBadRequest, "Title is required")
-		return
-	}
-	description := strings.TrimSpace(req.Description)
-	ctx := c.Request.Context()
-
-	err := h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		result := tx.Model(&model.Video{}).
-			Where("id = ? AND user_id = ?", id, userID).
-			Updates(map[string]interface{}{
-				"name":        title,
-				"title":       title,
-				"description": stringPointer(description),
-			})
-		if result.Error != nil {
-			return result.Error
-		}
-		if result.RowsAffected == 0 {
-			return gorm.ErrRecordNotFound
-		}
-
-		if req.AdTemplateID != nil {
-			templateID := strings.TrimSpace(*req.AdTemplateID)
-
-			if templateID == "" {
-				tx.Where("video_id = ? AND user_id = ?", id, userID).Delete(&model.VideoAdConfig{})
-			} else {
-				var template model.AdTemplate
-				if err := tx.Where("id = ? AND user_id = ?", templateID, userID).
-					First(&template).Error; err != nil {
-					if errors.Is(err, gorm.ErrRecordNotFound) {
-						return &videoError{Code: http.StatusBadRequest, Message: "Ad template not found"}
-					}
-					return err
-				}
-
-				var existing model.VideoAdConfig
-				if err := tx.Where("video_id = ? AND user_id = ?", id, userID).
-					First(&existing).Error; err != nil {
-					if errors.Is(err, gorm.ErrRecordNotFound) {
-						newConfig := &model.VideoAdConfig{
-							VideoID:      id,
-							UserID:       userID,
-							AdTemplateID: template.ID,
-							VastTagURL:   template.VastTagURL,
-							AdFormat:     template.AdFormat,
-							Duration:     template.Duration,
-						}
-						return tx.Create(newConfig).Error
-					}
-					return err
-				}
-
-				existing.AdTemplateID = template.ID
-				existing.VastTagURL = template.VastTagURL
-				existing.AdFormat = template.AdFormat
-				existing.Duration = template.Duration
-				return tx.Save(&existing).Error
-			}
-		}
-
-		return nil
-	})
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			response.Error(c, http.StatusNotFound, "Video not found")
-			return
-		}
-		var ve *videoError
-		if errors.As(err, &ve) {
-			response.Error(c, ve.Code, ve.Message)
-			return
-		}
-		h.logger.Error("Failed to update video", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to update video")
-		return
-	}
-
-	var video model.Video
-	if err := h.db.WithContext(ctx).Where("id = ? AND user_id = ?", id, userID).First(&video).Error; err != nil {
-		h.logger.Error("Failed to reload video", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to update video")
-		return
-	}
-
-	resp := gin.H{"video": &video}
-
-	var adConfig model.VideoAdConfig
-	if err := h.db.WithContext(ctx).
-		Where("video_id = ? AND user_id = ?", id, userID).
-		First(&adConfig).Error; err == nil {
-		adPayload := VideoAdConfigPayload{
-			AdTemplateID: adConfig.AdTemplateID,
-			VASTTagURL:   adConfig.VastTagURL,
-			AdFormat:     model.StringValue(adConfig.AdFormat),
-			Duration:     int64PtrToIntPtr(adConfig.Duration),
-		}
-
-		var template model.AdTemplate
-		if err := h.db.WithContext(ctx).
-			Where("id = ? AND user_id = ?", adConfig.AdTemplateID, userID).
-			First(&template).Error; err == nil {
-			adPayload.TemplateName = template.Name
-		}
-
-		resp["ad_config"] = adPayload
-	}
-
-	response.Success(c, resp)
-}
-
-// @Summary      Delete Video
-// @Description  Delete a video owned by the current user
-// @Tags         video
-// @Produce      json
-// @Param        id path string true "Video ID"
-// @Success      200  {object}  response.Response
-// @Failure      401  {object}  response.Response
-// @Failure      404  {object}  response.Response
-// @Failure      500  {object}  response.Response
-// @Router       /videos/{id} [delete]
-// @Security     BearerAuth
-func (h *Handler) DeleteVideo(c *gin.Context) {
-	userID := c.GetString("userID")
-	if userID == "" {
-		response.Error(c, http.StatusUnauthorized, "Unauthorized")
-		return
-	}
-
-	id := c.Param("id")
-	var video model.Video
-	if err := h.db.WithContext(c.Request.Context()).Where("id = ? AND user_id = ?", id, userID).First(&video).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			response.Error(c, http.StatusNotFound, "Video not found")
-			return
-		}
-		h.logger.Error("Failed to load video for deletion", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to delete video")
-		return
-	}
-
-	if h.storage != nil && shouldDeleteStoredObject(video.URL) {
-		if err := h.storage.Delete(video.URL); err != nil {
-			parsedKey := extractObjectKey(video.URL)
-			if parsedKey != "" && parsedKey != video.URL {
-				if deleteErr := h.storage.Delete(parsedKey); deleteErr != nil {
-					h.logger.Error("Failed to delete video object", "error", deleteErr, "video_id", video.ID)
-					response.Error(c, http.StatusInternalServerError, "Failed to delete video")
-					return
-				}
-			} else {
-				h.logger.Error("Failed to delete video object", "error", err, "video_id", video.ID)
-				response.Error(c, http.StatusInternalServerError, "Failed to delete video")
-				return
-			}
-		}
-	}
-
-	if err := h.db.WithContext(c.Request.Context()).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Where("video_id = ? AND user_id = ?", video.ID, userID).Delete(&model.VideoAdConfig{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Where("id = ? AND user_id = ?", video.ID, userID).Delete(&model.Video{}).Error; err != nil {
-			return err
-		}
-		if err := tx.Model(&model.User{}).
-			Where("id = ?", userID).
-			UpdateColumn("storage_used", gorm.Expr("storage_used - ?", video.Size)).Error; err != nil {
-			return err
-		}
-		return nil
-	}); err != nil {
-		h.logger.Error("Failed to delete video record", "error", err)
-		response.Error(c, http.StatusInternalServerError, "Failed to delete video")
-		return
-	}
-
-	response.Success(c, gin.H{"message": "Video deleted successfully"})
-}
-
-func normalizeVideoStatus(value string) string {
-	switch strings.ToLower(strings.TrimSpace(value)) {
-	case "processing", "pending":
-		return "processing"
-	case "failed", "error":
-		return "failed"
-	default:
-		return "ready"
-	}
-}
-
-func detectStorageType(rawURL string) string {
-	if shouldDeleteStoredObject(rawURL) {
-		return "S3"
-	}
-	return "WORKER"
-}
-
-func shouldDeleteStoredObject(rawURL string) bool {
-	trimmed := strings.TrimSpace(rawURL)
-	if trimmed == "" {
-		return false
-	}
-	parsed, err := url.Parse(trimmed)
-	if err != nil {
-		return !strings.HasPrefix(trimmed, "/")
-	}
-	return parsed.Scheme == "" && parsed.Host == "" && !strings.HasPrefix(trimmed, "/")
-}
-
-func extractObjectKey(rawURL string) string {
-	trimmed := strings.TrimSpace(rawURL)
-	if trimmed == "" {
-		return ""
-	}
-	parsed, err := url.Parse(trimmed)
-	if err != nil {
-		return trimmed
-	}
-	if parsed.Scheme == "" && parsed.Host == "" {
-		return strings.TrimPrefix(parsed.Path, "/")
-	}
-	return strings.TrimPrefix(parsed.Path, "/")
-}
-
-func stringPointer(value string) *string {
-	if value == "" {
-		return nil
-	}
-	return &value
-}
-
-func int64PtrToIntPtr(value *int64) *int {
-	if value == nil {
-		return nil
-	}
-	converted := int(*value)
-	return &converted
-}
diff --git a/internal/api/video/interface.go b/internal/api/video/interface.go
deleted file mode 100644
index 4de5f16..0000000
--- a/internal/api/video/interface.go
+++ /dev/null
@@ -1,47 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package video
-
-import "github.com/gin-gonic/gin"
-
-// VideoHandler defines the interface for video operations
-type VideoHandler interface {
-	GetUploadURL(c *gin.Context)
-	CreateVideo(c *gin.Context)
-	ListVideos(c *gin.Context)
-	GetVideo(c *gin.Context)
-	UpdateVideo(c *gin.Context)
-	DeleteVideo(c *gin.Context)
-}
-
-// UploadURLRequest defines the payload for requesting an upload URL
-type UploadURLRequest struct {
-	Filename    string `json:"filename" binding:"required"`
-	ContentType string `json:"content_type" binding:"required"`
-	Size        int64  `json:"size" binding:"required"`
-}
-
-// CreateVideoRequest defines the payload for creating a video metadata record
-type CreateVideoRequest struct {
-	Title       string `json:"title" binding:"required"`
-	Description string `json:"description"`
-	URL         string `json:"url" binding:"required"` // The S3 Key or Full URL
-	Size        int64  `json:"size" binding:"required"`
-	Duration    int32  `json:"duration"` // Maybe client knows, or we process later
-	Format      string `json:"format"`
-}
-
-type UpdateVideoRequest struct {
-	Title        string  `json:"title" binding:"required"`
-	Description  string  `json:"description"`
-	AdTemplateID *string `json:"ad_template_id,omitempty"`
-}
-
-type VideoAdConfigPayload struct {
-	AdTemplateID string `json:"ad_template_id"`
-	TemplateName string `json:"template_name,omitempty"`
-	VASTTagURL   string `json:"vast_tag_url,omitempty"`
-	AdFormat     string `json:"ad_format,omitempty"`
-	Duration     *int   `json:"duration,omitempty"`
-}
diff --git a/internal/app/app.go b/internal/app/app.go
deleted file mode 100644
index 3bb22ab..0000000
--- a/internal/app/app.go
+++ /dev/null
@@ -1,219 +0,0 @@
-//go:build ignore
-// +build ignore
-
-package app
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/gin-contrib/cors"
-	"github.com/gin-gonic/gin"
-	"gorm.io/gorm"
-	"stream.api/internal/api/admin"
-	"stream.api/internal/api/adtemplates"
-	"stream.api/internal/api/auth"
-	"stream.api/internal/api/domains"
-	"stream.api/internal/api/notifications"
-	"stream.api/internal/api/payment"
-	"stream.api/internal/api/plan"
-	"stream.api/internal/api/preferences"
-	"stream.api/internal/api/usage"
-	"stream.api/internal/api/video"
-	"stream.api/internal/config"
-	"stream.api/internal/middleware"
-	videoruntime "stream.api/internal/video/runtime"
-	"stream.api/pkg/cache"
-	"stream.api/pkg/logger"
-	"stream.api/pkg/storage"
-	"stream.api/pkg/token"
-
-	swaggerFiles "github.com/swaggo/files"
-	ginSwagger "github.com/swaggo/gin-swagger"
-)
-
-func SetupRouter(cfg *config.Config, db *gorm.DB, c cache.Cache, t token.Provider, l logger.Logger) (*gin.Engine, *videoruntime.Module, error) {
-	if cfg.Server.Mode == "release" {
-		gin.SetMode(gin.ReleaseMode)
-	}
-
-	r := gin.New()
-
-	// Global Middleware
-	r.Use(gin.Logger())
-	r.Use(middleware.Recovery())     // Custom Recovery with JSON response
-	r.Use(middleware.ErrorHandler()) // Handle c.Errors
-	// CORS Middleware
-	r.Use(cors.New(cors.Config{
-		AllowOrigins:     cfg.CORS.AllowOrigins,
-		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
-		AllowHeaders:     []string{"Origin", "Authorization", "Content-Type"},
-		ExposeHeaders:    []string{"Content-Length"},
-		AllowCredentials: true,
-	}))
-	// Only enable Swagger in non-release mode
-	if cfg.Server.Mode != "release" {
-		r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
-	}
-
-	// Global Middleware (Logger, Recovery are default)
-
-	// Health check
-	r.GET("/health", func(c *gin.Context) {
-		c.JSON(http.StatusOK, gin.H{
-			"status": "up",
-		})
-	})
-
-	// Auth Handler
-	authHandler := auth.NewHandler(c, t, l, cfg, db)
-	// api := r.Group("/v")
-	authGroup := r.Group("/auth")
-	{
-		authGroup.POST("/login", authHandler.Login)
-		authGroup.POST("/register", authHandler.Register)
-		authGroup.POST("/forgot-password", authHandler.ForgotPassword)
-		authGroup.POST("/reset-password", authHandler.ResetPassword)
-		authGroup.GET("/google/login", authHandler.LoginGoogle)
-		authGroup.GET("/google/callback", authHandler.GoogleCallback)
-	}
-
-	// Auth Middleware
-	authMiddleware := middleware.NewAuthMiddleware(c, t, cfg, db, l)
-
-	// Init Storage Provider (S3)
-	s3Provider, err := storage.NewS3Provider(cfg)
-	if err != nil {
-		l.Error("Failed to initialize S3 provider", "error", err)
-		// We might want to panic or continue with warning depending on criticality.
-		// For now, let's log and proceed, but video uploads will fail.
-	}
-
-	// Handlers
-	planHandler := plan.NewHandler(l, cfg, db)
-	paymentHandler := payment.NewHandler(l, cfg, db)
-	usageHandler := usage.NewHandler(l, db)
-	videoHandler := video.NewHandler(l, cfg, db, s3Provider)
-	preferencesHandler := preferences.NewHandler(l, db)
-	notificationHandler := notifications.NewHandler(l, db)
-	domainHandler := domains.NewHandler(l, db)
-	adTemplateHandler := adtemplates.NewHandler(l, db)
-
-	// Example protected group
-	protected := r.Group("")
-	protected.Use(authMiddleware.Handle())
-	{
-		protected.GET("/me", authHandler.GetMe)
-		protected.PUT("/me", authHandler.UpdateMe)
-		protected.DELETE("/me", authHandler.DeleteMe)
-		protected.POST("/me/clear-data", authHandler.ClearMyData)
-		protected.POST("/auth/logout", authHandler.Logout)
-		protected.POST("/auth/change-password", authHandler.ChangePassword)
-
-		preferences := protected.Group("/settings/preferences")
-		preferences.GET("", preferencesHandler.GetPreferences)
-		preferences.PUT("", preferencesHandler.UpdatePreferences)
-
-		notifications := protected.Group("/notifications")
-		notifications.GET("", notificationHandler.ListNotifications)
-		notifications.POST("/:id/read", notificationHandler.MarkRead)
-		notifications.POST("/read-all", notificationHandler.MarkAllRead)
-		notifications.DELETE("/:id", notificationHandler.DeleteNotification)
-		notifications.DELETE("", notificationHandler.ClearNotifications)
-
-		domains := protected.Group("/domains")
-		domains.GET("", domainHandler.ListDomains)
-		domains.POST("", domainHandler.CreateDomain)
-		domains.DELETE("/:id", domainHandler.DeleteDomain)
-
-		adTemplates := protected.Group("/ad-templates")
-		adTemplates.GET("", adTemplateHandler.ListTemplates)
-		adTemplates.POST("", adTemplateHandler.CreateTemplate)
-		adTemplates.PUT("/:id", adTemplateHandler.UpdateTemplate)
-		adTemplates.DELETE("/:id", adTemplateHandler.DeleteTemplate)
-
-		// Plans
-		plans := protected.Group("/plans")
-		plans.GET("", planHandler.ListPlans)
-
-		// Payments
-		payments := protected.Group("/payments")
-		payments.POST("", paymentHandler.CreatePayment)
-		payments.GET("/history", paymentHandler.ListPaymentHistory)
-		payments.GET("/:id/invoice", paymentHandler.DownloadInvoice)
-		wallet := protected.Group("/wallet")
-		wallet.POST("/topups", paymentHandler.TopupWallet)
-
-		protected.GET("/usage", usageHandler.GetUsage)
-
-		// Videos
-		video := protected.Group("/videos")
-		video.POST("/upload-url", videoHandler.GetUploadURL)
-		video.POST("", videoHandler.CreateVideo)
-		video.GET("", videoHandler.ListVideos)
-		video.GET("/:id", videoHandler.GetVideo)
-		video.PUT("/:id", videoHandler.UpdateVideo)
-		video.DELETE("/:id", videoHandler.DeleteVideo)
-	}
-
-	renderModule, err := videoruntime.NewModule(context.Background(), cfg, db, c, t, l)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	r.Use(videoruntime.MetricsMiddleware())
-	r.GET("/health/live", renderModule.HandleLive)
-	r.GET("/health/ready", renderModule.HandleReady)
-	r.GET("/health/detailed", renderModule.HandleDetailed)
-	r.GET("/metrics", renderModule.MetricsHandler())
-
-	// Admin routes — require auth + admin role
-	adminHandler := admin.NewHandler(l, db, renderModule)
-	adminGroup := r.Group("/admin")
-	adminGroup.Use(authMiddleware.Handle())
-	adminGroup.Use(middleware.RequireAdmin())
-	{
-		adminGroup.GET("/dashboard", adminHandler.Dashboard)
-
-		adminGroup.GET("/users", adminHandler.ListUsers)
-		adminGroup.POST("/users", adminHandler.CreateUser)
-		adminGroup.GET("/users/:id", adminHandler.GetUser)
-		adminGroup.PUT("/users/:id", adminHandler.UpdateUser)
-		adminGroup.PUT("/users/:id/role", adminHandler.UpdateUserRole)
-		adminGroup.DELETE("/users/:id", adminHandler.DeleteUser)
-
-		adminGroup.GET("/videos", adminHandler.ListVideos)
-		adminGroup.POST("/videos", adminHandler.CreateVideo)
-		adminGroup.GET("/videos/:id", adminHandler.GetVideo)
-		adminGroup.PUT("/videos/:id", adminHandler.UpdateVideo)
-		adminGroup.DELETE("/videos/:id", adminHandler.DeleteVideo)
-
-		adminGroup.GET("/payments", adminHandler.ListPayments)
-		adminGroup.POST("/payments", adminHandler.CreatePayment)
-		adminGroup.GET("/payments/:id", adminHandler.GetPayment)
-		adminGroup.PUT("/payments/:id", adminHandler.UpdatePayment)
-
-		adminGroup.GET("/plans", adminHandler.ListPlans)
-		adminGroup.POST("/plans", adminHandler.CreatePlan)
-		adminGroup.PUT("/plans/:id", adminHandler.UpdatePlan)
-		adminGroup.DELETE("/plans/:id", adminHandler.DeletePlan)
-
-		adminGroup.GET("/ad-templates", adminHandler.ListAdTemplates)
-		adminGroup.POST("/ad-templates", adminHandler.CreateAdTemplate)
-		adminGroup.GET("/ad-templates/:id", adminHandler.GetAdTemplate)
-		adminGroup.PUT("/ad-templates/:id", adminHandler.UpdateAdTemplate)
-		adminGroup.DELETE("/ad-templates/:id", adminHandler.DeleteAdTemplate)
-
-		adminGroup.GET("/jobs", adminHandler.ListJobs)
-		adminGroup.POST("/jobs", adminHandler.CreateJob)
-		adminGroup.GET("/jobs/:id", adminHandler.GetJob)
-		adminGroup.GET("/jobs/:id/logs", adminHandler.GetJobLogs)
-		adminGroup.POST("/jobs/:id/cancel", adminHandler.CancelJob)
-		adminGroup.POST("/jobs/:id/retry", adminHandler.RetryJob)
-		adminGroup.GET("/agents", adminHandler.ListAgents)
-		adminGroup.POST("/agents/:id/restart", adminHandler.RestartAgent)
-		adminGroup.POST("/agents/:id/update", adminHandler.UpdateAgent)
-	}
-
-	return r, renderModule, nil
-}
diff --git a/internal/app/grpc.go b/internal/app/grpc.go
new file mode 100644
index 0000000..005609e
--- /dev/null
+++ b/internal/app/grpc.go
@@ -0,0 +1,76 @@
+package app
+
+import (
+	"context"
+	"net"
+
+	grpcpkg "google.golang.org/grpc"
+	"gorm.io/gorm"
+	"stream.api/internal/config"
+	apprpc "stream.api/internal/rpc/app"
+	"stream.api/internal/video"
+	runtime "stream.api/internal/video/runtime"
+	redisadapter "stream.api/internal/video/runtime/adapters/queue/redis"
+	runtimegrpc "stream.api/internal/video/runtime/grpc"
+	"stream.api/internal/video/runtime/services"
+	"stream.api/pkg/cache"
+	"stream.api/pkg/logger"
+	"stream.api/pkg/token"
+)
+
+type GRPCModule struct {
+	jobService    *services.JobService
+	healthService *services.HealthService
+	agentRuntime  *runtimegrpc.Server
+	mqttPublisher *runtime.MQTTBootstrap
+	grpcServer    *grpcpkg.Server
+	cfg           *config.Config
+}
+
+func NewGRPCModule(ctx context.Context, cfg *config.Config, db *gorm.DB, cacheClient cache.Cache, tokenProvider token.Provider, appLogger logger.Logger) (*GRPCModule, error) {
+	adapter, err := redisadapter.NewAdapter(cfg.Redis.Addr, cfg.Redis.Password, cfg.Redis.DB)
+	if err != nil {
+		return nil, err
+	}
+	jobService := services.NewJobService(adapter, adapter)
+	healthService := services.NewHealthService(db, adapter.Client(), cfg.Render.ServiceName)
+	agentRuntime := runtimegrpc.NewServer(jobService, cfg.Render.AgentSecret)
+	videoService := video.NewService(db, jobService)
+	grpcServer := grpcpkg.NewServer()
+
+	module := &GRPCModule{
+		jobService:    jobService,
+		healthService: healthService,
+		agentRuntime:  agentRuntime,
+		grpcServer:    grpcServer,
+		cfg:           cfg,
+	}
+
+	if publisher, err := runtime.NewMQTTBootstrap(jobService, agentRuntime, appLogger); err != nil {
+		appLogger.Error("Failed to initialize MQTT publisher", "error", err)
+	} else {
+		module.mqttPublisher = publisher
+		agentRuntime.SetAgentEventHandler(func(eventType string, agent *services.AgentWithStats) {
+			runtime.PublishAgentMQTTEvent(publisher.Client(), appLogger, eventType, agent)
+		})
+	}
+
+	agentRuntime.Register(grpcServer)
+	apprpc.Register(grpcServer, apprpc.NewServices(cacheClient, tokenProvider, db, appLogger, cfg, videoService, agentRuntime))
+	if module.mqttPublisher != nil {
+		module.mqttPublisher.Start(ctx)
+	}
+
+	return module, nil
+}
+
+func (m *GRPCModule) JobService() *services.JobService      { return m.jobService }
+func (m *GRPCModule) AgentRuntime() *runtimegrpc.Server     { return m.agentRuntime }
+func (m *GRPCModule) GRPCServer() *grpcpkg.Server           { return m.grpcServer }
+func (m *GRPCModule) GRPCAddress() string                   { return ":" + m.cfg.Server.GRPCPort }
+func (m *GRPCModule) ServeGRPC(listener net.Listener) error { return m.grpcServer.Serve(listener) }
+func (m *GRPCModule) Shutdown() {
+	if m.grpcServer != nil {
+		m.grpcServer.GracefulStop()
+	}
+}
diff --git a/internal/database/model/common.go b/internal/database/model/common.go
new file mode 100644
index 0000000..113dfab
--- /dev/null
+++ b/internal/database/model/common.go
@@ -0,0 +1,110 @@
+package model
+
+import (
+	"context"
+	"strings"
+	"time"
+
+	"gorm.io/gorm"
+)
+
+// BoolPtr returns a pointer to the given bool value
+func BoolPtr(b bool) *bool {
+	return &b
+}
+
+// StringPtr returns a pointer to the given string value
+func StringPtr(s string) *string {
+	return &s
+}
+
+// StringValue returns the string value or empty string if nil
+func StringValue(s *string) string {
+	if s == nil {
+		return ""
+	}
+	return *s
+}
+
+// BoolValue returns the bool value or false if nil
+func BoolValue(b *bool) bool {
+	if b == nil {
+		return false
+	}
+	return *b
+}
+
+// Int64Ptr returns a pointer to the given int64 value
+func Int64Ptr(i int64) *int64 {
+	return &i
+}
+
+// Float64Ptr returns a pointer to the given float64 value
+func Float64Ptr(f float64) *float64 {
+	return &f
+}
+
+// TimePtr returns a pointer to the given time.Time value
+func TimePtr(t time.Time) *time.Time {
+	return &t
+}
+
+// FindOrCreateUserPreference finds or creates a user preference record
+func FindOrCreateUserPreference(ctx context.Context, db *gorm.DB, userID string) (*UserPreference, error) {
+	pref := &UserPreference{}
+	err := db.WithContext(ctx).
+		Where("user_id = ?", userID).
+		Attrs(&UserPreference{
+			Language:               StringPtr("en"),
+			Locale:                 StringPtr("en"),
+			EmailNotifications:     BoolPtr(true),
+			PushNotifications:      BoolPtr(true),
+			MarketingNotifications: false,
+			TelegramNotifications:  false,
+		}).
+		FirstOrCreate(pref).Error
+
+	// Handle race condition: if duplicate key error, fetch the existing record
+	if err != nil && strings.Contains(err.Error(), "duplicate key") {
+		err = db.WithContext(ctx).Where("user_id = ?", userID).First(pref).Error
+	}
+
+	return pref, err
+}
+
+// GetWalletBalance calculates the current wallet balance for a user
+func GetWalletBalance(ctx context.Context, db *gorm.DB, userID string) (float64, error) {
+	var balance float64
+	if err := db.WithContext(ctx).
+		Model(&WalletTransaction{}).
+		Where("user_id = ?", userID).
+		Select("COALESCE(SUM(amount), 0)").
+		Scan(&balance).Error; err != nil {
+		return 0, err
+	}
+	return balance, nil
+}
+
+// GetLatestPlanSubscription finds the latest plan subscription for a user
+func GetLatestPlanSubscription(ctx context.Context, db *gorm.DB, userID string) (*PlanSubscription, error) {
+	sub := &PlanSubscription{}
+	err := db.WithContext(ctx).
+		Where("user_id = ?", userID).
+		Order("expires_at DESC").
+		First(sub).Error
+	if err != nil {
+		return nil, err
+	}
+	return sub, nil
+}
+
+// IsSubscriptionExpiringSoon checks if subscription expires within threshold days
+func IsSubscriptionExpiringSoon(sub *PlanSubscription, thresholdDays int) bool {
+	if sub == nil {
+		return false
+	}
+	now := time.Now()
+	hoursUntilExpiry := sub.ExpiresAt.Sub(now).Hours()
+	thresholdHours := float64(thresholdDays) * 24
+	return hoursUntilExpiry > 0 && hoursUntilExpiry <= thresholdHours
+}
diff --git a/internal/database/model/helpers.go b/internal/database/model/helpers.go
deleted file mode 100644
index 8815fa6..0000000
--- a/internal/database/model/helpers.go
+++ /dev/null
@@ -1,138 +0,0 @@
-package model
-
-import (
-	"context"
-	"errors"
-	"strings"
-	"time"
-
-	"gorm.io/gorm"
-)
-
-const (
-	defaultPreferenceLanguage = "en"
-	defaultPreferenceLocale   = "en"
-)
-
-func DefaultUserPreference(userID string) *UserPreference {
-	return &UserPreference{
-		UserID:                 userID,
-		Language:               StringPtr(defaultPreferenceLanguage),
-		Locale:                 StringPtr(defaultPreferenceLocale),
-		EmailNotifications:     BoolPtr(true),
-		PushNotifications:      BoolPtr(true),
-		MarketingNotifications: false,
-		TelegramNotifications:  false,
-		Autoplay:               false,
-		Loop:                   false,
-		Muted:                  false,
-		ShowControls:           BoolPtr(true),
-		Pip:                    BoolPtr(true),
-		Airplay:                BoolPtr(true),
-		Chromecast:             BoolPtr(true),
-	}
-}
-
-func FindOrCreateUserPreference(ctx context.Context, db *gorm.DB, userID string) (*UserPreference, error) {
-	var pref UserPreference
-	if err := db.WithContext(ctx).Where("user_id = ?", userID).First(&pref).Error; err == nil {
-		normalizeUserPreferenceDefaults(&pref)
-		return &pref, nil
-	} else if !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, err
-	}
-
-	pref = *DefaultUserPreference(userID)
-	if err := db.WithContext(ctx).Create(&pref).Error; err != nil {
-		return nil, err
-	}
-	return &pref, nil
-}
-
-func GetWalletBalance(ctx context.Context, db *gorm.DB, userID string) (float64, error) {
-	var balance float64
-	if err := db.WithContext(ctx).
-		Model(&WalletTransaction{}).
-		Where("user_id = ?", userID).
-		Select("COALESCE(SUM(amount), 0)").
-		Scan(&balance).Error; err != nil {
-		return 0, err
-	}
-	return balance, nil
-}
-
-func GetLatestPlanSubscription(ctx context.Context, db *gorm.DB, userID string) (*PlanSubscription, error) {
-	userID = strings.TrimSpace(userID)
-	if userID == "" {
-		return nil, gorm.ErrRecordNotFound
-	}
-
-	var subscription PlanSubscription
-	if err := db.WithContext(ctx).
-		Where("user_id = ?", userID).
-		Order("created_at DESC").
-		Order("id DESC").
-		First(&subscription).Error; err != nil {
-		return nil, err
-	}
-
-	return &subscription, nil
-}
-
-func IsSubscriptionExpiringSoon(expiresAt time.Time, now time.Time) bool {
-	if expiresAt.IsZero() || !expiresAt.After(now) {
-		return false
-	}
-	return expiresAt.Sub(now) <= 7*24*time.Hour
-}
-
-func normalizeUserPreferenceDefaults(pref *UserPreference) {
-	if pref == nil {
-		return
-	}
-	if strings.TrimSpace(StringValue(pref.Language)) == "" {
-		pref.Language = StringPtr(defaultPreferenceLanguage)
-	}
-	if strings.TrimSpace(StringValue(pref.Locale)) == "" {
-		locale := StringValue(pref.Language)
-		if strings.TrimSpace(locale) == "" {
-			locale = defaultPreferenceLocale
-		}
-		pref.Locale = StringPtr(locale)
-	}
-	if pref.EmailNotifications == nil {
-		pref.EmailNotifications = BoolPtr(true)
-	}
-	if pref.PushNotifications == nil {
-		pref.PushNotifications = BoolPtr(true)
-	}
-	if pref.ShowControls == nil {
-		pref.ShowControls = BoolPtr(true)
-	}
-	if pref.Pip == nil {
-		pref.Pip = BoolPtr(true)
-	}
-	if pref.Airplay == nil {
-		pref.Airplay = BoolPtr(true)
-	}
-	if pref.Chromecast == nil {
-		pref.Chromecast = BoolPtr(true)
-	}
-}
-
-func StringPtr(value string) *string {
-	v := value
-	return &v
-}
-
-func BoolPtr(value bool) *bool {
-	v := value
-	return &v
-}
-
-func StringValue(value *string) string {
-	if value == nil {
-		return ""
-	}
-	return *value
-}
diff --git a/internal/database/model/player_configs.gen.go b/internal/database/model/player_configs.gen.go
new file mode 100644
index 0000000..6184078
--- /dev/null
+++ b/internal/database/model/player_configs.gen.go
@@ -0,0 +1,38 @@
+// Code generated by gorm.io/gen. DO NOT EDIT.
+// Code generated by gorm.io/gen. DO NOT EDIT.
+// Code generated by gorm.io/gen. DO NOT EDIT.
+
+package model
+
+import (
+	"time"
+)
+
+const TableNamePlayerConfig = "player_configs"
+
+// PlayerConfig mapped from table <player_configs>
+type PlayerConfig struct {
+	ID            string     `gorm:"column:id;type:uuid;primaryKey;default:gen_random_uuid()" json:"id"`
+	UserID        string     `gorm:"column:user_id;type:uuid;not null;uniqueIndex:idx_player_configs_one_default_per_user,priority:1;index:idx_player_configs_user_default,priority:2;index:idx_player_configs_user_id,priority:1" json:"user_id"`
+	Name          string     `gorm:"column:name;type:text;not null" json:"name"`
+	Description   *string    `gorm:"column:description;type:text" json:"description"`
+	Autoplay      bool       `gorm:"column:autoplay;type:boolean;not null" json:"autoplay"`
+	Loop          bool       `gorm:"column:loop;type:boolean;not null" json:"loop"`
+	Muted         bool       `gorm:"column:muted;type:boolean;not null" json:"muted"`
+	ShowControls  *bool      `gorm:"column:show_controls;type:boolean;not null;default:true" json:"show_controls"`
+	Pip           *bool      `gorm:"column:pip;type:boolean;not null;default:true" json:"pip"`
+	Airplay       *bool      `gorm:"column:airplay;type:boolean;not null;default:true" json:"airplay"`
+	Chromecast    *bool      `gorm:"column:chromecast;type:boolean;not null;default:true" json:"chromecast"`
+	IsActive      *bool      `gorm:"column:is_active;type:boolean;not null;default:true" json:"is_active"`
+	IsDefault     bool       `gorm:"column:is_default;type:boolean;not null;index:idx_player_configs_is_default,priority:1;index:idx_player_configs_user_default,priority:1" json:"is_default"`
+	CreatedAt     *time.Time `gorm:"column:created_at;type:timestamp(3) without time zone;not null;default:CURRENT_TIMESTAMP" json:"created_at"`
+	UpdatedAt     time.Time  `gorm:"column:updated_at;type:timestamp(3) without time zone;not null" json:"updated_at"`
+	Version       *int64     `gorm:"column:version;type:bigint;not null;default:1;version" json:"-"`
+	EncrytionM3u8 *bool      `gorm:"column:encrytion_m3u8;type:boolean;not null;default:true" json:"encrytion_m3u8"`
+	LogoURL       *string    `gorm:"column:logo_url;type:character varying(500)" json:"logo_url"`
+}
+
+// TableName PlayerConfig's table name
+func (*PlayerConfig) TableName() string {
+	return TableNamePlayerConfig
+}
diff --git a/internal/database/model/user.gen.go b/internal/database/model/user.gen.go
index 7637603..fec9e77 100644
--- a/internal/database/model/user.gen.go
+++ b/internal/database/model/user.gen.go
@@ -12,18 +12,25 @@ const TableNameUser = "user"
 
 // User mapped from table <user>
 type User struct {
-	ID          string     `gorm:"column:id;type:uuid;primaryKey;default:gen_random_uuid()" json:"id"`
-	Email       string     `gorm:"column:email;type:text;not null;uniqueIndex:user_email_key,priority:1" json:"email"`
-	Password    *string    `gorm:"column:password;type:text" json:"-"`
-	Username    *string    `gorm:"column:username;type:text" json:"username"`
-	Avatar      *string    `gorm:"column:avatar;type:text" json:"avatar"`
-	Role        *string    `gorm:"column:role;type:character varying(20);not null;default:USER" json:"role"`
-	GoogleID    *string    `gorm:"column:google_id;type:text;uniqueIndex:user_google_id_key,priority:1" json:"google_id"`
-	StorageUsed int64      `gorm:"column:storage_used;type:bigint;not null" json:"storage_used"`
-	PlanID      *string    `gorm:"column:plan_id;type:uuid" json:"plan_id"`
-	CreatedAt   *time.Time `gorm:"column:created_at;type:timestamp(3) without time zone;not null;default:CURRENT_TIMESTAMP" json:"created_at"`
-	UpdatedAt   time.Time  `gorm:"column:updated_at;type:timestamp(3) without time zone;not null" json:"updated_at"`
-	Version     *int64     `gorm:"column:version;type:bigint;not null;default:1;version" json:"-"`
+	ID                      string     `gorm:"column:id;type:uuid;primaryKey;default:gen_random_uuid()" json:"id"`
+	Email                   string     `gorm:"column:email;type:text;not null;uniqueIndex:user_email_key,priority:1" json:"email"`
+	Password                *string    `gorm:"column:password;type:text" json:"-"`
+	Username                *string    `gorm:"column:username;type:text" json:"username"`
+	Avatar                  *string    `gorm:"column:avatar;type:text" json:"avatar"`
+	Role                    *string    `gorm:"column:role;type:character varying(20);not null;default:USER" json:"role"`
+	GoogleID                *string    `gorm:"column:google_id;type:text;uniqueIndex:user_google_id_key,priority:1" json:"google_id"`
+	StorageUsed             int64      `gorm:"column:storage_used;type:bigint;not null" json:"storage_used"`
+	PlanID                  *string    `gorm:"column:plan_id;type:uuid" json:"plan_id"`
+	ReferredByUserID        *string    `gorm:"column:referred_by_user_id;type:uuid;index:idx_user_referred_by_user_id,priority:1" json:"referred_by_user_id"`
+	ReferralEligible        *bool      `gorm:"column:referral_eligible;type:boolean;not null;default:true" json:"referral_eligible"`
+	ReferralRewardBps       *int32     `gorm:"column:referral_reward_bps;type:integer" json:"referral_reward_bps"`
+	ReferralRewardGrantedAt *time.Time `gorm:"column:referral_reward_granted_at;type:timestamp with time zone" json:"referral_reward_granted_at"`
+	ReferralRewardPaymentID *string    `gorm:"column:referral_reward_payment_id;type:uuid" json:"referral_reward_payment_id"`
+	ReferralRewardAmount    *float64   `gorm:"column:referral_reward_amount;type:numeric(65,30)" json:"referral_reward_amount"`
+	CreatedAt               *time.Time `gorm:"column:created_at;type:timestamp(3) without time zone;not null;default:CURRENT_TIMESTAMP" json:"created_at"`
+	UpdatedAt               time.Time  `gorm:"column:updated_at;type:timestamp(3) without time zone;not null" json:"updated_at"`
+	Version                 *int64     `gorm:"column:version;type:bigint;not null;default:1;version" json:"-"`
+	TelegramID              *string    `gorm:"column:telegram_id;type:character varying" json:"telegram_id"`
 }
 
 // TableName User's table name
diff --git a/internal/database/model/user_preferences.gen.go b/internal/database/model/user_preferences.gen.go
index c2b5e2a..a301d56 100644
--- a/internal/database/model/user_preferences.gen.go
+++ b/internal/database/model/user_preferences.gen.go
@@ -19,16 +19,8 @@ type UserPreference struct {
 	PushNotifications      *bool      `gorm:"column:push_notifications;type:boolean;not null;default:true" json:"push_notifications"`
 	MarketingNotifications bool       `gorm:"column:marketing_notifications;type:boolean;not null" json:"marketing_notifications"`
 	TelegramNotifications  bool       `gorm:"column:telegram_notifications;type:boolean;not null" json:"telegram_notifications"`
-	Autoplay               bool       `gorm:"column:autoplay;type:boolean;not null" json:"autoplay"`
-	Loop                   bool       `gorm:"column:loop;type:boolean;not null" json:"loop"`
-	Muted                  bool       `gorm:"column:muted;type:boolean;not null" json:"muted"`
-	ShowControls           *bool      `gorm:"column:show_controls;type:boolean;not null;default:true" json:"show_controls"`
-	Pip                    *bool      `gorm:"column:pip;type:boolean;not null;default:true" json:"pip"`
-	Airplay                *bool      `gorm:"column:airplay;type:boolean;not null;default:true" json:"airplay"`
-	Chromecast             *bool      `gorm:"column:chromecast;type:boolean;not null;default:true" json:"chromecast"`
 	CreatedAt              *time.Time `gorm:"column:created_at;type:timestamp with time zone" json:"created_at"`
 	UpdatedAt              *time.Time `gorm:"column:updated_at;type:timestamp with time zone" json:"updated_at"`
-	EncrytionM3u8          bool       `gorm:"column:encrytion_m3u8;type:boolean;not null" json:"encrytion_m3u8"`
 	Version                *int64     `gorm:"column:version;type:bigint;not null;default:1;version" json:"-"`
 }
 
diff --git a/internal/database/model/video.gen.go b/internal/database/model/video.gen.go
index 542e7ec..05d2b55 100644
--- a/internal/database/model/video.gen.go
+++ b/internal/database/model/video.gen.go
@@ -6,31 +6,35 @@ package model
 
 import (
 	"time"
+
+	"gorm.io/datatypes"
 )
 
 const TableNameVideo = "video"
 
 // Video mapped from table <video>
 type Video struct {
-	ID               string     `gorm:"column:id;type:uuid;primaryKey;default:gen_random_uuid()" json:"id"`
-	Name             string     `gorm:"column:name;type:text;not null" json:"name"`
-	Title            string     `gorm:"column:title;type:text;not null" json:"title"`
-	Description      *string    `gorm:"column:description;type:text" json:"description"`
-	URL              string     `gorm:"column:url;type:text;not null" json:"url"`
-	Thumbnail        *string    `gorm:"column:thumbnail;type:text" json:"thumbnail"`
-	HlsToken         *string    `gorm:"column:hls_token;type:text" json:"hls_token"`
-	HlsPath          *string    `gorm:"column:hls_path;type:text" json:"hls_path"`
-	Duration         int32      `gorm:"column:duration;type:integer;not null" json:"duration"`
-	Size             int64      `gorm:"column:size;type:bigint;not null" json:"size"`
-	StorageType      *string    `gorm:"column:storage_type;type:character varying(20);not null;default:tiktok_avatar" json:"storage_type"`
-	Format           string     `gorm:"column:format;type:text;not null" json:"format"`
-	Status           *string    `gorm:"column:status;type:character varying(20);not null;default:PUBLIC" json:"status"`
-	ProcessingStatus *string    `gorm:"column:processing_status;type:character varying(20);not null;default:PENDING" json:"processing_status"`
-	Views            int32      `gorm:"column:views;type:integer;not null" json:"views"`
-	UserID           string     `gorm:"column:user_id;type:uuid;not null" json:"user_id"`
-	CreatedAt        *time.Time `gorm:"column:created_at;type:timestamp(3) without time zone;not null;default:CURRENT_TIMESTAMP" json:"created_at"`
-	UpdatedAt        time.Time  `gorm:"column:updated_at;type:timestamp(3) without time zone;not null" json:"updated_at"`
-	Version          *int64     `gorm:"column:version;type:bigint;not null;default:1;version" json:"-"`
+	ID               string          `gorm:"column:id;type:uuid;primaryKey;default:gen_random_uuid()" json:"id"`
+	Name             string          `gorm:"column:name;type:text;not null" json:"name"`
+	Title            string          `gorm:"column:title;type:text;not null" json:"title"`
+	Description      *string         `gorm:"column:description;type:text" json:"description"`
+	URL              string          `gorm:"column:url;type:text;not null" json:"url"`
+	Thumbnail        *string         `gorm:"column:thumbnail;type:text" json:"thumbnail"`
+	HlsToken         *string         `gorm:"column:hls_token;type:text" json:"hls_token"`
+	HlsPath          *string         `gorm:"column:hls_path;type:text" json:"hls_path"`
+	Duration         int32           `gorm:"column:duration;type:integer;not null" json:"duration"`
+	Size             int64           `gorm:"column:size;type:bigint;not null" json:"size"`
+	StorageType      *string         `gorm:"column:storage_type;type:character varying(20);not null;default:tiktok_avatar" json:"storage_type"`
+	Format           string          `gorm:"column:format;type:text;not null" json:"format"`
+	Status           *string         `gorm:"column:status;type:character varying(20);not null;default:PUBLIC" json:"status"`
+	ProcessingStatus *string         `gorm:"column:processing_status;type:character varying(20);not null;default:PENDING" json:"processing_status"`
+	Views            int32           `gorm:"column:views;type:integer;not null" json:"views"`
+	UserID           string          `gorm:"column:user_id;type:uuid;not null" json:"user_id"`
+	CreatedAt        *time.Time      `gorm:"column:created_at;type:timestamp(3) without time zone;not null;default:CURRENT_TIMESTAMP" json:"created_at"`
+	UpdatedAt        time.Time       `gorm:"column:updated_at;type:timestamp(3) without time zone;not null" json:"updated_at"`
+	Version          *int64          `gorm:"column:version;type:bigint;not null;default:1;version" json:"-"`
+	AdID             *string         `gorm:"column:ad_id;type:uuid" json:"ad_id"`
+	Metadata         *datatypes.JSON `gorm:"column:metadata;type:jsonb" json:"metadata"`
 }
 
 // TableName Video's table name
diff --git a/internal/database/model/video_ad_configs.gen.go b/internal/database/model/video_ad_configs.gen.go
deleted file mode 100644
index 4d28341..0000000
--- a/internal/database/model/video_ad_configs.gen.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Code generated by gorm.io/gen. DO NOT EDIT.
-// Code generated by gorm.io/gen. DO NOT EDIT.
-// Code generated by gorm.io/gen. DO NOT EDIT.
-
-package model
-
-import (
-	"time"
-)
-
-const TableNameVideoAdConfig = "video_ad_configs"
-
-// VideoAdConfig mapped from table <video_ad_configs>
-type VideoAdConfig struct {
-	VideoID      string     `gorm:"column:video_id;type:uuid;primaryKey" json:"video_id"`
-	UserID       string     `gorm:"column:user_id;type:uuid;not null;index:idx_video_ad_configs_user_id,priority:1" json:"user_id"`
-	AdTemplateID string     `gorm:"column:ad_template_id;type:uuid;not null" json:"ad_template_id"`
-	VastTagURL   string     `gorm:"column:vast_tag_url;type:text;not null" json:"vast_tag_url"`
-	AdFormat     *string    `gorm:"column:ad_format;type:character varying(50);not null;default:pre-roll" json:"ad_format"`
-	Duration     *int64     `gorm:"column:duration;type:bigint" json:"duration"`
-	CreatedAt    *time.Time `gorm:"column:created_at;type:timestamp with time zone" json:"created_at"`
-	UpdatedAt    *time.Time `gorm:"column:updated_at;type:timestamp with time zone" json:"updated_at"`
-	Version      *int64     `gorm:"column:version;type:bigint;not null;default:1;version" json:"-"`
-}
-
-// TableName VideoAdConfig's table name
-func (*VideoAdConfig) TableName() string {
-	return TableNameVideoAdConfig
-}
diff --git a/internal/database/query/gen.go b/internal/database/query/gen.go
index b80b196..9296868 100644
--- a/internal/database/query/gen.go
+++ b/internal/database/query/gen.go
@@ -24,10 +24,10 @@ var (
 	Payment           *payment
 	Plan              *plan
 	PlanSubscription  *planSubscription
+	PlayerConfig      *playerConfig
 	User              *user
 	UserPreference    *userPreference
 	Video             *video
-	VideoAdConfig     *videoAdConfig
 	WalletTransaction *walletTransaction
 )
 
@@ -40,10 +40,10 @@ func SetDefault(db *gorm.DB, opts ...gen.DOOption) {
 	Payment = &Q.Payment
 	Plan = &Q.Plan
 	PlanSubscription = &Q.PlanSubscription
+	PlayerConfig = &Q.PlayerConfig
 	User = &Q.User
 	UserPreference = &Q.UserPreference
 	Video = &Q.Video
-	VideoAdConfig = &Q.VideoAdConfig
 	WalletTransaction = &Q.WalletTransaction
 }
 
@@ -57,10 +57,10 @@ func Use(db *gorm.DB, opts ...gen.DOOption) *Query {
 		Payment:           newPayment(db, opts...),
 		Plan:              newPlan(db, opts...),
 		PlanSubscription:  newPlanSubscription(db, opts...),
+		PlayerConfig:      newPlayerConfig(db, opts...),
 		User:              newUser(db, opts...),
 		UserPreference:    newUserPreference(db, opts...),
 		Video:             newVideo(db, opts...),
-		VideoAdConfig:     newVideoAdConfig(db, opts...),
 		WalletTransaction: newWalletTransaction(db, opts...),
 	}
 }
@@ -75,10 +75,10 @@ type Query struct {
 	Payment           payment
 	Plan              plan
 	PlanSubscription  planSubscription
+	PlayerConfig      playerConfig
 	User              user
 	UserPreference    userPreference
 	Video             video
-	VideoAdConfig     videoAdConfig
 	WalletTransaction walletTransaction
 }
 
@@ -94,10 +94,10 @@ func (q *Query) clone(db *gorm.DB) *Query {
 		Payment:           q.Payment.clone(db),
 		Plan:              q.Plan.clone(db),
 		PlanSubscription:  q.PlanSubscription.clone(db),
+		PlayerConfig:      q.PlayerConfig.clone(db),
 		User:              q.User.clone(db),
 		UserPreference:    q.UserPreference.clone(db),
 		Video:             q.Video.clone(db),
-		VideoAdConfig:     q.VideoAdConfig.clone(db),
 		WalletTransaction: q.WalletTransaction.clone(db),
 	}
 }
@@ -120,10 +120,10 @@ func (q *Query) ReplaceDB(db *gorm.DB) *Query {
 		Payment:           q.Payment.replaceDB(db),
 		Plan:              q.Plan.replaceDB(db),
 		PlanSubscription:  q.PlanSubscription.replaceDB(db),
+		PlayerConfig:      q.PlayerConfig.replaceDB(db),
 		User:              q.User.replaceDB(db),
 		UserPreference:    q.UserPreference.replaceDB(db),
 		Video:             q.Video.replaceDB(db),
-		VideoAdConfig:     q.VideoAdConfig.replaceDB(db),
 		WalletTransaction: q.WalletTransaction.replaceDB(db),
 	}
 }
@@ -136,10 +136,10 @@ type queryCtx struct {
 	Payment           IPaymentDo
 	Plan              IPlanDo
 	PlanSubscription  IPlanSubscriptionDo
+	PlayerConfig      IPlayerConfigDo
 	User              IUserDo
 	UserPreference    IUserPreferenceDo
 	Video             IVideoDo
-	VideoAdConfig     IVideoAdConfigDo
 	WalletTransaction IWalletTransactionDo
 }
 
@@ -152,10 +152,10 @@ func (q *Query) WithContext(ctx context.Context) *queryCtx {
 		Payment:           q.Payment.WithContext(ctx),
 		Plan:              q.Plan.WithContext(ctx),
 		PlanSubscription:  q.PlanSubscription.WithContext(ctx),
+		PlayerConfig:      q.PlayerConfig.WithContext(ctx),
 		User:              q.User.WithContext(ctx),
 		UserPreference:    q.UserPreference.WithContext(ctx),
 		Video:             q.Video.WithContext(ctx),
-		VideoAdConfig:     q.VideoAdConfig.WithContext(ctx),
 		WalletTransaction: q.WalletTransaction.WithContext(ctx),
 	}
 }
diff --git a/internal/database/query/player_configs.gen.go b/internal/database/query/player_configs.gen.go
new file mode 100644
index 0000000..03c27ce
--- /dev/null
+++ b/internal/database/query/player_configs.gen.go
@@ -0,0 +1,463 @@
+// Code generated by gorm.io/gen. DO NOT EDIT.
+// Code generated by gorm.io/gen. DO NOT EDIT.
+// Code generated by gorm.io/gen. DO NOT EDIT.
+
+package query
+
+import (
+	"context"
+	"database/sql"
+
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+	"gorm.io/gorm/schema"
+
+	"gorm.io/gen"
+	"gorm.io/gen/field"
+
+	"gorm.io/plugin/dbresolver"
+
+	"stream.api/internal/database/model"
+)
+
+func newPlayerConfig(db *gorm.DB, opts ...gen.DOOption) playerConfig {
+	_playerConfig := playerConfig{}
+
+	_playerConfig.playerConfigDo.UseDB(db, opts...)
+	_playerConfig.playerConfigDo.UseModel(&model.PlayerConfig{})
+
+	tableName := _playerConfig.playerConfigDo.TableName()
+	_playerConfig.ALL = field.NewAsterisk(tableName)
+	_playerConfig.ID = field.NewString(tableName, "id")
+	_playerConfig.UserID = field.NewString(tableName, "user_id")
+	_playerConfig.Name = field.NewString(tableName, "name")
+	_playerConfig.Description = field.NewString(tableName, "description")
+	_playerConfig.Autoplay = field.NewBool(tableName, "autoplay")
+	_playerConfig.Loop = field.NewBool(tableName, "loop")
+	_playerConfig.Muted = field.NewBool(tableName, "muted")
+	_playerConfig.ShowControls = field.NewBool(tableName, "show_controls")
+	_playerConfig.Pip = field.NewBool(tableName, "pip")
+	_playerConfig.Airplay = field.NewBool(tableName, "airplay")
+	_playerConfig.Chromecast = field.NewBool(tableName, "chromecast")
+	_playerConfig.IsActive = field.NewBool(tableName, "is_active")
+	_playerConfig.IsDefault = field.NewBool(tableName, "is_default")
+	_playerConfig.CreatedAt = field.NewTime(tableName, "created_at")
+	_playerConfig.UpdatedAt = field.NewTime(tableName, "updated_at")
+	_playerConfig.Version = field.NewInt64(tableName, "version")
+	_playerConfig.EncrytionM3u8 = field.NewBool(tableName, "encrytion_m3u8")
+	_playerConfig.LogoURL = field.NewString(tableName, "logo_url")
+
+	_playerConfig.fillFieldMap()
+
+	return _playerConfig
+}
+
+type playerConfig struct {
+	playerConfigDo playerConfigDo
+
+	ALL           field.Asterisk
+	ID            field.String
+	UserID        field.String
+	Name          field.String
+	Description   field.String
+	Autoplay      field.Bool
+	Loop          field.Bool
+	Muted         field.Bool
+	ShowControls  field.Bool
+	Pip           field.Bool
+	Airplay       field.Bool
+	Chromecast    field.Bool
+	IsActive      field.Bool
+	IsDefault     field.Bool
+	CreatedAt     field.Time
+	UpdatedAt     field.Time
+	Version       field.Int64
+	EncrytionM3u8 field.Bool
+	LogoURL       field.String
+
+	fieldMap map[string]field.Expr
+}
+
+func (p playerConfig) Table(newTableName string) *playerConfig {
+	p.playerConfigDo.UseTable(newTableName)
+	return p.updateTableName(newTableName)
+}
+
+func (p playerConfig) As(alias string) *playerConfig {
+	p.playerConfigDo.DO = *(p.playerConfigDo.As(alias).(*gen.DO))
+	return p.updateTableName(alias)
+}
+
+func (p *playerConfig) updateTableName(table string) *playerConfig {
+	p.ALL = field.NewAsterisk(table)
+	p.ID = field.NewString(table, "id")
+	p.UserID = field.NewString(table, "user_id")
+	p.Name = field.NewString(table, "name")
+	p.Description = field.NewString(table, "description")
+	p.Autoplay = field.NewBool(table, "autoplay")
+	p.Loop = field.NewBool(table, "loop")
+	p.Muted = field.NewBool(table, "muted")
+	p.ShowControls = field.NewBool(table, "show_controls")
+	p.Pip = field.NewBool(table, "pip")
+	p.Airplay = field.NewBool(table, "airplay")
+	p.Chromecast = field.NewBool(table, "chromecast")
+	p.IsActive = field.NewBool(table, "is_active")
+	p.IsDefault = field.NewBool(table, "is_default")
+	p.CreatedAt = field.NewTime(table, "created_at")
+	p.UpdatedAt = field.NewTime(table, "updated_at")
+	p.Version = field.NewInt64(table, "version")
+	p.EncrytionM3u8 = field.NewBool(table, "encrytion_m3u8")
+	p.LogoURL = field.NewString(table, "logo_url")
+
+	p.fillFieldMap()
+
+	return p
+}
+
+func (p *playerConfig) WithContext(ctx context.Context) IPlayerConfigDo {
+	return p.playerConfigDo.WithContext(ctx)
+}
+
+func (p playerConfig) TableName() string { return p.playerConfigDo.TableName() }
+
+func (p playerConfig) Alias() string { return p.playerConfigDo.Alias() }
+
+func (p playerConfig) Columns(cols ...field.Expr) gen.Columns {
+	return p.playerConfigDo.Columns(cols...)
+}
+
+func (p *playerConfig) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
+	_f, ok := p.fieldMap[fieldName]
+	if !ok || _f == nil {
+		return nil, false
+	}
+	_oe, ok := _f.(field.OrderExpr)
+	return _oe, ok
+}
+
+func (p *playerConfig) fillFieldMap() {
+	p.fieldMap = make(map[string]field.Expr, 18)
+	p.fieldMap["id"] = p.ID
+	p.fieldMap["user_id"] = p.UserID
+	p.fieldMap["name"] = p.Name
+	p.fieldMap["description"] = p.Description
+	p.fieldMap["autoplay"] = p.Autoplay
+	p.fieldMap["loop"] = p.Loop
+	p.fieldMap["muted"] = p.Muted
+	p.fieldMap["show_controls"] = p.ShowControls
+	p.fieldMap["pip"] = p.Pip
+	p.fieldMap["airplay"] = p.Airplay
+	p.fieldMap["chromecast"] = p.Chromecast
+	p.fieldMap["is_active"] = p.IsActive
+	p.fieldMap["is_default"] = p.IsDefault
+	p.fieldMap["created_at"] = p.CreatedAt
+	p.fieldMap["updated_at"] = p.UpdatedAt
+	p.fieldMap["version"] = p.Version
+	p.fieldMap["encrytion_m3u8"] = p.EncrytionM3u8
+	p.fieldMap["logo_url"] = p.LogoURL
+}
+
+func (p playerConfig) clone(db *gorm.DB) playerConfig {
+	p.playerConfigDo.ReplaceConnPool(db.Statement.ConnPool)
+	return p
+}
+
+func (p playerConfig) replaceDB(db *gorm.DB) playerConfig {
+	p.playerConfigDo.ReplaceDB(db)
+	return p
+}
+
+type playerConfigDo struct{ gen.DO }
+
+type IPlayerConfigDo interface {
+	gen.SubQuery
+	Debug() IPlayerConfigDo
+	WithContext(ctx context.Context) IPlayerConfigDo
+	WithResult(fc func(tx gen.Dao)) gen.ResultInfo
+	ReplaceDB(db *gorm.DB)
+	ReadDB() IPlayerConfigDo
+	WriteDB() IPlayerConfigDo
+	As(alias string) gen.Dao
+	Session(config *gorm.Session) IPlayerConfigDo
+	Columns(cols ...field.Expr) gen.Columns
+	Clauses(conds ...clause.Expression) IPlayerConfigDo
+	Not(conds ...gen.Condition) IPlayerConfigDo
+	Or(conds ...gen.Condition) IPlayerConfigDo
+	Select(conds ...field.Expr) IPlayerConfigDo
+	Where(conds ...gen.Condition) IPlayerConfigDo
+	Order(conds ...field.Expr) IPlayerConfigDo
+	Distinct(cols ...field.Expr) IPlayerConfigDo
+	Omit(cols ...field.Expr) IPlayerConfigDo
+	Join(table schema.Tabler, on ...field.Expr) IPlayerConfigDo
+	LeftJoin(table schema.Tabler, on ...field.Expr) IPlayerConfigDo
+	RightJoin(table schema.Tabler, on ...field.Expr) IPlayerConfigDo
+	Group(cols ...field.Expr) IPlayerConfigDo
+	Having(conds ...gen.Condition) IPlayerConfigDo
+	Limit(limit int) IPlayerConfigDo
+	Offset(offset int) IPlayerConfigDo
+	Count() (count int64, err error)
+	Scopes(funcs ...func(gen.Dao) gen.Dao) IPlayerConfigDo
+	Unscoped() IPlayerConfigDo
+	Create(values ...*model.PlayerConfig) error
+	CreateInBatches(values []*model.PlayerConfig, batchSize int) error
+	Save(values ...*model.PlayerConfig) error
+	First() (*model.PlayerConfig, error)
+	Take() (*model.PlayerConfig, error)
+	Last() (*model.PlayerConfig, error)
+	Find() ([]*model.PlayerConfig, error)
+	FindInBatch(batchSize int, fc func(tx gen.Dao, batch int) error) (results []*model.PlayerConfig, err error)
+	FindInBatches(result *[]*model.PlayerConfig, batchSize int, fc func(tx gen.Dao, batch int) error) error
+	Pluck(column field.Expr, dest interface{}) error
+	Delete(...*model.PlayerConfig) (info gen.ResultInfo, err error)
+	Update(column field.Expr, value interface{}) (info gen.ResultInfo, err error)
+	UpdateSimple(columns ...field.AssignExpr) (info gen.ResultInfo, err error)
+	Updates(value interface{}) (info gen.ResultInfo, err error)
+	UpdateColumn(column field.Expr, value interface{}) (info gen.ResultInfo, err error)
+	UpdateColumnSimple(columns ...field.AssignExpr) (info gen.ResultInfo, err error)
+	UpdateColumns(value interface{}) (info gen.ResultInfo, err error)
+	UpdateFrom(q gen.SubQuery) gen.Dao
+	Attrs(attrs ...field.AssignExpr) IPlayerConfigDo
+	Assign(attrs ...field.AssignExpr) IPlayerConfigDo
+	Joins(fields ...field.RelationField) IPlayerConfigDo
+	Preload(fields ...field.RelationField) IPlayerConfigDo
+	FirstOrInit() (*model.PlayerConfig, error)
+	FirstOrCreate() (*model.PlayerConfig, error)
+	FindByPage(offset int, limit int) (result []*model.PlayerConfig, count int64, err error)
+	ScanByPage(result interface{}, offset int, limit int) (count int64, err error)
+	Rows() (*sql.Rows, error)
+	Row() *sql.Row
+	Scan(result interface{}) (err error)
+	Returning(value interface{}, columns ...string) IPlayerConfigDo
+	UnderlyingDB() *gorm.DB
+	schema.Tabler
+}
+
+func (p playerConfigDo) Debug() IPlayerConfigDo {
+	return p.withDO(p.DO.Debug())
+}
+
+func (p playerConfigDo) WithContext(ctx context.Context) IPlayerConfigDo {
+	return p.withDO(p.DO.WithContext(ctx))
+}
+
+func (p playerConfigDo) ReadDB() IPlayerConfigDo {
+	return p.Clauses(dbresolver.Read)
+}
+
+func (p playerConfigDo) WriteDB() IPlayerConfigDo {
+	return p.Clauses(dbresolver.Write)
+}
+
+func (p playerConfigDo) Session(config *gorm.Session) IPlayerConfigDo {
+	return p.withDO(p.DO.Session(config))
+}
+
+func (p playerConfigDo) Clauses(conds ...clause.Expression) IPlayerConfigDo {
+	return p.withDO(p.DO.Clauses(conds...))
+}
+
+func (p playerConfigDo) Returning(value interface{}, columns ...string) IPlayerConfigDo {
+	return p.withDO(p.DO.Returning(value, columns...))
+}
+
+func (p playerConfigDo) Not(conds ...gen.Condition) IPlayerConfigDo {
+	return p.withDO(p.DO.Not(conds...))
+}
+
+func (p playerConfigDo) Or(conds ...gen.Condition) IPlayerConfigDo {
+	return p.withDO(p.DO.Or(conds...))
+}
+
+func (p playerConfigDo) Select(conds ...field.Expr) IPlayerConfigDo {
+	return p.withDO(p.DO.Select(conds...))
+}
+
+func (p playerConfigDo) Where(conds ...gen.Condition) IPlayerConfigDo {
+	return p.withDO(p.DO.Where(conds...))
+}
+
+func (p playerConfigDo) Order(conds ...field.Expr) IPlayerConfigDo {
+	return p.withDO(p.DO.Order(conds...))
+}
+
+func (p playerConfigDo) Distinct(cols ...field.Expr) IPlayerConfigDo {
+	return p.withDO(p.DO.Distinct(cols...))
+}
+
+func (p playerConfigDo) Omit(cols ...field.Expr) IPlayerConfigDo {
+	return p.withDO(p.DO.Omit(cols...))
+}
+
+func (p playerConfigDo) Join(table schema.Tabler, on ...field.Expr) IPlayerConfigDo {
+	return p.withDO(p.DO.Join(table, on...))
+}
+
+func (p playerConfigDo) LeftJoin(table schema.Tabler, on ...field.Expr) IPlayerConfigDo {
+	return p.withDO(p.DO.LeftJoin(table, on...))
+}
+
+func (p playerConfigDo) RightJoin(table schema.Tabler, on ...field.Expr) IPlayerConfigDo {
+	return p.withDO(p.DO.RightJoin(table, on...))
+}
+
+func (p playerConfigDo) Group(cols ...field.Expr) IPlayerConfigDo {
+	return p.withDO(p.DO.Group(cols...))
+}
+
+func (p playerConfigDo) Having(conds ...gen.Condition) IPlayerConfigDo {
+	return p.withDO(p.DO.Having(conds...))
+}
+
+func (p playerConfigDo) Limit(limit int) IPlayerConfigDo {
+	return p.withDO(p.DO.Limit(limit))
+}
+
+func (p playerConfigDo) Offset(offset int) IPlayerConfigDo {
+	return p.withDO(p.DO.Offset(offset))
+}
+
+func (p playerConfigDo) Scopes(funcs ...func(gen.Dao) gen.Dao) IPlayerConfigDo {
+	return p.withDO(p.DO.Scopes(funcs...))
+}
+
+func (p playerConfigDo) Unscoped() IPlayerConfigDo {
+	return p.withDO(p.DO.Unscoped())
+}
+
+func (p playerConfigDo) Create(values ...*model.PlayerConfig) error {
+	if len(values) == 0 {
+		return nil
+	}
+	return p.DO.Create(values)
+}
+
+func (p playerConfigDo) CreateInBatches(values []*model.PlayerConfig, batchSize int) error {
+	return p.DO.CreateInBatches(values, batchSize)
+}
+
+// Save : !!! underlying implementation is different with GORM
+// The method is equivalent to executing the statement: db.Clauses(clause.OnConflict{UpdateAll: true}).Create(values)
+func (p playerConfigDo) Save(values ...*model.PlayerConfig) error {
+	if len(values) == 0 {
+		return nil
+	}
+	return p.DO.Save(values)
+}
+
+func (p playerConfigDo) First() (*model.PlayerConfig, error) {
+	if result, err := p.DO.First(); err != nil {
+		return nil, err
+	} else {
+		return result.(*model.PlayerConfig), nil
+	}
+}
+
+func (p playerConfigDo) Take() (*model.PlayerConfig, error) {
+	if result, err := p.DO.Take(); err != nil {
+		return nil, err
+	} else {
+		return result.(*model.PlayerConfig), nil
+	}
+}
+
+func (p playerConfigDo) Last() (*model.PlayerConfig, error) {
+	if result, err := p.DO.Last(); err != nil {
+		return nil, err
+	} else {
+		return result.(*model.PlayerConfig), nil
+	}
+}
+
+func (p playerConfigDo) Find() ([]*model.PlayerConfig, error) {
+	result, err := p.DO.Find()
+	return result.([]*model.PlayerConfig), err
+}
+
+func (p playerConfigDo) FindInBatch(batchSize int, fc func(tx gen.Dao, batch int) error) (results []*model.PlayerConfig, err error) {
+	buf := make([]*model.PlayerConfig, 0, batchSize)
+	err = p.DO.FindInBatches(&buf, batchSize, func(tx gen.Dao, batch int) error {
+		defer func() { results = append(results, buf...) }()
+		return fc(tx, batch)
+	})
+	return results, err
+}
+
+func (p playerConfigDo) FindInBatches(result *[]*model.PlayerConfig, batchSize int, fc func(tx gen.Dao, batch int) error) error {
+	return p.DO.FindInBatches(result, batchSize, fc)
+}
+
+func (p playerConfigDo) Attrs(attrs ...field.AssignExpr) IPlayerConfigDo {
+	return p.withDO(p.DO.Attrs(attrs...))
+}
+
+func (p playerConfigDo) Assign(attrs ...field.AssignExpr) IPlayerConfigDo {
+	return p.withDO(p.DO.Assign(attrs...))
+}
+
+func (p playerConfigDo) Joins(fields ...field.RelationField) IPlayerConfigDo {
+	for _, _f := range fields {
+		p = *p.withDO(p.DO.Joins(_f))
+	}
+	return &p
+}
+
+func (p playerConfigDo) Preload(fields ...field.RelationField) IPlayerConfigDo {
+	for _, _f := range fields {
+		p = *p.withDO(p.DO.Preload(_f))
+	}
+	return &p
+}
+
+func (p playerConfigDo) FirstOrInit() (*model.PlayerConfig, error) {
+	if result, err := p.DO.FirstOrInit(); err != nil {
+		return nil, err
+	} else {
+		return result.(*model.PlayerConfig), nil
+	}
+}
+
+func (p playerConfigDo) FirstOrCreate() (*model.PlayerConfig, error) {
+	if result, err := p.DO.FirstOrCreate(); err != nil {
+		return nil, err
+	} else {
+		return result.(*model.PlayerConfig), nil
+	}
+}
+
+func (p playerConfigDo) FindByPage(offset int, limit int) (result []*model.PlayerConfig, count int64, err error) {
+	result, err = p.Offset(offset).Limit(limit).Find()
+	if err != nil {
+		return
+	}
+
+	if size := len(result); 0 < limit && 0 < size && size < limit {
+		count = int64(size + offset)
+		return
+	}
+
+	count, err = p.Offset(-1).Limit(-1).Count()
+	return
+}
+
+func (p playerConfigDo) ScanByPage(result interface{}, offset int, limit int) (count int64, err error) {
+	count, err = p.Count()
+	if err != nil {
+		return
+	}
+
+	err = p.Offset(offset).Limit(limit).Scan(result)
+	return
+}
+
+func (p playerConfigDo) Scan(result interface{}) (err error) {
+	return p.DO.Scan(result)
+}
+
+func (p playerConfigDo) Delete(models ...*model.PlayerConfig) (result gen.ResultInfo, err error) {
+	return p.DO.Delete(models)
+}
+
+func (p *playerConfigDo) withDO(do gen.Dao) *playerConfigDo {
+	p.DO = *do.(*gen.DO)
+	return p
+}
diff --git a/internal/database/query/user.gen.go b/internal/database/query/user.gen.go
index 4ab236d..f524eef 100644
--- a/internal/database/query/user.gen.go
+++ b/internal/database/query/user.gen.go
@@ -37,9 +37,16 @@ func newUser(db *gorm.DB, opts ...gen.DOOption) user {
 	_user.GoogleID = field.NewString(tableName, "google_id")
 	_user.StorageUsed = field.NewInt64(tableName, "storage_used")
 	_user.PlanID = field.NewString(tableName, "plan_id")
+	_user.ReferredByUserID = field.NewString(tableName, "referred_by_user_id")
+	_user.ReferralEligible = field.NewBool(tableName, "referral_eligible")
+	_user.ReferralRewardBps = field.NewInt32(tableName, "referral_reward_bps")
+	_user.ReferralRewardGrantedAt = field.NewTime(tableName, "referral_reward_granted_at")
+	_user.ReferralRewardPaymentID = field.NewString(tableName, "referral_reward_payment_id")
+	_user.ReferralRewardAmount = field.NewFloat64(tableName, "referral_reward_amount")
 	_user.CreatedAt = field.NewTime(tableName, "created_at")
 	_user.UpdatedAt = field.NewTime(tableName, "updated_at")
 	_user.Version = field.NewInt64(tableName, "version")
+	_user.TelegramID = field.NewString(tableName, "telegram_id")
 
 	_user.fillFieldMap()
 
@@ -57,11 +64,18 @@ type user struct {
 	Avatar      field.String
 	Role        field.String
 	GoogleID    field.String
-	StorageUsed field.Int64
-	PlanID      field.String
-	CreatedAt   field.Time
-	UpdatedAt   field.Time
-	Version     field.Int64
+	StorageUsed             field.Int64
+	PlanID                  field.String
+	ReferredByUserID        field.String
+	ReferralEligible        field.Bool
+	ReferralRewardBps       field.Int32
+	ReferralRewardGrantedAt field.Time
+	ReferralRewardPaymentID field.String
+	ReferralRewardAmount    field.Float64
+	CreatedAt               field.Time
+	UpdatedAt               field.Time
+	Version                 field.Int64
+	TelegramID              field.String
 
 	fieldMap map[string]field.Expr
 }
@@ -87,9 +101,16 @@ func (u *user) updateTableName(table string) *user {
 	u.GoogleID = field.NewString(table, "google_id")
 	u.StorageUsed = field.NewInt64(table, "storage_used")
 	u.PlanID = field.NewString(table, "plan_id")
+	u.ReferredByUserID = field.NewString(table, "referred_by_user_id")
+	u.ReferralEligible = field.NewBool(table, "referral_eligible")
+	u.ReferralRewardBps = field.NewInt32(table, "referral_reward_bps")
+	u.ReferralRewardGrantedAt = field.NewTime(table, "referral_reward_granted_at")
+	u.ReferralRewardPaymentID = field.NewString(table, "referral_reward_payment_id")
+	u.ReferralRewardAmount = field.NewFloat64(table, "referral_reward_amount")
 	u.CreatedAt = field.NewTime(table, "created_at")
 	u.UpdatedAt = field.NewTime(table, "updated_at")
 	u.Version = field.NewInt64(table, "version")
+	u.TelegramID = field.NewString(table, "telegram_id")
 
 	u.fillFieldMap()
 
@@ -114,7 +135,7 @@ func (u *user) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 }
 
 func (u *user) fillFieldMap() {
-	u.fieldMap = make(map[string]field.Expr, 12)
+	u.fieldMap = make(map[string]field.Expr, 19)
 	u.fieldMap["id"] = u.ID
 	u.fieldMap["email"] = u.Email
 	u.fieldMap["password"] = u.Password
@@ -124,9 +145,16 @@ func (u *user) fillFieldMap() {
 	u.fieldMap["google_id"] = u.GoogleID
 	u.fieldMap["storage_used"] = u.StorageUsed
 	u.fieldMap["plan_id"] = u.PlanID
+	u.fieldMap["referred_by_user_id"] = u.ReferredByUserID
+	u.fieldMap["referral_eligible"] = u.ReferralEligible
+	u.fieldMap["referral_reward_bps"] = u.ReferralRewardBps
+	u.fieldMap["referral_reward_granted_at"] = u.ReferralRewardGrantedAt
+	u.fieldMap["referral_reward_payment_id"] = u.ReferralRewardPaymentID
+	u.fieldMap["referral_reward_amount"] = u.ReferralRewardAmount
 	u.fieldMap["created_at"] = u.CreatedAt
 	u.fieldMap["updated_at"] = u.UpdatedAt
 	u.fieldMap["version"] = u.Version
+	u.fieldMap["telegram_id"] = u.TelegramID
 }
 
 func (u user) clone(db *gorm.DB) user {
diff --git a/internal/database/query/user_preferences.gen.go b/internal/database/query/user_preferences.gen.go
index 8e94618..edc6105 100644
--- a/internal/database/query/user_preferences.gen.go
+++ b/internal/database/query/user_preferences.gen.go
@@ -35,16 +35,8 @@ func newUserPreference(db *gorm.DB, opts ...gen.DOOption) userPreference {
 	_userPreference.PushNotifications = field.NewBool(tableName, "push_notifications")
 	_userPreference.MarketingNotifications = field.NewBool(tableName, "marketing_notifications")
 	_userPreference.TelegramNotifications = field.NewBool(tableName, "telegram_notifications")
-	_userPreference.Autoplay = field.NewBool(tableName, "autoplay")
-	_userPreference.Loop = field.NewBool(tableName, "loop")
-	_userPreference.Muted = field.NewBool(tableName, "muted")
-	_userPreference.ShowControls = field.NewBool(tableName, "show_controls")
-	_userPreference.Pip = field.NewBool(tableName, "pip")
-	_userPreference.Airplay = field.NewBool(tableName, "airplay")
-	_userPreference.Chromecast = field.NewBool(tableName, "chromecast")
 	_userPreference.CreatedAt = field.NewTime(tableName, "created_at")
 	_userPreference.UpdatedAt = field.NewTime(tableName, "updated_at")
-	_userPreference.EncrytionM3u8 = field.NewBool(tableName, "encrytion_m3u8")
 	_userPreference.Version = field.NewInt64(tableName, "version")
 
 	_userPreference.fillFieldMap()
@@ -63,16 +55,8 @@ type userPreference struct {
 	PushNotifications      field.Bool
 	MarketingNotifications field.Bool
 	TelegramNotifications  field.Bool
-	Autoplay               field.Bool
-	Loop                   field.Bool
-	Muted                  field.Bool
-	ShowControls           field.Bool
-	Pip                    field.Bool
-	Airplay                field.Bool
-	Chromecast             field.Bool
 	CreatedAt              field.Time
 	UpdatedAt              field.Time
-	EncrytionM3u8          field.Bool
 	Version                field.Int64
 
 	fieldMap map[string]field.Expr
@@ -97,16 +81,8 @@ func (u *userPreference) updateTableName(table string) *userPreference {
 	u.PushNotifications = field.NewBool(table, "push_notifications")
 	u.MarketingNotifications = field.NewBool(table, "marketing_notifications")
 	u.TelegramNotifications = field.NewBool(table, "telegram_notifications")
-	u.Autoplay = field.NewBool(table, "autoplay")
-	u.Loop = field.NewBool(table, "loop")
-	u.Muted = field.NewBool(table, "muted")
-	u.ShowControls = field.NewBool(table, "show_controls")
-	u.Pip = field.NewBool(table, "pip")
-	u.Airplay = field.NewBool(table, "airplay")
-	u.Chromecast = field.NewBool(table, "chromecast")
 	u.CreatedAt = field.NewTime(table, "created_at")
 	u.UpdatedAt = field.NewTime(table, "updated_at")
-	u.EncrytionM3u8 = field.NewBool(table, "encrytion_m3u8")
 	u.Version = field.NewInt64(table, "version")
 
 	u.fillFieldMap()
@@ -136,7 +112,7 @@ func (u *userPreference) GetFieldByName(fieldName string) (field.OrderExpr, bool
 }
 
 func (u *userPreference) fillFieldMap() {
-	u.fieldMap = make(map[string]field.Expr, 18)
+	u.fieldMap = make(map[string]field.Expr, 10)
 	u.fieldMap["user_id"] = u.UserID
 	u.fieldMap["language"] = u.Language
 	u.fieldMap["locale"] = u.Locale
@@ -144,16 +120,8 @@ func (u *userPreference) fillFieldMap() {
 	u.fieldMap["push_notifications"] = u.PushNotifications
 	u.fieldMap["marketing_notifications"] = u.MarketingNotifications
 	u.fieldMap["telegram_notifications"] = u.TelegramNotifications
-	u.fieldMap["autoplay"] = u.Autoplay
-	u.fieldMap["loop"] = u.Loop
-	u.fieldMap["muted"] = u.Muted
-	u.fieldMap["show_controls"] = u.ShowControls
-	u.fieldMap["pip"] = u.Pip
-	u.fieldMap["airplay"] = u.Airplay
-	u.fieldMap["chromecast"] = u.Chromecast
 	u.fieldMap["created_at"] = u.CreatedAt
 	u.fieldMap["updated_at"] = u.UpdatedAt
-	u.fieldMap["encrytion_m3u8"] = u.EncrytionM3u8
 	u.fieldMap["version"] = u.Version
 }
 
diff --git a/internal/database/query/video.gen.go b/internal/database/query/video.gen.go
index 5df4a80..db358b6 100644
--- a/internal/database/query/video.gen.go
+++ b/internal/database/query/video.gen.go
@@ -47,6 +47,8 @@ func newVideo(db *gorm.DB, opts ...gen.DOOption) video {
 	_video.CreatedAt = field.NewTime(tableName, "created_at")
 	_video.UpdatedAt = field.NewTime(tableName, "updated_at")
 	_video.Version = field.NewInt64(tableName, "version")
+	_video.AdID = field.NewString(tableName, "ad_id")
+	_video.Metadata = field.NewField(tableName, "metadata")
 
 	_video.fillFieldMap()
 
@@ -76,6 +78,8 @@ type video struct {
 	CreatedAt        field.Time
 	UpdatedAt        field.Time
 	Version          field.Int64
+	AdID             field.String
+	Metadata         field.Field
 
 	fieldMap map[string]field.Expr
 }
@@ -111,6 +115,8 @@ func (v *video) updateTableName(table string) *video {
 	v.CreatedAt = field.NewTime(table, "created_at")
 	v.UpdatedAt = field.NewTime(table, "updated_at")
 	v.Version = field.NewInt64(table, "version")
+	v.AdID = field.NewString(table, "ad_id")
+	v.Metadata = field.NewField(table, "metadata")
 
 	v.fillFieldMap()
 
@@ -135,7 +141,7 @@ func (v *video) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 }
 
 func (v *video) fillFieldMap() {
-	v.fieldMap = make(map[string]field.Expr, 19)
+	v.fieldMap = make(map[string]field.Expr, 21)
 	v.fieldMap["id"] = v.ID
 	v.fieldMap["name"] = v.Name
 	v.fieldMap["title"] = v.Title
@@ -155,6 +161,8 @@ func (v *video) fillFieldMap() {
 	v.fieldMap["created_at"] = v.CreatedAt
 	v.fieldMap["updated_at"] = v.UpdatedAt
 	v.fieldMap["version"] = v.Version
+	v.fieldMap["ad_id"] = v.AdID
+	v.fieldMap["metadata"] = v.Metadata
 }
 
 func (v video) clone(db *gorm.DB) video {
diff --git a/internal/database/query/video_ad_configs.gen.go b/internal/database/query/video_ad_configs.gen.go
deleted file mode 100644
index 5eb3c9a..0000000
--- a/internal/database/query/video_ad_configs.gen.go
+++ /dev/null
@@ -1,427 +0,0 @@
-// Code generated by gorm.io/gen. DO NOT EDIT.
-// Code generated by gorm.io/gen. DO NOT EDIT.
-// Code generated by gorm.io/gen. DO NOT EDIT.
-
-package query
-
-import (
-	"context"
-	"database/sql"
-
-	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-	"gorm.io/gorm/schema"
-
-	"gorm.io/gen"
-	"gorm.io/gen/field"
-
-	"gorm.io/plugin/dbresolver"
-
-	"stream.api/internal/database/model"
-)
-
-func newVideoAdConfig(db *gorm.DB, opts ...gen.DOOption) videoAdConfig {
-	_videoAdConfig := videoAdConfig{}
-
-	_videoAdConfig.videoAdConfigDo.UseDB(db, opts...)
-	_videoAdConfig.videoAdConfigDo.UseModel(&model.VideoAdConfig{})
-
-	tableName := _videoAdConfig.videoAdConfigDo.TableName()
-	_videoAdConfig.ALL = field.NewAsterisk(tableName)
-	_videoAdConfig.VideoID = field.NewString(tableName, "video_id")
-	_videoAdConfig.UserID = field.NewString(tableName, "user_id")
-	_videoAdConfig.AdTemplateID = field.NewString(tableName, "ad_template_id")
-	_videoAdConfig.VastTagURL = field.NewString(tableName, "vast_tag_url")
-	_videoAdConfig.AdFormat = field.NewString(tableName, "ad_format")
-	_videoAdConfig.Duration = field.NewInt64(tableName, "duration")
-	_videoAdConfig.CreatedAt = field.NewTime(tableName, "created_at")
-	_videoAdConfig.UpdatedAt = field.NewTime(tableName, "updated_at")
-	_videoAdConfig.Version = field.NewInt64(tableName, "version")
-
-	_videoAdConfig.fillFieldMap()
-
-	return _videoAdConfig
-}
-
-type videoAdConfig struct {
-	videoAdConfigDo videoAdConfigDo
-
-	ALL          field.Asterisk
-	VideoID      field.String
-	UserID       field.String
-	AdTemplateID field.String
-	VastTagURL   field.String
-	AdFormat     field.String
-	Duration     field.Int64
-	CreatedAt    field.Time
-	UpdatedAt    field.Time
-	Version      field.Int64
-
-	fieldMap map[string]field.Expr
-}
-
-func (v videoAdConfig) Table(newTableName string) *videoAdConfig {
-	v.videoAdConfigDo.UseTable(newTableName)
-	return v.updateTableName(newTableName)
-}
-
-func (v videoAdConfig) As(alias string) *videoAdConfig {
-	v.videoAdConfigDo.DO = *(v.videoAdConfigDo.As(alias).(*gen.DO))
-	return v.updateTableName(alias)
-}
-
-func (v *videoAdConfig) updateTableName(table string) *videoAdConfig {
-	v.ALL = field.NewAsterisk(table)
-	v.VideoID = field.NewString(table, "video_id")
-	v.UserID = field.NewString(table, "user_id")
-	v.AdTemplateID = field.NewString(table, "ad_template_id")
-	v.VastTagURL = field.NewString(table, "vast_tag_url")
-	v.AdFormat = field.NewString(table, "ad_format")
-	v.Duration = field.NewInt64(table, "duration")
-	v.CreatedAt = field.NewTime(table, "created_at")
-	v.UpdatedAt = field.NewTime(table, "updated_at")
-	v.Version = field.NewInt64(table, "version")
-
-	v.fillFieldMap()
-
-	return v
-}
-
-func (v *videoAdConfig) WithContext(ctx context.Context) IVideoAdConfigDo {
-	return v.videoAdConfigDo.WithContext(ctx)
-}
-
-func (v videoAdConfig) TableName() string { return v.videoAdConfigDo.TableName() }
-
-func (v videoAdConfig) Alias() string { return v.videoAdConfigDo.Alias() }
-
-func (v videoAdConfig) Columns(cols ...field.Expr) gen.Columns {
-	return v.videoAdConfigDo.Columns(cols...)
-}
-
-func (v *videoAdConfig) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
-	_f, ok := v.fieldMap[fieldName]
-	if !ok || _f == nil {
-		return nil, false
-	}
-	_oe, ok := _f.(field.OrderExpr)
-	return _oe, ok
-}
-
-func (v *videoAdConfig) fillFieldMap() {
-	v.fieldMap = make(map[string]field.Expr, 9)
-	v.fieldMap["video_id"] = v.VideoID
-	v.fieldMap["user_id"] = v.UserID
-	v.fieldMap["ad_template_id"] = v.AdTemplateID
-	v.fieldMap["vast_tag_url"] = v.VastTagURL
-	v.fieldMap["ad_format"] = v.AdFormat
-	v.fieldMap["duration"] = v.Duration
-	v.fieldMap["created_at"] = v.CreatedAt
-	v.fieldMap["updated_at"] = v.UpdatedAt
-	v.fieldMap["version"] = v.Version
-}
-
-func (v videoAdConfig) clone(db *gorm.DB) videoAdConfig {
-	v.videoAdConfigDo.ReplaceConnPool(db.Statement.ConnPool)
-	return v
-}
-
-func (v videoAdConfig) replaceDB(db *gorm.DB) videoAdConfig {
-	v.videoAdConfigDo.ReplaceDB(db)
-	return v
-}
-
-type videoAdConfigDo struct{ gen.DO }
-
-type IVideoAdConfigDo interface {
-	gen.SubQuery
-	Debug() IVideoAdConfigDo
-	WithContext(ctx context.Context) IVideoAdConfigDo
-	WithResult(fc func(tx gen.Dao)) gen.ResultInfo
-	ReplaceDB(db *gorm.DB)
-	ReadDB() IVideoAdConfigDo
-	WriteDB() IVideoAdConfigDo
-	As(alias string) gen.Dao
-	Session(config *gorm.Session) IVideoAdConfigDo
-	Columns(cols ...field.Expr) gen.Columns
-	Clauses(conds ...clause.Expression) IVideoAdConfigDo
-	Not(conds ...gen.Condition) IVideoAdConfigDo
-	Or(conds ...gen.Condition) IVideoAdConfigDo
-	Select(conds ...field.Expr) IVideoAdConfigDo
-	Where(conds ...gen.Condition) IVideoAdConfigDo
-	Order(conds ...field.Expr) IVideoAdConfigDo
-	Distinct(cols ...field.Expr) IVideoAdConfigDo
-	Omit(cols ...field.Expr) IVideoAdConfigDo
-	Join(table schema.Tabler, on ...field.Expr) IVideoAdConfigDo
-	LeftJoin(table schema.Tabler, on ...field.Expr) IVideoAdConfigDo
-	RightJoin(table schema.Tabler, on ...field.Expr) IVideoAdConfigDo
-	Group(cols ...field.Expr) IVideoAdConfigDo
-	Having(conds ...gen.Condition) IVideoAdConfigDo
-	Limit(limit int) IVideoAdConfigDo
-	Offset(offset int) IVideoAdConfigDo
-	Count() (count int64, err error)
-	Scopes(funcs ...func(gen.Dao) gen.Dao) IVideoAdConfigDo
-	Unscoped() IVideoAdConfigDo
-	Create(values ...*model.VideoAdConfig) error
-	CreateInBatches(values []*model.VideoAdConfig, batchSize int) error
-	Save(values ...*model.VideoAdConfig) error
-	First() (*model.VideoAdConfig, error)
-	Take() (*model.VideoAdConfig, error)
-	Last() (*model.VideoAdConfig, error)
-	Find() ([]*model.VideoAdConfig, error)
-	FindInBatch(batchSize int, fc func(tx gen.Dao, batch int) error) (results []*model.VideoAdConfig, err error)
-	FindInBatches(result *[]*model.VideoAdConfig, batchSize int, fc func(tx gen.Dao, batch int) error) error
-	Pluck(column field.Expr, dest interface{}) error
-	Delete(...*model.VideoAdConfig) (info gen.ResultInfo, err error)
-	Update(column field.Expr, value interface{}) (info gen.ResultInfo, err error)
-	UpdateSimple(columns ...field.AssignExpr) (info gen.ResultInfo, err error)
-	Updates(value interface{}) (info gen.ResultInfo, err error)
-	UpdateColumn(column field.Expr, value interface{}) (info gen.ResultInfo, err error)
-	UpdateColumnSimple(columns ...field.AssignExpr) (info gen.ResultInfo, err error)
-	UpdateColumns(value interface{}) (info gen.ResultInfo, err error)
-	UpdateFrom(q gen.SubQuery) gen.Dao
-	Attrs(attrs ...field.AssignExpr) IVideoAdConfigDo
-	Assign(attrs ...field.AssignExpr) IVideoAdConfigDo
-	Joins(fields ...field.RelationField) IVideoAdConfigDo
-	Preload(fields ...field.RelationField) IVideoAdConfigDo
-	FirstOrInit() (*model.VideoAdConfig, error)
-	FirstOrCreate() (*model.VideoAdConfig, error)
-	FindByPage(offset int, limit int) (result []*model.VideoAdConfig, count int64, err error)
-	ScanByPage(result interface{}, offset int, limit int) (count int64, err error)
-	Rows() (*sql.Rows, error)
-	Row() *sql.Row
-	Scan(result interface{}) (err error)
-	Returning(value interface{}, columns ...string) IVideoAdConfigDo
-	UnderlyingDB() *gorm.DB
-	schema.Tabler
-}
-
-func (v videoAdConfigDo) Debug() IVideoAdConfigDo {
-	return v.withDO(v.DO.Debug())
-}
-
-func (v videoAdConfigDo) WithContext(ctx context.Context) IVideoAdConfigDo {
-	return v.withDO(v.DO.WithContext(ctx))
-}
-
-func (v videoAdConfigDo) ReadDB() IVideoAdConfigDo {
-	return v.Clauses(dbresolver.Read)
-}
-
-func (v videoAdConfigDo) WriteDB() IVideoAdConfigDo {
-	return v.Clauses(dbresolver.Write)
-}
-
-func (v videoAdConfigDo) Session(config *gorm.Session) IVideoAdConfigDo {
-	return v.withDO(v.DO.Session(config))
-}
-
-func (v videoAdConfigDo) Clauses(conds ...clause.Expression) IVideoAdConfigDo {
-	return v.withDO(v.DO.Clauses(conds...))
-}
-
-func (v videoAdConfigDo) Returning(value interface{}, columns ...string) IVideoAdConfigDo {
-	return v.withDO(v.DO.Returning(value, columns...))
-}
-
-func (v videoAdConfigDo) Not(conds ...gen.Condition) IVideoAdConfigDo {
-	return v.withDO(v.DO.Not(conds...))
-}
-
-func (v videoAdConfigDo) Or(conds ...gen.Condition) IVideoAdConfigDo {
-	return v.withDO(v.DO.Or(conds...))
-}
-
-func (v videoAdConfigDo) Select(conds ...field.Expr) IVideoAdConfigDo {
-	return v.withDO(v.DO.Select(conds...))
-}
-
-func (v videoAdConfigDo) Where(conds ...gen.Condition) IVideoAdConfigDo {
-	return v.withDO(v.DO.Where(conds...))
-}
-
-func (v videoAdConfigDo) Order(conds ...field.Expr) IVideoAdConfigDo {
-	return v.withDO(v.DO.Order(conds...))
-}
-
-func (v videoAdConfigDo) Distinct(cols ...field.Expr) IVideoAdConfigDo {
-	return v.withDO(v.DO.Distinct(cols...))
-}
-
-func (v videoAdConfigDo) Omit(cols ...field.Expr) IVideoAdConfigDo {
-	return v.withDO(v.DO.Omit(cols...))
-}
-
-func (v videoAdConfigDo) Join(table schema.Tabler, on ...field.Expr) IVideoAdConfigDo {
-	return v.withDO(v.DO.Join(table, on...))
-}
-
-func (v videoAdConfigDo) LeftJoin(table schema.Tabler, on ...field.Expr) IVideoAdConfigDo {
-	return v.withDO(v.DO.LeftJoin(table, on...))
-}
-
-func (v videoAdConfigDo) RightJoin(table schema.Tabler, on ...field.Expr) IVideoAdConfigDo {
-	return v.withDO(v.DO.RightJoin(table, on...))
-}
-
-func (v videoAdConfigDo) Group(cols ...field.Expr) IVideoAdConfigDo {
-	return v.withDO(v.DO.Group(cols...))
-}
-
-func (v videoAdConfigDo) Having(conds ...gen.Condition) IVideoAdConfigDo {
-	return v.withDO(v.DO.Having(conds...))
-}
-
-func (v videoAdConfigDo) Limit(limit int) IVideoAdConfigDo {
-	return v.withDO(v.DO.Limit(limit))
-}
-
-func (v videoAdConfigDo) Offset(offset int) IVideoAdConfigDo {
-	return v.withDO(v.DO.Offset(offset))
-}
-
-func (v videoAdConfigDo) Scopes(funcs ...func(gen.Dao) gen.Dao) IVideoAdConfigDo {
-	return v.withDO(v.DO.Scopes(funcs...))
-}
-
-func (v videoAdConfigDo) Unscoped() IVideoAdConfigDo {
-	return v.withDO(v.DO.Unscoped())
-}
-
-func (v videoAdConfigDo) Create(values ...*model.VideoAdConfig) error {
-	if len(values) == 0 {
-		return nil
-	}
-	return v.DO.Create(values)
-}
-
-func (v videoAdConfigDo) CreateInBatches(values []*model.VideoAdConfig, batchSize int) error {
-	return v.DO.CreateInBatches(values, batchSize)
-}
-
-// Save : !!! underlying implementation is different with GORM
-// The method is equivalent to executing the statement: db.Clauses(clause.OnConflict{UpdateAll: true}).Create(values)
-func (v videoAdConfigDo) Save(values ...*model.VideoAdConfig) error {
-	if len(values) == 0 {
-		return nil
-	}
-	return v.DO.Save(values)
-}
-
-func (v videoAdConfigDo) First() (*model.VideoAdConfig, error) {
-	if result, err := v.DO.First(); err != nil {
-		return nil, err
-	} else {
-		return result.(*model.VideoAdConfig), nil
-	}
-}
-
-func (v videoAdConfigDo) Take() (*model.VideoAdConfig, error) {
-	if result, err := v.DO.Take(); err != nil {
-		return nil, err
-	} else {
-		return result.(*model.VideoAdConfig), nil
-	}
-}
-
-func (v videoAdConfigDo) Last() (*model.VideoAdConfig, error) {
-	if result, err := v.DO.Last(); err != nil {
-		return nil, err
-	} else {
-		return result.(*model.VideoAdConfig), nil
-	}
-}
-
-func (v videoAdConfigDo) Find() ([]*model.VideoAdConfig, error) {
-	result, err := v.DO.Find()
-	return result.([]*model.VideoAdConfig), err
-}
-
-func (v videoAdConfigDo) FindInBatch(batchSize int, fc func(tx gen.Dao, batch int) error) (results []*model.VideoAdConfig, err error) {
-	buf := make([]*model.VideoAdConfig, 0, batchSize)
-	err = v.DO.FindInBatches(&buf, batchSize, func(tx gen.Dao, batch int) error {
-		defer func() { results = append(results, buf...) }()
-		return fc(tx, batch)
-	})
-	return results, err
-}
-
-func (v videoAdConfigDo) FindInBatches(result *[]*model.VideoAdConfig, batchSize int, fc func(tx gen.Dao, batch int) error) error {
-	return v.DO.FindInBatches(result, batchSize, fc)
-}
-
-func (v videoAdConfigDo) Attrs(attrs ...field.AssignExpr) IVideoAdConfigDo {
-	return v.withDO(v.DO.Attrs(attrs...))
-}
-
-func (v videoAdConfigDo) Assign(attrs ...field.AssignExpr) IVideoAdConfigDo {
-	return v.withDO(v.DO.Assign(attrs...))
-}
-
-func (v videoAdConfigDo) Joins(fields ...field.RelationField) IVideoAdConfigDo {
-	for _, _f := range fields {
-		v = *v.withDO(v.DO.Joins(_f))
-	}
-	return &v
-}
-
-func (v videoAdConfigDo) Preload(fields ...field.RelationField) IVideoAdConfigDo {
-	for _, _f := range fields {
-		v = *v.withDO(v.DO.Preload(_f))
-	}
-	return &v
-}
-
-func (v videoAdConfigDo) FirstOrInit() (*model.VideoAdConfig, error) {
-	if result, err := v.DO.FirstOrInit(); err != nil {
-		return nil, err
-	} else {
-		return result.(*model.VideoAdConfig), nil
-	}
-}
-
-func (v videoAdConfigDo) FirstOrCreate() (*model.VideoAdConfig, error) {
-	if result, err := v.DO.FirstOrCreate(); err != nil {
-		return nil, err
-	} else {
-		return result.(*model.VideoAdConfig), nil
-	}
-}
-
-func (v videoAdConfigDo) FindByPage(offset int, limit int) (result []*model.VideoAdConfig, count int64, err error) {
-	result, err = v.Offset(offset).Limit(limit).Find()
-	if err != nil {
-		return
-	}
-
-	if size := len(result); 0 < limit && 0 < size && size < limit {
-		count = int64(size + offset)
-		return
-	}
-
-	count, err = v.Offset(-1).Limit(-1).Count()
-	return
-}
-
-func (v videoAdConfigDo) ScanByPage(result interface{}, offset int, limit int) (count int64, err error) {
-	count, err = v.Count()
-	if err != nil {
-		return
-	}
-
-	err = v.Offset(offset).Limit(limit).Scan(result)
-	return
-}
-
-func (v videoAdConfigDo) Scan(result interface{}) (err error) {
-	return v.DO.Scan(result)
-}
-
-func (v videoAdConfigDo) Delete(models ...*model.VideoAdConfig) (result gen.ResultInfo, err error) {
-	return v.DO.Delete(models)
-}
-
-func (v *videoAdConfigDo) withDO(do gen.Dao) *videoAdConfigDo {
-	v.DO = *do.(*gen.DO)
-	return v
-}
diff --git a/internal/gen/proto/app/v1/account.pb.go b/internal/gen/proto/app/v1/account.pb.go
index 8db30ab..889a700 100644
--- a/internal/gen/proto/app/v1/account.pb.go
+++ b/internal/gen/proto/app/v1/account.pb.go
@@ -9,6 +9,7 @@ package appv1
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 	reflect "reflect"
 	sync "sync"
 	unsafe "unsafe"
@@ -107,6 +108,7 @@ type UpdateMeRequest struct {
 	Email         *string                `protobuf:"bytes,2,opt,name=email,proto3,oneof" json:"email,omitempty"`
 	Language      *string                `protobuf:"bytes,3,opt,name=language,proto3,oneof" json:"language,omitempty"`
 	Locale        *string                `protobuf:"bytes,4,opt,name=locale,proto3,oneof" json:"locale,omitempty"`
+	TelegramId    *string                `protobuf:"bytes,5,opt,name=telegram_id,json=telegramId,proto3,oneof" json:"telegram_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -169,6 +171,13 @@ func (x *UpdateMeRequest) GetLocale() string {
 	return ""
 }
 
+func (x *UpdateMeRequest) GetTelegramId() string {
+	if x != nil && x.TelegramId != nil {
+		return *x.TelegramId
+	}
+	return ""
+}
+
 type UpdateMeResponse struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	User          *User                  `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"`
@@ -889,19 +898,22 @@ var File_app_v1_account_proto protoreflect.FileDescriptor
 
 const file_app_v1_account_proto_rawDesc = "" +
 	"\n" +
-	"\x14app/v1/account.proto\x12\rstream.app.v1\x1a\x13app/v1/common.proto\"\x0e\n" +
+	"\x14app/v1/account.proto\x12\rstream.app.v1\x1a\x1egoogle/protobuf/wrappers.proto\x1a\x13app/v1/common.proto\"\x0e\n" +
 	"\fGetMeRequest\"8\n" +
 	"\rGetMeResponse\x12'\n" +
-	"\x04user\x18\x01 \x01(\v2\x13.stream.app.v1.UserR\x04user\"\xba\x01\n" +
+	"\x04user\x18\x01 \x01(\v2\x13.stream.app.v1.UserR\x04user\"\xf0\x01\n" +
 	"\x0fUpdateMeRequest\x12\x1f\n" +
 	"\busername\x18\x01 \x01(\tH\x00R\busername\x88\x01\x01\x12\x19\n" +
 	"\x05email\x18\x02 \x01(\tH\x01R\x05email\x88\x01\x01\x12\x1f\n" +
 	"\blanguage\x18\x03 \x01(\tH\x02R\blanguage\x88\x01\x01\x12\x1b\n" +
-	"\x06locale\x18\x04 \x01(\tH\x03R\x06locale\x88\x01\x01B\v\n" +
+	"\x06locale\x18\x04 \x01(\tH\x03R\x06locale\x88\x01\x01\x12$\n" +
+	"\vtelegram_id\x18\x05 \x01(\tH\x04R\n" +
+	"telegramId\x88\x01\x01B\v\n" +
 	"\t_usernameB\b\n" +
 	"\x06_emailB\v\n" +
 	"\t_languageB\t\n" +
-	"\a_locale\";\n" +
+	"\a_localeB\x0e\n" +
+	"\f_telegram_id\";\n" +
 	"\x10UpdateMeResponse\x12'\n" +
 	"\x04user\x18\x01 \x01(\v2\x13.stream.app.v1.UserR\x04user\"\x11\n" +
 	"\x0fDeleteMeRequest\"\x14\n" +
@@ -956,12 +968,13 @@ const file_app_v1_account_proto_rawDesc = "" +
 	"\x1fMarkAllNotificationsReadRequest\"+\n" +
 	"\x19DeleteNotificationRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\"\x1b\n" +
-	"\x19ClearNotificationsRequest2\xbf\x02\n" +
+	"\x19ClearNotificationsRequest2\x83\x03\n" +
 	"\x0eAccountService\x12B\n" +
 	"\x05GetMe\x12\x1b.stream.app.v1.GetMeRequest\x1a\x1c.stream.app.v1.GetMeResponse\x12K\n" +
 	"\bUpdateMe\x12\x1e.stream.app.v1.UpdateMeRequest\x1a\x1f.stream.app.v1.UpdateMeResponse\x12J\n" +
 	"\bDeleteMe\x12\x1e.stream.app.v1.DeleteMeRequest\x1a\x1e.stream.app.v1.MessageResponse\x12P\n" +
-	"\vClearMyData\x12!.stream.app.v1.ClearMyDataRequest\x1a\x1e.stream.app.v1.MessageResponse2\xdb\x01\n" +
+	"\vClearMyData\x12!.stream.app.v1.ClearMyDataRequest\x1a\x1e.stream.app.v1.MessageResponse\x12B\n" +
+	"\vGetUserById\x12\x1c.google.protobuf.StringValue\x1a\x13.stream.app.v1.User\"\x002\xdb\x01\n" +
 	"\x12PreferencesService\x12]\n" +
 	"\x0eGetPreferences\x12$.stream.app.v1.GetPreferencesRequest\x1a%.stream.app.v1.GetPreferencesResponse\x12f\n" +
 	"\x11UpdatePreferences\x12'.stream.app.v1.UpdatePreferencesRequest\x1a(.stream.app.v1.UpdatePreferencesResponse2[\n" +
@@ -1009,7 +1022,8 @@ var file_app_v1_account_proto_goTypes = []any{
 	(*User)(nil),                            // 18: stream.app.v1.User
 	(*Preferences)(nil),                     // 19: stream.app.v1.Preferences
 	(*Notification)(nil),                    // 20: stream.app.v1.Notification
-	(*MessageResponse)(nil),                 // 21: stream.app.v1.MessageResponse
+	(*wrapperspb.StringValue)(nil),          // 21: google.protobuf.StringValue
+	(*MessageResponse)(nil),                 // 22: stream.app.v1.MessageResponse
 }
 var file_app_v1_account_proto_depIdxs = []int32{
 	18, // 0: stream.app.v1.GetMeResponse.user:type_name -> stream.app.v1.User
@@ -1021,28 +1035,30 @@ var file_app_v1_account_proto_depIdxs = []int32{
 	2,  // 6: stream.app.v1.AccountService.UpdateMe:input_type -> stream.app.v1.UpdateMeRequest
 	4,  // 7: stream.app.v1.AccountService.DeleteMe:input_type -> stream.app.v1.DeleteMeRequest
 	5,  // 8: stream.app.v1.AccountService.ClearMyData:input_type -> stream.app.v1.ClearMyDataRequest
-	6,  // 9: stream.app.v1.PreferencesService.GetPreferences:input_type -> stream.app.v1.GetPreferencesRequest
-	8,  // 10: stream.app.v1.PreferencesService.UpdatePreferences:input_type -> stream.app.v1.UpdatePreferencesRequest
-	10, // 11: stream.app.v1.UsageService.GetUsage:input_type -> stream.app.v1.GetUsageRequest
-	12, // 12: stream.app.v1.NotificationsService.ListNotifications:input_type -> stream.app.v1.ListNotificationsRequest
-	14, // 13: stream.app.v1.NotificationsService.MarkNotificationRead:input_type -> stream.app.v1.MarkNotificationReadRequest
-	15, // 14: stream.app.v1.NotificationsService.MarkAllNotificationsRead:input_type -> stream.app.v1.MarkAllNotificationsReadRequest
-	16, // 15: stream.app.v1.NotificationsService.DeleteNotification:input_type -> stream.app.v1.DeleteNotificationRequest
-	17, // 16: stream.app.v1.NotificationsService.ClearNotifications:input_type -> stream.app.v1.ClearNotificationsRequest
-	1,  // 17: stream.app.v1.AccountService.GetMe:output_type -> stream.app.v1.GetMeResponse
-	3,  // 18: stream.app.v1.AccountService.UpdateMe:output_type -> stream.app.v1.UpdateMeResponse
-	21, // 19: stream.app.v1.AccountService.DeleteMe:output_type -> stream.app.v1.MessageResponse
-	21, // 20: stream.app.v1.AccountService.ClearMyData:output_type -> stream.app.v1.MessageResponse
-	7,  // 21: stream.app.v1.PreferencesService.GetPreferences:output_type -> stream.app.v1.GetPreferencesResponse
-	9,  // 22: stream.app.v1.PreferencesService.UpdatePreferences:output_type -> stream.app.v1.UpdatePreferencesResponse
-	11, // 23: stream.app.v1.UsageService.GetUsage:output_type -> stream.app.v1.GetUsageResponse
-	13, // 24: stream.app.v1.NotificationsService.ListNotifications:output_type -> stream.app.v1.ListNotificationsResponse
-	21, // 25: stream.app.v1.NotificationsService.MarkNotificationRead:output_type -> stream.app.v1.MessageResponse
-	21, // 26: stream.app.v1.NotificationsService.MarkAllNotificationsRead:output_type -> stream.app.v1.MessageResponse
-	21, // 27: stream.app.v1.NotificationsService.DeleteNotification:output_type -> stream.app.v1.MessageResponse
-	21, // 28: stream.app.v1.NotificationsService.ClearNotifications:output_type -> stream.app.v1.MessageResponse
-	17, // [17:29] is the sub-list for method output_type
-	5,  // [5:17] is the sub-list for method input_type
+	21, // 9: stream.app.v1.AccountService.GetUserById:input_type -> google.protobuf.StringValue
+	6,  // 10: stream.app.v1.PreferencesService.GetPreferences:input_type -> stream.app.v1.GetPreferencesRequest
+	8,  // 11: stream.app.v1.PreferencesService.UpdatePreferences:input_type -> stream.app.v1.UpdatePreferencesRequest
+	10, // 12: stream.app.v1.UsageService.GetUsage:input_type -> stream.app.v1.GetUsageRequest
+	12, // 13: stream.app.v1.NotificationsService.ListNotifications:input_type -> stream.app.v1.ListNotificationsRequest
+	14, // 14: stream.app.v1.NotificationsService.MarkNotificationRead:input_type -> stream.app.v1.MarkNotificationReadRequest
+	15, // 15: stream.app.v1.NotificationsService.MarkAllNotificationsRead:input_type -> stream.app.v1.MarkAllNotificationsReadRequest
+	16, // 16: stream.app.v1.NotificationsService.DeleteNotification:input_type -> stream.app.v1.DeleteNotificationRequest
+	17, // 17: stream.app.v1.NotificationsService.ClearNotifications:input_type -> stream.app.v1.ClearNotificationsRequest
+	1,  // 18: stream.app.v1.AccountService.GetMe:output_type -> stream.app.v1.GetMeResponse
+	3,  // 19: stream.app.v1.AccountService.UpdateMe:output_type -> stream.app.v1.UpdateMeResponse
+	22, // 20: stream.app.v1.AccountService.DeleteMe:output_type -> stream.app.v1.MessageResponse
+	22, // 21: stream.app.v1.AccountService.ClearMyData:output_type -> stream.app.v1.MessageResponse
+	18, // 22: stream.app.v1.AccountService.GetUserById:output_type -> stream.app.v1.User
+	7,  // 23: stream.app.v1.PreferencesService.GetPreferences:output_type -> stream.app.v1.GetPreferencesResponse
+	9,  // 24: stream.app.v1.PreferencesService.UpdatePreferences:output_type -> stream.app.v1.UpdatePreferencesResponse
+	11, // 25: stream.app.v1.UsageService.GetUsage:output_type -> stream.app.v1.GetUsageResponse
+	13, // 26: stream.app.v1.NotificationsService.ListNotifications:output_type -> stream.app.v1.ListNotificationsResponse
+	22, // 27: stream.app.v1.NotificationsService.MarkNotificationRead:output_type -> stream.app.v1.MessageResponse
+	22, // 28: stream.app.v1.NotificationsService.MarkAllNotificationsRead:output_type -> stream.app.v1.MessageResponse
+	22, // 29: stream.app.v1.NotificationsService.DeleteNotification:output_type -> stream.app.v1.MessageResponse
+	22, // 30: stream.app.v1.NotificationsService.ClearNotifications:output_type -> stream.app.v1.MessageResponse
+	18, // [18:31] is the sub-list for method output_type
+	5,  // [5:18] is the sub-list for method input_type
 	5,  // [5:5] is the sub-list for extension type_name
 	5,  // [5:5] is the sub-list for extension extendee
 	0,  // [0:5] is the sub-list for field type_name
diff --git a/internal/gen/proto/app/v1/account_grpc.pb.go b/internal/gen/proto/app/v1/account_grpc.pb.go
index 9f02b3f..c79b782 100644
--- a/internal/gen/proto/app/v1/account_grpc.pb.go
+++ b/internal/gen/proto/app/v1/account_grpc.pb.go
@@ -11,6 +11,7 @@ import (
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -23,6 +24,7 @@ const (
 	AccountService_UpdateMe_FullMethodName    = "/stream.app.v1.AccountService/UpdateMe"
 	AccountService_DeleteMe_FullMethodName    = "/stream.app.v1.AccountService/DeleteMe"
 	AccountService_ClearMyData_FullMethodName = "/stream.app.v1.AccountService/ClearMyData"
+	AccountService_GetUserById_FullMethodName = "/stream.app.v1.AccountService/GetUserById"
 )
 
 // AccountServiceClient is the client API for AccountService service.
@@ -33,6 +35,7 @@ type AccountServiceClient interface {
 	UpdateMe(ctx context.Context, in *UpdateMeRequest, opts ...grpc.CallOption) (*UpdateMeResponse, error)
 	DeleteMe(ctx context.Context, in *DeleteMeRequest, opts ...grpc.CallOption) (*MessageResponse, error)
 	ClearMyData(ctx context.Context, in *ClearMyDataRequest, opts ...grpc.CallOption) (*MessageResponse, error)
+	GetUserById(ctx context.Context, in *wrapperspb.StringValue, opts ...grpc.CallOption) (*User, error)
 }
 
 type accountServiceClient struct {
@@ -83,6 +86,16 @@ func (c *accountServiceClient) ClearMyData(ctx context.Context, in *ClearMyDataR
 	return out, nil
 }
 
+func (c *accountServiceClient) GetUserById(ctx context.Context, in *wrapperspb.StringValue, opts ...grpc.CallOption) (*User, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(User)
+	err := c.cc.Invoke(ctx, AccountService_GetUserById_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // AccountServiceServer is the server API for AccountService service.
 // All implementations must embed UnimplementedAccountServiceServer
 // for forward compatibility.
@@ -91,6 +104,7 @@ type AccountServiceServer interface {
 	UpdateMe(context.Context, *UpdateMeRequest) (*UpdateMeResponse, error)
 	DeleteMe(context.Context, *DeleteMeRequest) (*MessageResponse, error)
 	ClearMyData(context.Context, *ClearMyDataRequest) (*MessageResponse, error)
+	GetUserById(context.Context, *wrapperspb.StringValue) (*User, error)
 	mustEmbedUnimplementedAccountServiceServer()
 }
 
@@ -113,6 +127,9 @@ func (UnimplementedAccountServiceServer) DeleteMe(context.Context, *DeleteMeRequ
 func (UnimplementedAccountServiceServer) ClearMyData(context.Context, *ClearMyDataRequest) (*MessageResponse, error) {
 	return nil, status.Error(codes.Unimplemented, "method ClearMyData not implemented")
 }
+func (UnimplementedAccountServiceServer) GetUserById(context.Context, *wrapperspb.StringValue) (*User, error) {
+	return nil, status.Error(codes.Unimplemented, "method GetUserById not implemented")
+}
 func (UnimplementedAccountServiceServer) mustEmbedUnimplementedAccountServiceServer() {}
 func (UnimplementedAccountServiceServer) testEmbeddedByValue()                        {}
 
@@ -206,6 +223,24 @@ func _AccountService_ClearMyData_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
+func _AccountService_GetUserById_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(wrapperspb.StringValue)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AccountServiceServer).GetUserById(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: AccountService_GetUserById_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AccountServiceServer).GetUserById(ctx, req.(*wrapperspb.StringValue))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // AccountService_ServiceDesc is the grpc.ServiceDesc for AccountService service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -229,6 +264,10 @@ var AccountService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ClearMyData",
 			Handler:    _AccountService_ClearMyData_Handler,
 		},
+		{
+			MethodName: "GetUserById",
+			Handler:    _AccountService_GetUserById_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "app/v1/account.proto",
diff --git a/internal/gen/proto/app/v1/admin.pb.go b/internal/gen/proto/app/v1/admin.pb.go
index ab975a5..719537f 100644
--- a/internal/gen/proto/app/v1/admin.pb.go
+++ b/internal/gen/proto/app/v1/admin.pb.go
@@ -573,6 +573,134 @@ func (x *UpdateAdminUserResponse) GetUser() *AdminUser {
 	return nil
 }
 
+type UpdateAdminUserReferralSettingsRequest struct {
+	state                  protoimpl.MessageState `protogen:"open.v1"`
+	Id                     string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	RefUsername            *string                `protobuf:"bytes,2,opt,name=ref_username,json=refUsername,proto3,oneof" json:"ref_username,omitempty"`
+	ClearReferrer          *bool                  `protobuf:"varint,3,opt,name=clear_referrer,json=clearReferrer,proto3,oneof" json:"clear_referrer,omitempty"`
+	ReferralEligible       *bool                  `protobuf:"varint,4,opt,name=referral_eligible,json=referralEligible,proto3,oneof" json:"referral_eligible,omitempty"`
+	ReferralRewardBps      *int32                 `protobuf:"varint,5,opt,name=referral_reward_bps,json=referralRewardBps,proto3,oneof" json:"referral_reward_bps,omitempty"`
+	ClearReferralRewardBps *bool                  `protobuf:"varint,6,opt,name=clear_referral_reward_bps,json=clearReferralRewardBps,proto3,oneof" json:"clear_referral_reward_bps,omitempty"`
+	unknownFields          protoimpl.UnknownFields
+	sizeCache              protoimpl.SizeCache
+}
+
+func (x *UpdateAdminUserReferralSettingsRequest) Reset() {
+	*x = UpdateAdminUserReferralSettingsRequest{}
+	mi := &file_app_v1_admin_proto_msgTypes[10]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *UpdateAdminUserReferralSettingsRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpdateAdminUserReferralSettingsRequest) ProtoMessage() {}
+
+func (x *UpdateAdminUserReferralSettingsRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_admin_proto_msgTypes[10]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpdateAdminUserReferralSettingsRequest.ProtoReflect.Descriptor instead.
+func (*UpdateAdminUserReferralSettingsRequest) Descriptor() ([]byte, []int) {
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *UpdateAdminUserReferralSettingsRequest) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *UpdateAdminUserReferralSettingsRequest) GetRefUsername() string {
+	if x != nil && x.RefUsername != nil {
+		return *x.RefUsername
+	}
+	return ""
+}
+
+func (x *UpdateAdminUserReferralSettingsRequest) GetClearReferrer() bool {
+	if x != nil && x.ClearReferrer != nil {
+		return *x.ClearReferrer
+	}
+	return false
+}
+
+func (x *UpdateAdminUserReferralSettingsRequest) GetReferralEligible() bool {
+	if x != nil && x.ReferralEligible != nil {
+		return *x.ReferralEligible
+	}
+	return false
+}
+
+func (x *UpdateAdminUserReferralSettingsRequest) GetReferralRewardBps() int32 {
+	if x != nil && x.ReferralRewardBps != nil {
+		return *x.ReferralRewardBps
+	}
+	return 0
+}
+
+func (x *UpdateAdminUserReferralSettingsRequest) GetClearReferralRewardBps() bool {
+	if x != nil && x.ClearReferralRewardBps != nil {
+		return *x.ClearReferralRewardBps
+	}
+	return false
+}
+
+type UpdateAdminUserReferralSettingsResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	User          *AdminUserDetail       `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *UpdateAdminUserReferralSettingsResponse) Reset() {
+	*x = UpdateAdminUserReferralSettingsResponse{}
+	mi := &file_app_v1_admin_proto_msgTypes[11]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *UpdateAdminUserReferralSettingsResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpdateAdminUserReferralSettingsResponse) ProtoMessage() {}
+
+func (x *UpdateAdminUserReferralSettingsResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_admin_proto_msgTypes[11]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpdateAdminUserReferralSettingsResponse.ProtoReflect.Descriptor instead.
+func (*UpdateAdminUserReferralSettingsResponse) Descriptor() ([]byte, []int) {
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{11}
+}
+
+func (x *UpdateAdminUserReferralSettingsResponse) GetUser() *AdminUserDetail {
+	if x != nil {
+		return x.User
+	}
+	return nil
+}
+
 type UpdateAdminUserRoleRequest struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -583,7 +711,7 @@ type UpdateAdminUserRoleRequest struct {
 
 func (x *UpdateAdminUserRoleRequest) Reset() {
 	*x = UpdateAdminUserRoleRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[10]
+	mi := &file_app_v1_admin_proto_msgTypes[12]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -595,7 +723,7 @@ func (x *UpdateAdminUserRoleRequest) String() string {
 func (*UpdateAdminUserRoleRequest) ProtoMessage() {}
 
 func (x *UpdateAdminUserRoleRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[10]
+	mi := &file_app_v1_admin_proto_msgTypes[12]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -608,7 +736,7 @@ func (x *UpdateAdminUserRoleRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateAdminUserRoleRequest.ProtoReflect.Descriptor instead.
 func (*UpdateAdminUserRoleRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{10}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *UpdateAdminUserRoleRequest) GetId() string {
@@ -635,7 +763,7 @@ type UpdateAdminUserRoleResponse struct {
 
 func (x *UpdateAdminUserRoleResponse) Reset() {
 	*x = UpdateAdminUserRoleResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[11]
+	mi := &file_app_v1_admin_proto_msgTypes[13]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -647,7 +775,7 @@ func (x *UpdateAdminUserRoleResponse) String() string {
 func (*UpdateAdminUserRoleResponse) ProtoMessage() {}
 
 func (x *UpdateAdminUserRoleResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[11]
+	mi := &file_app_v1_admin_proto_msgTypes[13]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -660,7 +788,7 @@ func (x *UpdateAdminUserRoleResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateAdminUserRoleResponse.ProtoReflect.Descriptor instead.
 func (*UpdateAdminUserRoleResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{11}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *UpdateAdminUserRoleResponse) GetMessage() string {
@@ -686,7 +814,7 @@ type DeleteAdminUserRequest struct {
 
 func (x *DeleteAdminUserRequest) Reset() {
 	*x = DeleteAdminUserRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[12]
+	mi := &file_app_v1_admin_proto_msgTypes[14]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -698,7 +826,7 @@ func (x *DeleteAdminUserRequest) String() string {
 func (*DeleteAdminUserRequest) ProtoMessage() {}
 
 func (x *DeleteAdminUserRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[12]
+	mi := &file_app_v1_admin_proto_msgTypes[14]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -711,7 +839,7 @@ func (x *DeleteAdminUserRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteAdminUserRequest.ProtoReflect.Descriptor instead.
 func (*DeleteAdminUserRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{12}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *DeleteAdminUserRequest) GetId() string {
@@ -734,7 +862,7 @@ type ListAdminVideosRequest struct {
 
 func (x *ListAdminVideosRequest) Reset() {
 	*x = ListAdminVideosRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[13]
+	mi := &file_app_v1_admin_proto_msgTypes[15]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -746,7 +874,7 @@ func (x *ListAdminVideosRequest) String() string {
 func (*ListAdminVideosRequest) ProtoMessage() {}
 
 func (x *ListAdminVideosRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[13]
+	mi := &file_app_v1_admin_proto_msgTypes[15]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -759,7 +887,7 @@ func (x *ListAdminVideosRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListAdminVideosRequest.ProtoReflect.Descriptor instead.
 func (*ListAdminVideosRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{13}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *ListAdminVideosRequest) GetPage() int32 {
@@ -809,7 +937,7 @@ type ListAdminVideosResponse struct {
 
 func (x *ListAdminVideosResponse) Reset() {
 	*x = ListAdminVideosResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[14]
+	mi := &file_app_v1_admin_proto_msgTypes[16]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -821,7 +949,7 @@ func (x *ListAdminVideosResponse) String() string {
 func (*ListAdminVideosResponse) ProtoMessage() {}
 
 func (x *ListAdminVideosResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[14]
+	mi := &file_app_v1_admin_proto_msgTypes[16]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -834,7 +962,7 @@ func (x *ListAdminVideosResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListAdminVideosResponse.ProtoReflect.Descriptor instead.
 func (*ListAdminVideosResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{14}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *ListAdminVideosResponse) GetVideos() []*AdminVideo {
@@ -874,7 +1002,7 @@ type GetAdminVideoRequest struct {
 
 func (x *GetAdminVideoRequest) Reset() {
 	*x = GetAdminVideoRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[15]
+	mi := &file_app_v1_admin_proto_msgTypes[17]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -886,7 +1014,7 @@ func (x *GetAdminVideoRequest) String() string {
 func (*GetAdminVideoRequest) ProtoMessage() {}
 
 func (x *GetAdminVideoRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[15]
+	mi := &file_app_v1_admin_proto_msgTypes[17]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -899,7 +1027,7 @@ func (x *GetAdminVideoRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetAdminVideoRequest.ProtoReflect.Descriptor instead.
 func (*GetAdminVideoRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{15}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *GetAdminVideoRequest) GetId() string {
@@ -918,7 +1046,7 @@ type GetAdminVideoResponse struct {
 
 func (x *GetAdminVideoResponse) Reset() {
 	*x = GetAdminVideoResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[16]
+	mi := &file_app_v1_admin_proto_msgTypes[18]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -930,7 +1058,7 @@ func (x *GetAdminVideoResponse) String() string {
 func (*GetAdminVideoResponse) ProtoMessage() {}
 
 func (x *GetAdminVideoResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[16]
+	mi := &file_app_v1_admin_proto_msgTypes[18]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -943,7 +1071,7 @@ func (x *GetAdminVideoResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetAdminVideoResponse.ProtoReflect.Descriptor instead.
 func (*GetAdminVideoResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{16}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *GetAdminVideoResponse) GetVideo() *AdminVideo {
@@ -970,7 +1098,7 @@ type CreateAdminVideoRequest struct {
 
 func (x *CreateAdminVideoRequest) Reset() {
 	*x = CreateAdminVideoRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[17]
+	mi := &file_app_v1_admin_proto_msgTypes[19]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -982,7 +1110,7 @@ func (x *CreateAdminVideoRequest) String() string {
 func (*CreateAdminVideoRequest) ProtoMessage() {}
 
 func (x *CreateAdminVideoRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[17]
+	mi := &file_app_v1_admin_proto_msgTypes[19]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -995,7 +1123,7 @@ func (x *CreateAdminVideoRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateAdminVideoRequest.ProtoReflect.Descriptor instead.
 func (*CreateAdminVideoRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{17}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *CreateAdminVideoRequest) GetUserId() string {
@@ -1070,7 +1198,7 @@ type CreateAdminVideoResponse struct {
 
 func (x *CreateAdminVideoResponse) Reset() {
 	*x = CreateAdminVideoResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[18]
+	mi := &file_app_v1_admin_proto_msgTypes[20]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1082,7 +1210,7 @@ func (x *CreateAdminVideoResponse) String() string {
 func (*CreateAdminVideoResponse) ProtoMessage() {}
 
 func (x *CreateAdminVideoResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[18]
+	mi := &file_app_v1_admin_proto_msgTypes[20]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1095,7 +1223,7 @@ func (x *CreateAdminVideoResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateAdminVideoResponse.ProtoReflect.Descriptor instead.
 func (*CreateAdminVideoResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{18}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *CreateAdminVideoResponse) GetVideo() *AdminVideo {
@@ -1123,7 +1251,7 @@ type UpdateAdminVideoRequest struct {
 
 func (x *UpdateAdminVideoRequest) Reset() {
 	*x = UpdateAdminVideoRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[19]
+	mi := &file_app_v1_admin_proto_msgTypes[21]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1135,7 +1263,7 @@ func (x *UpdateAdminVideoRequest) String() string {
 func (*UpdateAdminVideoRequest) ProtoMessage() {}
 
 func (x *UpdateAdminVideoRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[19]
+	mi := &file_app_v1_admin_proto_msgTypes[21]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1148,7 +1276,7 @@ func (x *UpdateAdminVideoRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateAdminVideoRequest.ProtoReflect.Descriptor instead.
 func (*UpdateAdminVideoRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{19}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *UpdateAdminVideoRequest) GetId() string {
@@ -1230,7 +1358,7 @@ type UpdateAdminVideoResponse struct {
 
 func (x *UpdateAdminVideoResponse) Reset() {
 	*x = UpdateAdminVideoResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[20]
+	mi := &file_app_v1_admin_proto_msgTypes[22]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1242,7 +1370,7 @@ func (x *UpdateAdminVideoResponse) String() string {
 func (*UpdateAdminVideoResponse) ProtoMessage() {}
 
 func (x *UpdateAdminVideoResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[20]
+	mi := &file_app_v1_admin_proto_msgTypes[22]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1255,7 +1383,7 @@ func (x *UpdateAdminVideoResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateAdminVideoResponse.ProtoReflect.Descriptor instead.
 func (*UpdateAdminVideoResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{20}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *UpdateAdminVideoResponse) GetVideo() *AdminVideo {
@@ -1274,7 +1402,7 @@ type DeleteAdminVideoRequest struct {
 
 func (x *DeleteAdminVideoRequest) Reset() {
 	*x = DeleteAdminVideoRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[21]
+	mi := &file_app_v1_admin_proto_msgTypes[23]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1286,7 +1414,7 @@ func (x *DeleteAdminVideoRequest) String() string {
 func (*DeleteAdminVideoRequest) ProtoMessage() {}
 
 func (x *DeleteAdminVideoRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[21]
+	mi := &file_app_v1_admin_proto_msgTypes[23]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1299,7 +1427,7 @@ func (x *DeleteAdminVideoRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteAdminVideoRequest.ProtoReflect.Descriptor instead.
 func (*DeleteAdminVideoRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{21}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *DeleteAdminVideoRequest) GetId() string {
@@ -1321,7 +1449,7 @@ type ListAdminPaymentsRequest struct {
 
 func (x *ListAdminPaymentsRequest) Reset() {
 	*x = ListAdminPaymentsRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[22]
+	mi := &file_app_v1_admin_proto_msgTypes[24]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1333,7 +1461,7 @@ func (x *ListAdminPaymentsRequest) String() string {
 func (*ListAdminPaymentsRequest) ProtoMessage() {}
 
 func (x *ListAdminPaymentsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[22]
+	mi := &file_app_v1_admin_proto_msgTypes[24]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1346,7 +1474,7 @@ func (x *ListAdminPaymentsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListAdminPaymentsRequest.ProtoReflect.Descriptor instead.
 func (*ListAdminPaymentsRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{22}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *ListAdminPaymentsRequest) GetPage() int32 {
@@ -1389,7 +1517,7 @@ type ListAdminPaymentsResponse struct {
 
 func (x *ListAdminPaymentsResponse) Reset() {
 	*x = ListAdminPaymentsResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[23]
+	mi := &file_app_v1_admin_proto_msgTypes[25]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1401,7 +1529,7 @@ func (x *ListAdminPaymentsResponse) String() string {
 func (*ListAdminPaymentsResponse) ProtoMessage() {}
 
 func (x *ListAdminPaymentsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[23]
+	mi := &file_app_v1_admin_proto_msgTypes[25]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1414,7 +1542,7 @@ func (x *ListAdminPaymentsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListAdminPaymentsResponse.ProtoReflect.Descriptor instead.
 func (*ListAdminPaymentsResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{23}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *ListAdminPaymentsResponse) GetPayments() []*AdminPayment {
@@ -1454,7 +1582,7 @@ type GetAdminPaymentRequest struct {
 
 func (x *GetAdminPaymentRequest) Reset() {
 	*x = GetAdminPaymentRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[24]
+	mi := &file_app_v1_admin_proto_msgTypes[26]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1466,7 +1594,7 @@ func (x *GetAdminPaymentRequest) String() string {
 func (*GetAdminPaymentRequest) ProtoMessage() {}
 
 func (x *GetAdminPaymentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[24]
+	mi := &file_app_v1_admin_proto_msgTypes[26]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1479,7 +1607,7 @@ func (x *GetAdminPaymentRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetAdminPaymentRequest.ProtoReflect.Descriptor instead.
 func (*GetAdminPaymentRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{24}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *GetAdminPaymentRequest) GetId() string {
@@ -1498,7 +1626,7 @@ type GetAdminPaymentResponse struct {
 
 func (x *GetAdminPaymentResponse) Reset() {
 	*x = GetAdminPaymentResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[25]
+	mi := &file_app_v1_admin_proto_msgTypes[27]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1510,7 +1638,7 @@ func (x *GetAdminPaymentResponse) String() string {
 func (*GetAdminPaymentResponse) ProtoMessage() {}
 
 func (x *GetAdminPaymentResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[25]
+	mi := &file_app_v1_admin_proto_msgTypes[27]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1523,7 +1651,7 @@ func (x *GetAdminPaymentResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetAdminPaymentResponse.ProtoReflect.Descriptor instead.
 func (*GetAdminPaymentResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{25}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *GetAdminPaymentResponse) GetPayment() *AdminPayment {
@@ -1546,7 +1674,7 @@ type CreateAdminPaymentRequest struct {
 
 func (x *CreateAdminPaymentRequest) Reset() {
 	*x = CreateAdminPaymentRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[26]
+	mi := &file_app_v1_admin_proto_msgTypes[28]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1558,7 +1686,7 @@ func (x *CreateAdminPaymentRequest) String() string {
 func (*CreateAdminPaymentRequest) ProtoMessage() {}
 
 func (x *CreateAdminPaymentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[26]
+	mi := &file_app_v1_admin_proto_msgTypes[28]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1571,7 +1699,7 @@ func (x *CreateAdminPaymentRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateAdminPaymentRequest.ProtoReflect.Descriptor instead.
 func (*CreateAdminPaymentRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{26}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *CreateAdminPaymentRequest) GetUserId() string {
@@ -1621,7 +1749,7 @@ type CreateAdminPaymentResponse struct {
 
 func (x *CreateAdminPaymentResponse) Reset() {
 	*x = CreateAdminPaymentResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[27]
+	mi := &file_app_v1_admin_proto_msgTypes[29]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1633,7 +1761,7 @@ func (x *CreateAdminPaymentResponse) String() string {
 func (*CreateAdminPaymentResponse) ProtoMessage() {}
 
 func (x *CreateAdminPaymentResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[27]
+	mi := &file_app_v1_admin_proto_msgTypes[29]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1646,7 +1774,7 @@ func (x *CreateAdminPaymentResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateAdminPaymentResponse.ProtoReflect.Descriptor instead.
 func (*CreateAdminPaymentResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{27}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *CreateAdminPaymentResponse) GetPayment() *AdminPayment {
@@ -1687,7 +1815,7 @@ type UpdateAdminPaymentRequest struct {
 
 func (x *UpdateAdminPaymentRequest) Reset() {
 	*x = UpdateAdminPaymentRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[28]
+	mi := &file_app_v1_admin_proto_msgTypes[30]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1699,7 +1827,7 @@ func (x *UpdateAdminPaymentRequest) String() string {
 func (*UpdateAdminPaymentRequest) ProtoMessage() {}
 
 func (x *UpdateAdminPaymentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[28]
+	mi := &file_app_v1_admin_proto_msgTypes[30]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1712,7 +1840,7 @@ func (x *UpdateAdminPaymentRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateAdminPaymentRequest.ProtoReflect.Descriptor instead.
 func (*UpdateAdminPaymentRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{28}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *UpdateAdminPaymentRequest) GetId() string {
@@ -1738,7 +1866,7 @@ type UpdateAdminPaymentResponse struct {
 
 func (x *UpdateAdminPaymentResponse) Reset() {
 	*x = UpdateAdminPaymentResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[29]
+	mi := &file_app_v1_admin_proto_msgTypes[31]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1750,7 +1878,7 @@ func (x *UpdateAdminPaymentResponse) String() string {
 func (*UpdateAdminPaymentResponse) ProtoMessage() {}
 
 func (x *UpdateAdminPaymentResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[29]
+	mi := &file_app_v1_admin_proto_msgTypes[31]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1763,7 +1891,7 @@ func (x *UpdateAdminPaymentResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateAdminPaymentResponse.ProtoReflect.Descriptor instead.
 func (*UpdateAdminPaymentResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{29}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *UpdateAdminPaymentResponse) GetPayment() *AdminPayment {
@@ -1781,7 +1909,7 @@ type ListAdminPlansRequest struct {
 
 func (x *ListAdminPlansRequest) Reset() {
 	*x = ListAdminPlansRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[30]
+	mi := &file_app_v1_admin_proto_msgTypes[32]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1793,7 +1921,7 @@ func (x *ListAdminPlansRequest) String() string {
 func (*ListAdminPlansRequest) ProtoMessage() {}
 
 func (x *ListAdminPlansRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[30]
+	mi := &file_app_v1_admin_proto_msgTypes[32]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1806,7 +1934,7 @@ func (x *ListAdminPlansRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListAdminPlansRequest.ProtoReflect.Descriptor instead.
 func (*ListAdminPlansRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{30}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{32}
 }
 
 type ListAdminPlansResponse struct {
@@ -1818,7 +1946,7 @@ type ListAdminPlansResponse struct {
 
 func (x *ListAdminPlansResponse) Reset() {
 	*x = ListAdminPlansResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[31]
+	mi := &file_app_v1_admin_proto_msgTypes[33]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1830,7 +1958,7 @@ func (x *ListAdminPlansResponse) String() string {
 func (*ListAdminPlansResponse) ProtoMessage() {}
 
 func (x *ListAdminPlansResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[31]
+	mi := &file_app_v1_admin_proto_msgTypes[33]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1843,7 +1971,7 @@ func (x *ListAdminPlansResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListAdminPlansResponse.ProtoReflect.Descriptor instead.
 func (*ListAdminPlansResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{31}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *ListAdminPlansResponse) GetPlans() []*AdminPlan {
@@ -1869,7 +1997,7 @@ type CreateAdminPlanRequest struct {
 
 func (x *CreateAdminPlanRequest) Reset() {
 	*x = CreateAdminPlanRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[32]
+	mi := &file_app_v1_admin_proto_msgTypes[34]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1881,7 +2009,7 @@ func (x *CreateAdminPlanRequest) String() string {
 func (*CreateAdminPlanRequest) ProtoMessage() {}
 
 func (x *CreateAdminPlanRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[32]
+	mi := &file_app_v1_admin_proto_msgTypes[34]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1894,7 +2022,7 @@ func (x *CreateAdminPlanRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateAdminPlanRequest.ProtoReflect.Descriptor instead.
 func (*CreateAdminPlanRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{32}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *CreateAdminPlanRequest) GetName() string {
@@ -1962,7 +2090,7 @@ type CreateAdminPlanResponse struct {
 
 func (x *CreateAdminPlanResponse) Reset() {
 	*x = CreateAdminPlanResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[33]
+	mi := &file_app_v1_admin_proto_msgTypes[35]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1974,7 +2102,7 @@ func (x *CreateAdminPlanResponse) String() string {
 func (*CreateAdminPlanResponse) ProtoMessage() {}
 
 func (x *CreateAdminPlanResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[33]
+	mi := &file_app_v1_admin_proto_msgTypes[35]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1987,7 +2115,7 @@ func (x *CreateAdminPlanResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateAdminPlanResponse.ProtoReflect.Descriptor instead.
 func (*CreateAdminPlanResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{33}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{35}
 }
 
 func (x *CreateAdminPlanResponse) GetPlan() *AdminPlan {
@@ -2014,7 +2142,7 @@ type UpdateAdminPlanRequest struct {
 
 func (x *UpdateAdminPlanRequest) Reset() {
 	*x = UpdateAdminPlanRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[34]
+	mi := &file_app_v1_admin_proto_msgTypes[36]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2026,7 +2154,7 @@ func (x *UpdateAdminPlanRequest) String() string {
 func (*UpdateAdminPlanRequest) ProtoMessage() {}
 
 func (x *UpdateAdminPlanRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[34]
+	mi := &file_app_v1_admin_proto_msgTypes[36]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2039,7 +2167,7 @@ func (x *UpdateAdminPlanRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateAdminPlanRequest.ProtoReflect.Descriptor instead.
 func (*UpdateAdminPlanRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{34}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{36}
 }
 
 func (x *UpdateAdminPlanRequest) GetId() string {
@@ -2114,7 +2242,7 @@ type UpdateAdminPlanResponse struct {
 
 func (x *UpdateAdminPlanResponse) Reset() {
 	*x = UpdateAdminPlanResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[35]
+	mi := &file_app_v1_admin_proto_msgTypes[37]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2126,7 +2254,7 @@ func (x *UpdateAdminPlanResponse) String() string {
 func (*UpdateAdminPlanResponse) ProtoMessage() {}
 
 func (x *UpdateAdminPlanResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[35]
+	mi := &file_app_v1_admin_proto_msgTypes[37]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2139,7 +2267,7 @@ func (x *UpdateAdminPlanResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateAdminPlanResponse.ProtoReflect.Descriptor instead.
 func (*UpdateAdminPlanResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{35}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *UpdateAdminPlanResponse) GetPlan() *AdminPlan {
@@ -2158,7 +2286,7 @@ type DeleteAdminPlanRequest struct {
 
 func (x *DeleteAdminPlanRequest) Reset() {
 	*x = DeleteAdminPlanRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[36]
+	mi := &file_app_v1_admin_proto_msgTypes[38]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2170,7 +2298,7 @@ func (x *DeleteAdminPlanRequest) String() string {
 func (*DeleteAdminPlanRequest) ProtoMessage() {}
 
 func (x *DeleteAdminPlanRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[36]
+	mi := &file_app_v1_admin_proto_msgTypes[38]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2183,7 +2311,7 @@ func (x *DeleteAdminPlanRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteAdminPlanRequest.ProtoReflect.Descriptor instead.
 func (*DeleteAdminPlanRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{36}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *DeleteAdminPlanRequest) GetId() string {
@@ -2203,7 +2331,7 @@ type DeleteAdminPlanResponse struct {
 
 func (x *DeleteAdminPlanResponse) Reset() {
 	*x = DeleteAdminPlanResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[37]
+	mi := &file_app_v1_admin_proto_msgTypes[39]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2215,7 +2343,7 @@ func (x *DeleteAdminPlanResponse) String() string {
 func (*DeleteAdminPlanResponse) ProtoMessage() {}
 
 func (x *DeleteAdminPlanResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[37]
+	mi := &file_app_v1_admin_proto_msgTypes[39]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2228,7 +2356,7 @@ func (x *DeleteAdminPlanResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteAdminPlanResponse.ProtoReflect.Descriptor instead.
 func (*DeleteAdminPlanResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{37}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{39}
 }
 
 func (x *DeleteAdminPlanResponse) GetMessage() string {
@@ -2257,7 +2385,7 @@ type ListAdminAdTemplatesRequest struct {
 
 func (x *ListAdminAdTemplatesRequest) Reset() {
 	*x = ListAdminAdTemplatesRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[38]
+	mi := &file_app_v1_admin_proto_msgTypes[40]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2269,7 +2397,7 @@ func (x *ListAdminAdTemplatesRequest) String() string {
 func (*ListAdminAdTemplatesRequest) ProtoMessage() {}
 
 func (x *ListAdminAdTemplatesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[38]
+	mi := &file_app_v1_admin_proto_msgTypes[40]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2282,7 +2410,7 @@ func (x *ListAdminAdTemplatesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListAdminAdTemplatesRequest.ProtoReflect.Descriptor instead.
 func (*ListAdminAdTemplatesRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{38}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{40}
 }
 
 func (x *ListAdminAdTemplatesRequest) GetPage() int32 {
@@ -2325,7 +2453,7 @@ type ListAdminAdTemplatesResponse struct {
 
 func (x *ListAdminAdTemplatesResponse) Reset() {
 	*x = ListAdminAdTemplatesResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[39]
+	mi := &file_app_v1_admin_proto_msgTypes[41]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2337,7 +2465,7 @@ func (x *ListAdminAdTemplatesResponse) String() string {
 func (*ListAdminAdTemplatesResponse) ProtoMessage() {}
 
 func (x *ListAdminAdTemplatesResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[39]
+	mi := &file_app_v1_admin_proto_msgTypes[41]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2350,7 +2478,7 @@ func (x *ListAdminAdTemplatesResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListAdminAdTemplatesResponse.ProtoReflect.Descriptor instead.
 func (*ListAdminAdTemplatesResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{39}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{41}
 }
 
 func (x *ListAdminAdTemplatesResponse) GetTemplates() []*AdminAdTemplate {
@@ -2390,7 +2518,7 @@ type GetAdminAdTemplateRequest struct {
 
 func (x *GetAdminAdTemplateRequest) Reset() {
 	*x = GetAdminAdTemplateRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[40]
+	mi := &file_app_v1_admin_proto_msgTypes[42]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2402,7 +2530,7 @@ func (x *GetAdminAdTemplateRequest) String() string {
 func (*GetAdminAdTemplateRequest) ProtoMessage() {}
 
 func (x *GetAdminAdTemplateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[40]
+	mi := &file_app_v1_admin_proto_msgTypes[42]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2415,7 +2543,7 @@ func (x *GetAdminAdTemplateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetAdminAdTemplateRequest.ProtoReflect.Descriptor instead.
 func (*GetAdminAdTemplateRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{40}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{42}
 }
 
 func (x *GetAdminAdTemplateRequest) GetId() string {
@@ -2434,7 +2562,7 @@ type GetAdminAdTemplateResponse struct {
 
 func (x *GetAdminAdTemplateResponse) Reset() {
 	*x = GetAdminAdTemplateResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[41]
+	mi := &file_app_v1_admin_proto_msgTypes[43]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2446,7 +2574,7 @@ func (x *GetAdminAdTemplateResponse) String() string {
 func (*GetAdminAdTemplateResponse) ProtoMessage() {}
 
 func (x *GetAdminAdTemplateResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[41]
+	mi := &file_app_v1_admin_proto_msgTypes[43]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2459,7 +2587,7 @@ func (x *GetAdminAdTemplateResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetAdminAdTemplateResponse.ProtoReflect.Descriptor instead.
 func (*GetAdminAdTemplateResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{41}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{43}
 }
 
 func (x *GetAdminAdTemplateResponse) GetTemplate() *AdminAdTemplate {
@@ -2485,7 +2613,7 @@ type CreateAdminAdTemplateRequest struct {
 
 func (x *CreateAdminAdTemplateRequest) Reset() {
 	*x = CreateAdminAdTemplateRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[42]
+	mi := &file_app_v1_admin_proto_msgTypes[44]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2497,7 +2625,7 @@ func (x *CreateAdminAdTemplateRequest) String() string {
 func (*CreateAdminAdTemplateRequest) ProtoMessage() {}
 
 func (x *CreateAdminAdTemplateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[42]
+	mi := &file_app_v1_admin_proto_msgTypes[44]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2510,7 +2638,7 @@ func (x *CreateAdminAdTemplateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateAdminAdTemplateRequest.ProtoReflect.Descriptor instead.
 func (*CreateAdminAdTemplateRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{42}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{44}
 }
 
 func (x *CreateAdminAdTemplateRequest) GetUserId() string {
@@ -2578,7 +2706,7 @@ type CreateAdminAdTemplateResponse struct {
 
 func (x *CreateAdminAdTemplateResponse) Reset() {
 	*x = CreateAdminAdTemplateResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[43]
+	mi := &file_app_v1_admin_proto_msgTypes[45]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2590,7 +2718,7 @@ func (x *CreateAdminAdTemplateResponse) String() string {
 func (*CreateAdminAdTemplateResponse) ProtoMessage() {}
 
 func (x *CreateAdminAdTemplateResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[43]
+	mi := &file_app_v1_admin_proto_msgTypes[45]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2603,7 +2731,7 @@ func (x *CreateAdminAdTemplateResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateAdminAdTemplateResponse.ProtoReflect.Descriptor instead.
 func (*CreateAdminAdTemplateResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{43}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{45}
 }
 
 func (x *CreateAdminAdTemplateResponse) GetTemplate() *AdminAdTemplate {
@@ -2630,7 +2758,7 @@ type UpdateAdminAdTemplateRequest struct {
 
 func (x *UpdateAdminAdTemplateRequest) Reset() {
 	*x = UpdateAdminAdTemplateRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[44]
+	mi := &file_app_v1_admin_proto_msgTypes[46]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2642,7 +2770,7 @@ func (x *UpdateAdminAdTemplateRequest) String() string {
 func (*UpdateAdminAdTemplateRequest) ProtoMessage() {}
 
 func (x *UpdateAdminAdTemplateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[44]
+	mi := &file_app_v1_admin_proto_msgTypes[46]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2655,7 +2783,7 @@ func (x *UpdateAdminAdTemplateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateAdminAdTemplateRequest.ProtoReflect.Descriptor instead.
 func (*UpdateAdminAdTemplateRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{44}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{46}
 }
 
 func (x *UpdateAdminAdTemplateRequest) GetId() string {
@@ -2730,7 +2858,7 @@ type UpdateAdminAdTemplateResponse struct {
 
 func (x *UpdateAdminAdTemplateResponse) Reset() {
 	*x = UpdateAdminAdTemplateResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[45]
+	mi := &file_app_v1_admin_proto_msgTypes[47]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2742,7 +2870,7 @@ func (x *UpdateAdminAdTemplateResponse) String() string {
 func (*UpdateAdminAdTemplateResponse) ProtoMessage() {}
 
 func (x *UpdateAdminAdTemplateResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[45]
+	mi := &file_app_v1_admin_proto_msgTypes[47]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2755,7 +2883,7 @@ func (x *UpdateAdminAdTemplateResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateAdminAdTemplateResponse.ProtoReflect.Descriptor instead.
 func (*UpdateAdminAdTemplateResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{45}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{47}
 }
 
 func (x *UpdateAdminAdTemplateResponse) GetTemplate() *AdminAdTemplate {
@@ -2774,7 +2902,7 @@ type DeleteAdminAdTemplateRequest struct {
 
 func (x *DeleteAdminAdTemplateRequest) Reset() {
 	*x = DeleteAdminAdTemplateRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[46]
+	mi := &file_app_v1_admin_proto_msgTypes[48]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2786,7 +2914,7 @@ func (x *DeleteAdminAdTemplateRequest) String() string {
 func (*DeleteAdminAdTemplateRequest) ProtoMessage() {}
 
 func (x *DeleteAdminAdTemplateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[46]
+	mi := &file_app_v1_admin_proto_msgTypes[48]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2799,7 +2927,7 @@ func (x *DeleteAdminAdTemplateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteAdminAdTemplateRequest.ProtoReflect.Descriptor instead.
 func (*DeleteAdminAdTemplateRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{46}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{48}
 }
 
 func (x *DeleteAdminAdTemplateRequest) GetId() string {
@@ -2809,18 +2937,682 @@ func (x *DeleteAdminAdTemplateRequest) GetId() string {
 	return ""
 }
 
-type ListAdminJobsRequest struct {
+type ListAdminPlayerConfigsRequest struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	Offset        int32                  `protobuf:"varint,1,opt,name=offset,proto3" json:"offset,omitempty"`
+	Page          int32                  `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"`
 	Limit         int32                  `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`
-	AgentId       *string                `protobuf:"bytes,3,opt,name=agent_id,json=agentId,proto3,oneof" json:"agent_id,omitempty"`
+	UserId        *string                `protobuf:"bytes,3,opt,name=user_id,json=userId,proto3,oneof" json:"user_id,omitempty"`
+	Search        *string                `protobuf:"bytes,4,opt,name=search,proto3,oneof" json:"search,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *ListAdminPlayerConfigsRequest) Reset() {
+	*x = ListAdminPlayerConfigsRequest{}
+	mi := &file_app_v1_admin_proto_msgTypes[49]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ListAdminPlayerConfigsRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ListAdminPlayerConfigsRequest) ProtoMessage() {}
+
+func (x *ListAdminPlayerConfigsRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_admin_proto_msgTypes[49]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ListAdminPlayerConfigsRequest.ProtoReflect.Descriptor instead.
+func (*ListAdminPlayerConfigsRequest) Descriptor() ([]byte, []int) {
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{49}
+}
+
+func (x *ListAdminPlayerConfigsRequest) GetPage() int32 {
+	if x != nil {
+		return x.Page
+	}
+	return 0
+}
+
+func (x *ListAdminPlayerConfigsRequest) GetLimit() int32 {
+	if x != nil {
+		return x.Limit
+	}
+	return 0
+}
+
+func (x *ListAdminPlayerConfigsRequest) GetUserId() string {
+	if x != nil && x.UserId != nil {
+		return *x.UserId
+	}
+	return ""
+}
+
+func (x *ListAdminPlayerConfigsRequest) GetSearch() string {
+	if x != nil && x.Search != nil {
+		return *x.Search
+	}
+	return ""
+}
+
+type ListAdminPlayerConfigsResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Configs       []*AdminPlayerConfig   `protobuf:"bytes,1,rep,name=configs,proto3" json:"configs,omitempty"`
+	Total         int64                  `protobuf:"varint,2,opt,name=total,proto3" json:"total,omitempty"`
+	Page          int32                  `protobuf:"varint,3,opt,name=page,proto3" json:"page,omitempty"`
+	Limit         int32                  `protobuf:"varint,4,opt,name=limit,proto3" json:"limit,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *ListAdminPlayerConfigsResponse) Reset() {
+	*x = ListAdminPlayerConfigsResponse{}
+	mi := &file_app_v1_admin_proto_msgTypes[50]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ListAdminPlayerConfigsResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ListAdminPlayerConfigsResponse) ProtoMessage() {}
+
+func (x *ListAdminPlayerConfigsResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_admin_proto_msgTypes[50]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ListAdminPlayerConfigsResponse.ProtoReflect.Descriptor instead.
+func (*ListAdminPlayerConfigsResponse) Descriptor() ([]byte, []int) {
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{50}
+}
+
+func (x *ListAdminPlayerConfigsResponse) GetConfigs() []*AdminPlayerConfig {
+	if x != nil {
+		return x.Configs
+	}
+	return nil
+}
+
+func (x *ListAdminPlayerConfigsResponse) GetTotal() int64 {
+	if x != nil {
+		return x.Total
+	}
+	return 0
+}
+
+func (x *ListAdminPlayerConfigsResponse) GetPage() int32 {
+	if x != nil {
+		return x.Page
+	}
+	return 0
+}
+
+func (x *ListAdminPlayerConfigsResponse) GetLimit() int32 {
+	if x != nil {
+		return x.Limit
+	}
+	return 0
+}
+
+type GetAdminPlayerConfigRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *GetAdminPlayerConfigRequest) Reset() {
+	*x = GetAdminPlayerConfigRequest{}
+	mi := &file_app_v1_admin_proto_msgTypes[51]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *GetAdminPlayerConfigRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetAdminPlayerConfigRequest) ProtoMessage() {}
+
+func (x *GetAdminPlayerConfigRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_admin_proto_msgTypes[51]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GetAdminPlayerConfigRequest.ProtoReflect.Descriptor instead.
+func (*GetAdminPlayerConfigRequest) Descriptor() ([]byte, []int) {
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{51}
+}
+
+func (x *GetAdminPlayerConfigRequest) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+type GetAdminPlayerConfigResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Config        *AdminPlayerConfig     `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *GetAdminPlayerConfigResponse) Reset() {
+	*x = GetAdminPlayerConfigResponse{}
+	mi := &file_app_v1_admin_proto_msgTypes[52]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *GetAdminPlayerConfigResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetAdminPlayerConfigResponse) ProtoMessage() {}
+
+func (x *GetAdminPlayerConfigResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_admin_proto_msgTypes[52]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GetAdminPlayerConfigResponse.ProtoReflect.Descriptor instead.
+func (*GetAdminPlayerConfigResponse) Descriptor() ([]byte, []int) {
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{52}
+}
+
+func (x *GetAdminPlayerConfigResponse) GetConfig() *AdminPlayerConfig {
+	if x != nil {
+		return x.Config
+	}
+	return nil
+}
+
+type CreateAdminPlayerConfigRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	UserId        string                 `protobuf:"bytes,1,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
+	Name          string                 `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Description   *string                `protobuf:"bytes,3,opt,name=description,proto3,oneof" json:"description,omitempty"`
+	Autoplay      bool                   `protobuf:"varint,4,opt,name=autoplay,proto3" json:"autoplay,omitempty"`
+	Loop          bool                   `protobuf:"varint,5,opt,name=loop,proto3" json:"loop,omitempty"`
+	Muted         bool                   `protobuf:"varint,6,opt,name=muted,proto3" json:"muted,omitempty"`
+	ShowControls  bool                   `protobuf:"varint,7,opt,name=show_controls,json=showControls,proto3" json:"show_controls,omitempty"`
+	Pip           bool                   `protobuf:"varint,8,opt,name=pip,proto3" json:"pip,omitempty"`
+	Airplay       bool                   `protobuf:"varint,9,opt,name=airplay,proto3" json:"airplay,omitempty"`
+	Chromecast    bool                   `protobuf:"varint,10,opt,name=chromecast,proto3" json:"chromecast,omitempty"`
+	IsActive      *bool                  `protobuf:"varint,11,opt,name=is_active,json=isActive,proto3,oneof" json:"is_active,omitempty"`
+	IsDefault     *bool                  `protobuf:"varint,12,opt,name=is_default,json=isDefault,proto3,oneof" json:"is_default,omitempty"`
+	EncrytionM3U8 *bool                  `protobuf:"varint,13,opt,name=encrytion_m3u8,json=encrytionM3u8,proto3,oneof" json:"encrytion_m3u8,omitempty"`
+	LogoUrl       *string                `protobuf:"bytes,14,opt,name=logo_url,json=logoUrl,proto3,oneof" json:"logo_url,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *CreateAdminPlayerConfigRequest) Reset() {
+	*x = CreateAdminPlayerConfigRequest{}
+	mi := &file_app_v1_admin_proto_msgTypes[53]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *CreateAdminPlayerConfigRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CreateAdminPlayerConfigRequest) ProtoMessage() {}
+
+func (x *CreateAdminPlayerConfigRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_admin_proto_msgTypes[53]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CreateAdminPlayerConfigRequest.ProtoReflect.Descriptor instead.
+func (*CreateAdminPlayerConfigRequest) Descriptor() ([]byte, []int) {
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{53}
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetUserId() string {
+	if x != nil {
+		return x.UserId
+	}
+	return ""
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetDescription() string {
+	if x != nil && x.Description != nil {
+		return *x.Description
+	}
+	return ""
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetAutoplay() bool {
+	if x != nil {
+		return x.Autoplay
+	}
+	return false
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetLoop() bool {
+	if x != nil {
+		return x.Loop
+	}
+	return false
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetMuted() bool {
+	if x != nil {
+		return x.Muted
+	}
+	return false
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetShowControls() bool {
+	if x != nil {
+		return x.ShowControls
+	}
+	return false
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetPip() bool {
+	if x != nil {
+		return x.Pip
+	}
+	return false
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetAirplay() bool {
+	if x != nil {
+		return x.Airplay
+	}
+	return false
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetChromecast() bool {
+	if x != nil {
+		return x.Chromecast
+	}
+	return false
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetIsActive() bool {
+	if x != nil && x.IsActive != nil {
+		return *x.IsActive
+	}
+	return false
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetIsDefault() bool {
+	if x != nil && x.IsDefault != nil {
+		return *x.IsDefault
+	}
+	return false
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetEncrytionM3U8() bool {
+	if x != nil && x.EncrytionM3U8 != nil {
+		return *x.EncrytionM3U8
+	}
+	return false
+}
+
+func (x *CreateAdminPlayerConfigRequest) GetLogoUrl() string {
+	if x != nil && x.LogoUrl != nil {
+		return *x.LogoUrl
+	}
+	return ""
+}
+
+type CreateAdminPlayerConfigResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Config        *AdminPlayerConfig     `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *CreateAdminPlayerConfigResponse) Reset() {
+	*x = CreateAdminPlayerConfigResponse{}
+	mi := &file_app_v1_admin_proto_msgTypes[54]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *CreateAdminPlayerConfigResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CreateAdminPlayerConfigResponse) ProtoMessage() {}
+
+func (x *CreateAdminPlayerConfigResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_admin_proto_msgTypes[54]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CreateAdminPlayerConfigResponse.ProtoReflect.Descriptor instead.
+func (*CreateAdminPlayerConfigResponse) Descriptor() ([]byte, []int) {
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{54}
+}
+
+func (x *CreateAdminPlayerConfigResponse) GetConfig() *AdminPlayerConfig {
+	if x != nil {
+		return x.Config
+	}
+	return nil
+}
+
+type UpdateAdminPlayerConfigRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	UserId        string                 `protobuf:"bytes,2,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
+	Name          string                 `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	Description   *string                `protobuf:"bytes,4,opt,name=description,proto3,oneof" json:"description,omitempty"`
+	Autoplay      bool                   `protobuf:"varint,5,opt,name=autoplay,proto3" json:"autoplay,omitempty"`
+	Loop          bool                   `protobuf:"varint,6,opt,name=loop,proto3" json:"loop,omitempty"`
+	Muted         bool                   `protobuf:"varint,7,opt,name=muted,proto3" json:"muted,omitempty"`
+	ShowControls  bool                   `protobuf:"varint,8,opt,name=show_controls,json=showControls,proto3" json:"show_controls,omitempty"`
+	Pip           bool                   `protobuf:"varint,9,opt,name=pip,proto3" json:"pip,omitempty"`
+	Airplay       bool                   `protobuf:"varint,10,opt,name=airplay,proto3" json:"airplay,omitempty"`
+	Chromecast    bool                   `protobuf:"varint,11,opt,name=chromecast,proto3" json:"chromecast,omitempty"`
+	IsActive      *bool                  `protobuf:"varint,12,opt,name=is_active,json=isActive,proto3,oneof" json:"is_active,omitempty"`
+	IsDefault     *bool                  `protobuf:"varint,13,opt,name=is_default,json=isDefault,proto3,oneof" json:"is_default,omitempty"`
+	EncrytionM3U8 *bool                  `protobuf:"varint,14,opt,name=encrytion_m3u8,json=encrytionM3u8,proto3,oneof" json:"encrytion_m3u8,omitempty"`
+	LogoUrl       *string                `protobuf:"bytes,15,opt,name=logo_url,json=logoUrl,proto3,oneof" json:"logo_url,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *UpdateAdminPlayerConfigRequest) Reset() {
+	*x = UpdateAdminPlayerConfigRequest{}
+	mi := &file_app_v1_admin_proto_msgTypes[55]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *UpdateAdminPlayerConfigRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpdateAdminPlayerConfigRequest) ProtoMessage() {}
+
+func (x *UpdateAdminPlayerConfigRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_admin_proto_msgTypes[55]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpdateAdminPlayerConfigRequest.ProtoReflect.Descriptor instead.
+func (*UpdateAdminPlayerConfigRequest) Descriptor() ([]byte, []int) {
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{55}
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetUserId() string {
+	if x != nil {
+		return x.UserId
+	}
+	return ""
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetDescription() string {
+	if x != nil && x.Description != nil {
+		return *x.Description
+	}
+	return ""
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetAutoplay() bool {
+	if x != nil {
+		return x.Autoplay
+	}
+	return false
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetLoop() bool {
+	if x != nil {
+		return x.Loop
+	}
+	return false
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetMuted() bool {
+	if x != nil {
+		return x.Muted
+	}
+	return false
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetShowControls() bool {
+	if x != nil {
+		return x.ShowControls
+	}
+	return false
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetPip() bool {
+	if x != nil {
+		return x.Pip
+	}
+	return false
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetAirplay() bool {
+	if x != nil {
+		return x.Airplay
+	}
+	return false
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetChromecast() bool {
+	if x != nil {
+		return x.Chromecast
+	}
+	return false
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetIsActive() bool {
+	if x != nil && x.IsActive != nil {
+		return *x.IsActive
+	}
+	return false
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetIsDefault() bool {
+	if x != nil && x.IsDefault != nil {
+		return *x.IsDefault
+	}
+	return false
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetEncrytionM3U8() bool {
+	if x != nil && x.EncrytionM3U8 != nil {
+		return *x.EncrytionM3U8
+	}
+	return false
+}
+
+func (x *UpdateAdminPlayerConfigRequest) GetLogoUrl() string {
+	if x != nil && x.LogoUrl != nil {
+		return *x.LogoUrl
+	}
+	return ""
+}
+
+type UpdateAdminPlayerConfigResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Config        *AdminPlayerConfig     `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *UpdateAdminPlayerConfigResponse) Reset() {
+	*x = UpdateAdminPlayerConfigResponse{}
+	mi := &file_app_v1_admin_proto_msgTypes[56]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *UpdateAdminPlayerConfigResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpdateAdminPlayerConfigResponse) ProtoMessage() {}
+
+func (x *UpdateAdminPlayerConfigResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_admin_proto_msgTypes[56]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpdateAdminPlayerConfigResponse.ProtoReflect.Descriptor instead.
+func (*UpdateAdminPlayerConfigResponse) Descriptor() ([]byte, []int) {
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{56}
+}
+
+func (x *UpdateAdminPlayerConfigResponse) GetConfig() *AdminPlayerConfig {
+	if x != nil {
+		return x.Config
+	}
+	return nil
+}
+
+type DeleteAdminPlayerConfigRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *DeleteAdminPlayerConfigRequest) Reset() {
+	*x = DeleteAdminPlayerConfigRequest{}
+	mi := &file_app_v1_admin_proto_msgTypes[57]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *DeleteAdminPlayerConfigRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DeleteAdminPlayerConfigRequest) ProtoMessage() {}
+
+func (x *DeleteAdminPlayerConfigRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_admin_proto_msgTypes[57]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use DeleteAdminPlayerConfigRequest.ProtoReflect.Descriptor instead.
+func (*DeleteAdminPlayerConfigRequest) Descriptor() ([]byte, []int) {
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{57}
+}
+
+func (x *DeleteAdminPlayerConfigRequest) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+type ListAdminJobsRequest struct {
+	state    protoimpl.MessageState `protogen:"open.v1"`
+	Cursor   *string                `protobuf:"bytes,4,opt,name=cursor,proto3,oneof" json:"cursor,omitempty"`
+	PageSize int32                  `protobuf:"varint,5,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
+	// Deprecated: use cursor for keyset pagination.
+	Offset int32 `protobuf:"varint,1,opt,name=offset,proto3" json:"offset,omitempty"`
+	// Deprecated: use page_size for keyset pagination.
+	Limit         int32   `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`
+	AgentId       *string `protobuf:"bytes,3,opt,name=agent_id,json=agentId,proto3,oneof" json:"agent_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ListAdminJobsRequest) Reset() {
 	*x = ListAdminJobsRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[47]
+	mi := &file_app_v1_admin_proto_msgTypes[58]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2832,7 +3624,7 @@ func (x *ListAdminJobsRequest) String() string {
 func (*ListAdminJobsRequest) ProtoMessage() {}
 
 func (x *ListAdminJobsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[47]
+	mi := &file_app_v1_admin_proto_msgTypes[58]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2845,7 +3637,21 @@ func (x *ListAdminJobsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListAdminJobsRequest.ProtoReflect.Descriptor instead.
 func (*ListAdminJobsRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{47}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{58}
+}
+
+func (x *ListAdminJobsRequest) GetCursor() string {
+	if x != nil && x.Cursor != nil {
+		return *x.Cursor
+	}
+	return ""
+}
+
+func (x *ListAdminJobsRequest) GetPageSize() int32 {
+	if x != nil {
+		return x.PageSize
+	}
+	return 0
 }
 
 func (x *ListAdminJobsRequest) GetOffset() int32 {
@@ -2876,13 +3682,15 @@ type ListAdminJobsResponse struct {
 	Offset        int32                  `protobuf:"varint,3,opt,name=offset,proto3" json:"offset,omitempty"`
 	Limit         int32                  `protobuf:"varint,4,opt,name=limit,proto3" json:"limit,omitempty"`
 	HasMore       bool                   `protobuf:"varint,5,opt,name=has_more,json=hasMore,proto3" json:"has_more,omitempty"`
+	NextCursor    *string                `protobuf:"bytes,6,opt,name=next_cursor,json=nextCursor,proto3,oneof" json:"next_cursor,omitempty"`
+	PageSize      int32                  `protobuf:"varint,7,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ListAdminJobsResponse) Reset() {
 	*x = ListAdminJobsResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[48]
+	mi := &file_app_v1_admin_proto_msgTypes[59]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2894,7 +3702,7 @@ func (x *ListAdminJobsResponse) String() string {
 func (*ListAdminJobsResponse) ProtoMessage() {}
 
 func (x *ListAdminJobsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[48]
+	mi := &file_app_v1_admin_proto_msgTypes[59]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2907,7 +3715,7 @@ func (x *ListAdminJobsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListAdminJobsResponse.ProtoReflect.Descriptor instead.
 func (*ListAdminJobsResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{48}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{59}
 }
 
 func (x *ListAdminJobsResponse) GetJobs() []*AdminJob {
@@ -2945,6 +3753,20 @@ func (x *ListAdminJobsResponse) GetHasMore() bool {
 	return false
 }
 
+func (x *ListAdminJobsResponse) GetNextCursor() string {
+	if x != nil && x.NextCursor != nil {
+		return *x.NextCursor
+	}
+	return ""
+}
+
+func (x *ListAdminJobsResponse) GetPageSize() int32 {
+	if x != nil {
+		return x.PageSize
+	}
+	return 0
+}
+
 type GetAdminJobRequest struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -2954,7 +3776,7 @@ type GetAdminJobRequest struct {
 
 func (x *GetAdminJobRequest) Reset() {
 	*x = GetAdminJobRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[49]
+	mi := &file_app_v1_admin_proto_msgTypes[60]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2966,7 +3788,7 @@ func (x *GetAdminJobRequest) String() string {
 func (*GetAdminJobRequest) ProtoMessage() {}
 
 func (x *GetAdminJobRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[49]
+	mi := &file_app_v1_admin_proto_msgTypes[60]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2979,7 +3801,7 @@ func (x *GetAdminJobRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetAdminJobRequest.ProtoReflect.Descriptor instead.
 func (*GetAdminJobRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{49}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{60}
 }
 
 func (x *GetAdminJobRequest) GetId() string {
@@ -2998,7 +3820,7 @@ type GetAdminJobResponse struct {
 
 func (x *GetAdminJobResponse) Reset() {
 	*x = GetAdminJobResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[50]
+	mi := &file_app_v1_admin_proto_msgTypes[61]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3010,7 +3832,7 @@ func (x *GetAdminJobResponse) String() string {
 func (*GetAdminJobResponse) ProtoMessage() {}
 
 func (x *GetAdminJobResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[50]
+	mi := &file_app_v1_admin_proto_msgTypes[61]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3023,7 +3845,7 @@ func (x *GetAdminJobResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetAdminJobResponse.ProtoReflect.Descriptor instead.
 func (*GetAdminJobResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{50}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{61}
 }
 
 func (x *GetAdminJobResponse) GetJob() *AdminJob {
@@ -3042,7 +3864,7 @@ type GetAdminJobLogsRequest struct {
 
 func (x *GetAdminJobLogsRequest) Reset() {
 	*x = GetAdminJobLogsRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[51]
+	mi := &file_app_v1_admin_proto_msgTypes[62]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3054,7 +3876,7 @@ func (x *GetAdminJobLogsRequest) String() string {
 func (*GetAdminJobLogsRequest) ProtoMessage() {}
 
 func (x *GetAdminJobLogsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[51]
+	mi := &file_app_v1_admin_proto_msgTypes[62]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3067,7 +3889,7 @@ func (x *GetAdminJobLogsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetAdminJobLogsRequest.ProtoReflect.Descriptor instead.
 func (*GetAdminJobLogsRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{51}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{62}
 }
 
 func (x *GetAdminJobLogsRequest) GetId() string {
@@ -3086,7 +3908,7 @@ type GetAdminJobLogsResponse struct {
 
 func (x *GetAdminJobLogsResponse) Reset() {
 	*x = GetAdminJobLogsResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[52]
+	mi := &file_app_v1_admin_proto_msgTypes[63]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3098,7 +3920,7 @@ func (x *GetAdminJobLogsResponse) String() string {
 func (*GetAdminJobLogsResponse) ProtoMessage() {}
 
 func (x *GetAdminJobLogsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[52]
+	mi := &file_app_v1_admin_proto_msgTypes[63]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3111,7 +3933,7 @@ func (x *GetAdminJobLogsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetAdminJobLogsResponse.ProtoReflect.Descriptor instead.
 func (*GetAdminJobLogsResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{52}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{63}
 }
 
 func (x *GetAdminJobLogsResponse) GetLogs() string {
@@ -3130,13 +3952,14 @@ type CreateAdminJobRequest struct {
 	UserId        *string                `protobuf:"bytes,5,opt,name=user_id,json=userId,proto3,oneof" json:"user_id,omitempty"`
 	Name          *string                `protobuf:"bytes,6,opt,name=name,proto3,oneof" json:"name,omitempty"`
 	TimeLimit     int64                  `protobuf:"varint,7,opt,name=time_limit,json=timeLimit,proto3" json:"time_limit,omitempty"`
+	VideoId       *string                `protobuf:"bytes,8,opt,name=video_id,json=videoId,proto3,oneof" json:"video_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
 
 func (x *CreateAdminJobRequest) Reset() {
 	*x = CreateAdminJobRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[53]
+	mi := &file_app_v1_admin_proto_msgTypes[64]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3148,7 +3971,7 @@ func (x *CreateAdminJobRequest) String() string {
 func (*CreateAdminJobRequest) ProtoMessage() {}
 
 func (x *CreateAdminJobRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[53]
+	mi := &file_app_v1_admin_proto_msgTypes[64]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3161,7 +3984,7 @@ func (x *CreateAdminJobRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateAdminJobRequest.ProtoReflect.Descriptor instead.
 func (*CreateAdminJobRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{53}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{64}
 }
 
 func (x *CreateAdminJobRequest) GetCommand() string {
@@ -3213,6 +4036,13 @@ func (x *CreateAdminJobRequest) GetTimeLimit() int64 {
 	return 0
 }
 
+func (x *CreateAdminJobRequest) GetVideoId() string {
+	if x != nil && x.VideoId != nil {
+		return *x.VideoId
+	}
+	return ""
+}
+
 type CreateAdminJobResponse struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Job           *AdminJob              `protobuf:"bytes,1,opt,name=job,proto3" json:"job,omitempty"`
@@ -3222,7 +4052,7 @@ type CreateAdminJobResponse struct {
 
 func (x *CreateAdminJobResponse) Reset() {
 	*x = CreateAdminJobResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[54]
+	mi := &file_app_v1_admin_proto_msgTypes[65]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3234,7 +4064,7 @@ func (x *CreateAdminJobResponse) String() string {
 func (*CreateAdminJobResponse) ProtoMessage() {}
 
 func (x *CreateAdminJobResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[54]
+	mi := &file_app_v1_admin_proto_msgTypes[65]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3247,7 +4077,7 @@ func (x *CreateAdminJobResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateAdminJobResponse.ProtoReflect.Descriptor instead.
 func (*CreateAdminJobResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{54}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{65}
 }
 
 func (x *CreateAdminJobResponse) GetJob() *AdminJob {
@@ -3266,7 +4096,7 @@ type CancelAdminJobRequest struct {
 
 func (x *CancelAdminJobRequest) Reset() {
 	*x = CancelAdminJobRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[55]
+	mi := &file_app_v1_admin_proto_msgTypes[66]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3278,7 +4108,7 @@ func (x *CancelAdminJobRequest) String() string {
 func (*CancelAdminJobRequest) ProtoMessage() {}
 
 func (x *CancelAdminJobRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[55]
+	mi := &file_app_v1_admin_proto_msgTypes[66]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3291,7 +4121,7 @@ func (x *CancelAdminJobRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CancelAdminJobRequest.ProtoReflect.Descriptor instead.
 func (*CancelAdminJobRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{55}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{66}
 }
 
 func (x *CancelAdminJobRequest) GetId() string {
@@ -3311,7 +4141,7 @@ type CancelAdminJobResponse struct {
 
 func (x *CancelAdminJobResponse) Reset() {
 	*x = CancelAdminJobResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[56]
+	mi := &file_app_v1_admin_proto_msgTypes[67]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3323,7 +4153,7 @@ func (x *CancelAdminJobResponse) String() string {
 func (*CancelAdminJobResponse) ProtoMessage() {}
 
 func (x *CancelAdminJobResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[56]
+	mi := &file_app_v1_admin_proto_msgTypes[67]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3336,7 +4166,7 @@ func (x *CancelAdminJobResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CancelAdminJobResponse.ProtoReflect.Descriptor instead.
 func (*CancelAdminJobResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{56}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{67}
 }
 
 func (x *CancelAdminJobResponse) GetStatus() string {
@@ -3362,7 +4192,7 @@ type RetryAdminJobRequest struct {
 
 func (x *RetryAdminJobRequest) Reset() {
 	*x = RetryAdminJobRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[57]
+	mi := &file_app_v1_admin_proto_msgTypes[68]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3374,7 +4204,7 @@ func (x *RetryAdminJobRequest) String() string {
 func (*RetryAdminJobRequest) ProtoMessage() {}
 
 func (x *RetryAdminJobRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[57]
+	mi := &file_app_v1_admin_proto_msgTypes[68]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3387,7 +4217,7 @@ func (x *RetryAdminJobRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RetryAdminJobRequest.ProtoReflect.Descriptor instead.
 func (*RetryAdminJobRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{57}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{68}
 }
 
 func (x *RetryAdminJobRequest) GetId() string {
@@ -3406,7 +4236,7 @@ type RetryAdminJobResponse struct {
 
 func (x *RetryAdminJobResponse) Reset() {
 	*x = RetryAdminJobResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[58]
+	mi := &file_app_v1_admin_proto_msgTypes[69]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3418,7 +4248,7 @@ func (x *RetryAdminJobResponse) String() string {
 func (*RetryAdminJobResponse) ProtoMessage() {}
 
 func (x *RetryAdminJobResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[58]
+	mi := &file_app_v1_admin_proto_msgTypes[69]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3431,7 +4261,7 @@ func (x *RetryAdminJobResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RetryAdminJobResponse.ProtoReflect.Descriptor instead.
 func (*RetryAdminJobResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{58}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{69}
 }
 
 func (x *RetryAdminJobResponse) GetJob() *AdminJob {
@@ -3449,7 +4279,7 @@ type ListAdminAgentsRequest struct {
 
 func (x *ListAdminAgentsRequest) Reset() {
 	*x = ListAdminAgentsRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[59]
+	mi := &file_app_v1_admin_proto_msgTypes[70]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3461,7 +4291,7 @@ func (x *ListAdminAgentsRequest) String() string {
 func (*ListAdminAgentsRequest) ProtoMessage() {}
 
 func (x *ListAdminAgentsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[59]
+	mi := &file_app_v1_admin_proto_msgTypes[70]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3474,7 +4304,7 @@ func (x *ListAdminAgentsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListAdminAgentsRequest.ProtoReflect.Descriptor instead.
 func (*ListAdminAgentsRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{59}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{70}
 }
 
 type ListAdminAgentsResponse struct {
@@ -3486,7 +4316,7 @@ type ListAdminAgentsResponse struct {
 
 func (x *ListAdminAgentsResponse) Reset() {
 	*x = ListAdminAgentsResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[60]
+	mi := &file_app_v1_admin_proto_msgTypes[71]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3498,7 +4328,7 @@ func (x *ListAdminAgentsResponse) String() string {
 func (*ListAdminAgentsResponse) ProtoMessage() {}
 
 func (x *ListAdminAgentsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[60]
+	mi := &file_app_v1_admin_proto_msgTypes[71]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3511,7 +4341,7 @@ func (x *ListAdminAgentsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListAdminAgentsResponse.ProtoReflect.Descriptor instead.
 func (*ListAdminAgentsResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{60}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{71}
 }
 
 func (x *ListAdminAgentsResponse) GetAgents() []*AdminAgent {
@@ -3530,7 +4360,7 @@ type RestartAdminAgentRequest struct {
 
 func (x *RestartAdminAgentRequest) Reset() {
 	*x = RestartAdminAgentRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[61]
+	mi := &file_app_v1_admin_proto_msgTypes[72]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3542,7 +4372,7 @@ func (x *RestartAdminAgentRequest) String() string {
 func (*RestartAdminAgentRequest) ProtoMessage() {}
 
 func (x *RestartAdminAgentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[61]
+	mi := &file_app_v1_admin_proto_msgTypes[72]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3555,7 +4385,7 @@ func (x *RestartAdminAgentRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RestartAdminAgentRequest.ProtoReflect.Descriptor instead.
 func (*RestartAdminAgentRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{61}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{72}
 }
 
 func (x *RestartAdminAgentRequest) GetId() string {
@@ -3574,7 +4404,7 @@ type UpdateAdminAgentRequest struct {
 
 func (x *UpdateAdminAgentRequest) Reset() {
 	*x = UpdateAdminAgentRequest{}
-	mi := &file_app_v1_admin_proto_msgTypes[62]
+	mi := &file_app_v1_admin_proto_msgTypes[73]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3586,7 +4416,7 @@ func (x *UpdateAdminAgentRequest) String() string {
 func (*UpdateAdminAgentRequest) ProtoMessage() {}
 
 func (x *UpdateAdminAgentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[62]
+	mi := &file_app_v1_admin_proto_msgTypes[73]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3599,7 +4429,7 @@ func (x *UpdateAdminAgentRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateAdminAgentRequest.ProtoReflect.Descriptor instead.
 func (*UpdateAdminAgentRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{62}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{73}
 }
 
 func (x *UpdateAdminAgentRequest) GetId() string {
@@ -3618,7 +4448,7 @@ type AdminAgentCommandResponse struct {
 
 func (x *AdminAgentCommandResponse) Reset() {
 	*x = AdminAgentCommandResponse{}
-	mi := &file_app_v1_admin_proto_msgTypes[63]
+	mi := &file_app_v1_admin_proto_msgTypes[74]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -3630,7 +4460,7 @@ func (x *AdminAgentCommandResponse) String() string {
 func (*AdminAgentCommandResponse) ProtoMessage() {}
 
 func (x *AdminAgentCommandResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_admin_proto_msgTypes[63]
+	mi := &file_app_v1_admin_proto_msgTypes[74]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3643,7 +4473,7 @@ func (x *AdminAgentCommandResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AdminAgentCommandResponse.ProtoReflect.Descriptor instead.
 func (*AdminAgentCommandResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_admin_proto_rawDescGZIP(), []int{63}
+	return file_app_v1_admin_proto_rawDescGZIP(), []int{74}
 }
 
 func (x *AdminAgentCommandResponse) GetStatus() string {
@@ -3703,7 +4533,21 @@ const file_app_v1_admin_proto_rawDesc = "" +
 	"\n" +
 	"\b_plan_id\"G\n" +
 	"\x17UpdateAdminUserResponse\x12,\n" +
-	"\x04user\x18\x01 \x01(\v2\x18.stream.app.v1.AdminUserR\x04user\"@\n" +
+	"\x04user\x18\x01 \x01(\v2\x18.stream.app.v1.AdminUserR\x04user\"\xa3\x03\n" +
+	"&UpdateAdminUserReferralSettingsRequest\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\x12&\n" +
+	"\fref_username\x18\x02 \x01(\tH\x00R\vrefUsername\x88\x01\x01\x12*\n" +
+	"\x0eclear_referrer\x18\x03 \x01(\bH\x01R\rclearReferrer\x88\x01\x01\x120\n" +
+	"\x11referral_eligible\x18\x04 \x01(\bH\x02R\x10referralEligible\x88\x01\x01\x123\n" +
+	"\x13referral_reward_bps\x18\x05 \x01(\x05H\x03R\x11referralRewardBps\x88\x01\x01\x12>\n" +
+	"\x19clear_referral_reward_bps\x18\x06 \x01(\bH\x04R\x16clearReferralRewardBps\x88\x01\x01B\x0f\n" +
+	"\r_ref_usernameB\x11\n" +
+	"\x0f_clear_referrerB\x14\n" +
+	"\x12_referral_eligibleB\x16\n" +
+	"\x14_referral_reward_bpsB\x1c\n" +
+	"\x1a_clear_referral_reward_bps\"]\n" +
+	"'UpdateAdminUserReferralSettingsResponse\x122\n" +
+	"\x04user\x18\x01 \x01(\v2\x1e.stream.app.v1.AdminUserDetailR\x04user\"@\n" +
 	"\x1aUpdateAdminUserRoleRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
 	"\x04role\x18\x02 \x01(\tR\x04role\"K\n" +
@@ -3899,18 +4743,99 @@ const file_app_v1_admin_proto_rawDesc = "" +
 	"\x1dUpdateAdminAdTemplateResponse\x12:\n" +
 	"\btemplate\x18\x01 \x01(\v2\x1e.stream.app.v1.AdminAdTemplateR\btemplate\".\n" +
 	"\x1cDeleteAdminAdTemplateRequest\x12\x0e\n" +
-	"\x02id\x18\x01 \x01(\tR\x02id\"q\n" +
-	"\x14ListAdminJobsRequest\x12\x16\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\"\x9b\x01\n" +
+	"\x1dListAdminPlayerConfigsRequest\x12\x12\n" +
+	"\x04page\x18\x01 \x01(\x05R\x04page\x12\x14\n" +
+	"\x05limit\x18\x02 \x01(\x05R\x05limit\x12\x1c\n" +
+	"\auser_id\x18\x03 \x01(\tH\x00R\x06userId\x88\x01\x01\x12\x1b\n" +
+	"\x06search\x18\x04 \x01(\tH\x01R\x06search\x88\x01\x01B\n" +
+	"\n" +
+	"\b_user_idB\t\n" +
+	"\a_search\"\x9c\x01\n" +
+	"\x1eListAdminPlayerConfigsResponse\x12:\n" +
+	"\aconfigs\x18\x01 \x03(\v2 .stream.app.v1.AdminPlayerConfigR\aconfigs\x12\x14\n" +
+	"\x05total\x18\x02 \x01(\x03R\x05total\x12\x12\n" +
+	"\x04page\x18\x03 \x01(\x05R\x04page\x12\x14\n" +
+	"\x05limit\x18\x04 \x01(\x05R\x05limit\"-\n" +
+	"\x1bGetAdminPlayerConfigRequest\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\"X\n" +
+	"\x1cGetAdminPlayerConfigResponse\x128\n" +
+	"\x06config\x18\x01 \x01(\v2 .stream.app.v1.AdminPlayerConfigR\x06config\"\x8a\x04\n" +
+	"\x1eCreateAdminPlayerConfigRequest\x12\x17\n" +
+	"\auser_id\x18\x01 \x01(\tR\x06userId\x12\x12\n" +
+	"\x04name\x18\x02 \x01(\tR\x04name\x12%\n" +
+	"\vdescription\x18\x03 \x01(\tH\x00R\vdescription\x88\x01\x01\x12\x1a\n" +
+	"\bautoplay\x18\x04 \x01(\bR\bautoplay\x12\x12\n" +
+	"\x04loop\x18\x05 \x01(\bR\x04loop\x12\x14\n" +
+	"\x05muted\x18\x06 \x01(\bR\x05muted\x12#\n" +
+	"\rshow_controls\x18\a \x01(\bR\fshowControls\x12\x10\n" +
+	"\x03pip\x18\b \x01(\bR\x03pip\x12\x18\n" +
+	"\aairplay\x18\t \x01(\bR\aairplay\x12\x1e\n" +
+	"\n" +
+	"chromecast\x18\n" +
+	" \x01(\bR\n" +
+	"chromecast\x12 \n" +
+	"\tis_active\x18\v \x01(\bH\x01R\bisActive\x88\x01\x01\x12\"\n" +
+	"\n" +
+	"is_default\x18\f \x01(\bH\x02R\tisDefault\x88\x01\x01\x12*\n" +
+	"\x0eencrytion_m3u8\x18\r \x01(\bH\x03R\rencrytionM3u8\x88\x01\x01\x12\x1e\n" +
+	"\blogo_url\x18\x0e \x01(\tH\x04R\alogoUrl\x88\x01\x01B\x0e\n" +
+	"\f_descriptionB\f\n" +
+	"\n" +
+	"_is_activeB\r\n" +
+	"\v_is_defaultB\x11\n" +
+	"\x0f_encrytion_m3u8B\v\n" +
+	"\t_logo_url\"[\n" +
+	"\x1fCreateAdminPlayerConfigResponse\x128\n" +
+	"\x06config\x18\x01 \x01(\v2 .stream.app.v1.AdminPlayerConfigR\x06config\"\x9a\x04\n" +
+	"\x1eUpdateAdminPlayerConfigRequest\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n" +
+	"\auser_id\x18\x02 \x01(\tR\x06userId\x12\x12\n" +
+	"\x04name\x18\x03 \x01(\tR\x04name\x12%\n" +
+	"\vdescription\x18\x04 \x01(\tH\x00R\vdescription\x88\x01\x01\x12\x1a\n" +
+	"\bautoplay\x18\x05 \x01(\bR\bautoplay\x12\x12\n" +
+	"\x04loop\x18\x06 \x01(\bR\x04loop\x12\x14\n" +
+	"\x05muted\x18\a \x01(\bR\x05muted\x12#\n" +
+	"\rshow_controls\x18\b \x01(\bR\fshowControls\x12\x10\n" +
+	"\x03pip\x18\t \x01(\bR\x03pip\x12\x18\n" +
+	"\aairplay\x18\n" +
+	" \x01(\bR\aairplay\x12\x1e\n" +
+	"\n" +
+	"chromecast\x18\v \x01(\bR\n" +
+	"chromecast\x12 \n" +
+	"\tis_active\x18\f \x01(\bH\x01R\bisActive\x88\x01\x01\x12\"\n" +
+	"\n" +
+	"is_default\x18\r \x01(\bH\x02R\tisDefault\x88\x01\x01\x12*\n" +
+	"\x0eencrytion_m3u8\x18\x0e \x01(\bH\x03R\rencrytionM3u8\x88\x01\x01\x12\x1e\n" +
+	"\blogo_url\x18\x0f \x01(\tH\x04R\alogoUrl\x88\x01\x01B\x0e\n" +
+	"\f_descriptionB\f\n" +
+	"\n" +
+	"_is_activeB\r\n" +
+	"\v_is_defaultB\x11\n" +
+	"\x0f_encrytion_m3u8B\v\n" +
+	"\t_logo_url\"[\n" +
+	"\x1fUpdateAdminPlayerConfigResponse\x128\n" +
+	"\x06config\x18\x01 \x01(\v2 .stream.app.v1.AdminPlayerConfigR\x06config\"0\n" +
+	"\x1eDeleteAdminPlayerConfigRequest\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\"\xb6\x01\n" +
+	"\x14ListAdminJobsRequest\x12\x1b\n" +
+	"\x06cursor\x18\x04 \x01(\tH\x00R\x06cursor\x88\x01\x01\x12\x1b\n" +
+	"\tpage_size\x18\x05 \x01(\x05R\bpageSize\x12\x16\n" +
 	"\x06offset\x18\x01 \x01(\x05R\x06offset\x12\x14\n" +
 	"\x05limit\x18\x02 \x01(\x05R\x05limit\x12\x1e\n" +
-	"\bagent_id\x18\x03 \x01(\tH\x00R\aagentId\x88\x01\x01B\v\n" +
-	"\t_agent_id\"\xa3\x01\n" +
+	"\bagent_id\x18\x03 \x01(\tH\x01R\aagentId\x88\x01\x01B\t\n" +
+	"\a_cursorB\v\n" +
+	"\t_agent_id\"\xf6\x01\n" +
 	"\x15ListAdminJobsResponse\x12+\n" +
 	"\x04jobs\x18\x01 \x03(\v2\x17.stream.app.v1.AdminJobR\x04jobs\x12\x14\n" +
 	"\x05total\x18\x02 \x01(\x03R\x05total\x12\x16\n" +
 	"\x06offset\x18\x03 \x01(\x05R\x06offset\x12\x14\n" +
 	"\x05limit\x18\x04 \x01(\x05R\x05limit\x12\x19\n" +
-	"\bhas_more\x18\x05 \x01(\bR\ahasMore\"$\n" +
+	"\bhas_more\x18\x05 \x01(\bR\ahasMore\x12$\n" +
+	"\vnext_cursor\x18\x06 \x01(\tH\x00R\n" +
+	"nextCursor\x88\x01\x01\x12\x1b\n" +
+	"\tpage_size\x18\a \x01(\x05R\bpageSizeB\x0e\n" +
+	"\f_next_cursor\"$\n" +
 	"\x12GetAdminJobRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\"@\n" +
 	"\x13GetAdminJobResponse\x12)\n" +
@@ -3918,7 +4843,7 @@ const file_app_v1_admin_proto_rawDesc = "" +
 	"\x16GetAdminJobLogsRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\"-\n" +
 	"\x17GetAdminJobLogsResponse\x12\x12\n" +
-	"\x04logs\x18\x01 \x01(\tR\x04logs\"\xd6\x02\n" +
+	"\x04logs\x18\x01 \x01(\tR\x04logs\"\x83\x03\n" +
 	"\x15CreateAdminJobRequest\x12\x18\n" +
 	"\acommand\x18\x01 \x01(\tR\acommand\x12\x19\n" +
 	"\x05image\x18\x02 \x01(\tH\x00R\x05image\x88\x01\x01\x12?\n" +
@@ -3927,14 +4852,16 @@ const file_app_v1_admin_proto_rawDesc = "" +
 	"\auser_id\x18\x05 \x01(\tH\x01R\x06userId\x88\x01\x01\x12\x17\n" +
 	"\x04name\x18\x06 \x01(\tH\x02R\x04name\x88\x01\x01\x12\x1d\n" +
 	"\n" +
-	"time_limit\x18\a \x01(\x03R\ttimeLimit\x1a6\n" +
+	"time_limit\x18\a \x01(\x03R\ttimeLimit\x12\x1e\n" +
+	"\bvideo_id\x18\b \x01(\tH\x03R\avideoId\x88\x01\x01\x1a6\n" +
 	"\bEnvEntry\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
 	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01B\b\n" +
 	"\x06_imageB\n" +
 	"\n" +
 	"\b_user_idB\a\n" +
-	"\x05_name\"C\n" +
+	"\x05_nameB\v\n" +
+	"\t_video_id\"C\n" +
 	"\x16CreateAdminJobResponse\x12)\n" +
 	"\x03job\x18\x01 \x01(\v2\x17.stream.app.v1.AdminJobR\x03job\"'\n" +
 	"\x15CancelAdminJobRequest\x12\x0e\n" +
@@ -3954,13 +4881,14 @@ const file_app_v1_admin_proto_rawDesc = "" +
 	"\x17UpdateAdminAgentRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\"3\n" +
 	"\x19AdminAgentCommandResponse\x12\x16\n" +
-	"\x06status\x18\x01 \x01(\tR\x06status2\xcb\x1a\n" +
+	"\x06status\x18\x01 \x01(\tR\x06status2\xa4 \n" +
 	"\fAdminService\x12f\n" +
 	"\x11GetAdminDashboard\x12'.stream.app.v1.GetAdminDashboardRequest\x1a(.stream.app.v1.GetAdminDashboardResponse\x12]\n" +
 	"\x0eListAdminUsers\x12$.stream.app.v1.ListAdminUsersRequest\x1a%.stream.app.v1.ListAdminUsersResponse\x12W\n" +
 	"\fGetAdminUser\x12\".stream.app.v1.GetAdminUserRequest\x1a#.stream.app.v1.GetAdminUserResponse\x12`\n" +
 	"\x0fCreateAdminUser\x12%.stream.app.v1.CreateAdminUserRequest\x1a&.stream.app.v1.CreateAdminUserResponse\x12`\n" +
-	"\x0fUpdateAdminUser\x12%.stream.app.v1.UpdateAdminUserRequest\x1a&.stream.app.v1.UpdateAdminUserResponse\x12l\n" +
+	"\x0fUpdateAdminUser\x12%.stream.app.v1.UpdateAdminUserRequest\x1a&.stream.app.v1.UpdateAdminUserResponse\x12\x90\x01\n" +
+	"\x1fUpdateAdminUserReferralSettings\x125.stream.app.v1.UpdateAdminUserReferralSettingsRequest\x1a6.stream.app.v1.UpdateAdminUserReferralSettingsResponse\x12l\n" +
 	"\x13UpdateAdminUserRole\x12).stream.app.v1.UpdateAdminUserRoleRequest\x1a*.stream.app.v1.UpdateAdminUserRoleResponse\x12X\n" +
 	"\x0fDeleteAdminUser\x12%.stream.app.v1.DeleteAdminUserRequest\x1a\x1e.stream.app.v1.MessageResponse\x12`\n" +
 	"\x0fListAdminVideos\x12%.stream.app.v1.ListAdminVideosRequest\x1a&.stream.app.v1.ListAdminVideosResponse\x12Z\n" +
@@ -3980,7 +4908,12 @@ const file_app_v1_admin_proto_rawDesc = "" +
 	"\x12GetAdminAdTemplate\x12(.stream.app.v1.GetAdminAdTemplateRequest\x1a).stream.app.v1.GetAdminAdTemplateResponse\x12r\n" +
 	"\x15CreateAdminAdTemplate\x12+.stream.app.v1.CreateAdminAdTemplateRequest\x1a,.stream.app.v1.CreateAdminAdTemplateResponse\x12r\n" +
 	"\x15UpdateAdminAdTemplate\x12+.stream.app.v1.UpdateAdminAdTemplateRequest\x1a,.stream.app.v1.UpdateAdminAdTemplateResponse\x12d\n" +
-	"\x15DeleteAdminAdTemplate\x12+.stream.app.v1.DeleteAdminAdTemplateRequest\x1a\x1e.stream.app.v1.MessageResponse\x12Z\n" +
+	"\x15DeleteAdminAdTemplate\x12+.stream.app.v1.DeleteAdminAdTemplateRequest\x1a\x1e.stream.app.v1.MessageResponse\x12u\n" +
+	"\x16ListAdminPlayerConfigs\x12,.stream.app.v1.ListAdminPlayerConfigsRequest\x1a-.stream.app.v1.ListAdminPlayerConfigsResponse\x12o\n" +
+	"\x14GetAdminPlayerConfig\x12*.stream.app.v1.GetAdminPlayerConfigRequest\x1a+.stream.app.v1.GetAdminPlayerConfigResponse\x12x\n" +
+	"\x17CreateAdminPlayerConfig\x12-.stream.app.v1.CreateAdminPlayerConfigRequest\x1a..stream.app.v1.CreateAdminPlayerConfigResponse\x12x\n" +
+	"\x17UpdateAdminPlayerConfig\x12-.stream.app.v1.UpdateAdminPlayerConfigRequest\x1a..stream.app.v1.UpdateAdminPlayerConfigResponse\x12h\n" +
+	"\x17DeleteAdminPlayerConfig\x12-.stream.app.v1.DeleteAdminPlayerConfigRequest\x1a\x1e.stream.app.v1.MessageResponse\x12Z\n" +
 	"\rListAdminJobs\x12#.stream.app.v1.ListAdminJobsRequest\x1a$.stream.app.v1.ListAdminJobsResponse\x12T\n" +
 	"\vGetAdminJob\x12!.stream.app.v1.GetAdminJobRequest\x1a\".stream.app.v1.GetAdminJobResponse\x12`\n" +
 	"\x0fGetAdminJobLogs\x12%.stream.app.v1.GetAdminJobLogsRequest\x1a&.stream.app.v1.GetAdminJobLogsResponse\x12]\n" +
@@ -4003,186 +4936,215 @@ func file_app_v1_admin_proto_rawDescGZIP() []byte {
 	return file_app_v1_admin_proto_rawDescData
 }
 
-var file_app_v1_admin_proto_msgTypes = make([]protoimpl.MessageInfo, 65)
+var file_app_v1_admin_proto_msgTypes = make([]protoimpl.MessageInfo, 76)
 var file_app_v1_admin_proto_goTypes = []any{
-	(*GetAdminDashboardRequest)(nil),      // 0: stream.app.v1.GetAdminDashboardRequest
-	(*GetAdminDashboardResponse)(nil),     // 1: stream.app.v1.GetAdminDashboardResponse
-	(*ListAdminUsersRequest)(nil),         // 2: stream.app.v1.ListAdminUsersRequest
-	(*ListAdminUsersResponse)(nil),        // 3: stream.app.v1.ListAdminUsersResponse
-	(*GetAdminUserRequest)(nil),           // 4: stream.app.v1.GetAdminUserRequest
-	(*GetAdminUserResponse)(nil),          // 5: stream.app.v1.GetAdminUserResponse
-	(*CreateAdminUserRequest)(nil),        // 6: stream.app.v1.CreateAdminUserRequest
-	(*CreateAdminUserResponse)(nil),       // 7: stream.app.v1.CreateAdminUserResponse
-	(*UpdateAdminUserRequest)(nil),        // 8: stream.app.v1.UpdateAdminUserRequest
-	(*UpdateAdminUserResponse)(nil),       // 9: stream.app.v1.UpdateAdminUserResponse
-	(*UpdateAdminUserRoleRequest)(nil),    // 10: stream.app.v1.UpdateAdminUserRoleRequest
-	(*UpdateAdminUserRoleResponse)(nil),   // 11: stream.app.v1.UpdateAdminUserRoleResponse
-	(*DeleteAdminUserRequest)(nil),        // 12: stream.app.v1.DeleteAdminUserRequest
-	(*ListAdminVideosRequest)(nil),        // 13: stream.app.v1.ListAdminVideosRequest
-	(*ListAdminVideosResponse)(nil),       // 14: stream.app.v1.ListAdminVideosResponse
-	(*GetAdminVideoRequest)(nil),          // 15: stream.app.v1.GetAdminVideoRequest
-	(*GetAdminVideoResponse)(nil),         // 16: stream.app.v1.GetAdminVideoResponse
-	(*CreateAdminVideoRequest)(nil),       // 17: stream.app.v1.CreateAdminVideoRequest
-	(*CreateAdminVideoResponse)(nil),      // 18: stream.app.v1.CreateAdminVideoResponse
-	(*UpdateAdminVideoRequest)(nil),       // 19: stream.app.v1.UpdateAdminVideoRequest
-	(*UpdateAdminVideoResponse)(nil),      // 20: stream.app.v1.UpdateAdminVideoResponse
-	(*DeleteAdminVideoRequest)(nil),       // 21: stream.app.v1.DeleteAdminVideoRequest
-	(*ListAdminPaymentsRequest)(nil),      // 22: stream.app.v1.ListAdminPaymentsRequest
-	(*ListAdminPaymentsResponse)(nil),     // 23: stream.app.v1.ListAdminPaymentsResponse
-	(*GetAdminPaymentRequest)(nil),        // 24: stream.app.v1.GetAdminPaymentRequest
-	(*GetAdminPaymentResponse)(nil),       // 25: stream.app.v1.GetAdminPaymentResponse
-	(*CreateAdminPaymentRequest)(nil),     // 26: stream.app.v1.CreateAdminPaymentRequest
-	(*CreateAdminPaymentResponse)(nil),    // 27: stream.app.v1.CreateAdminPaymentResponse
-	(*UpdateAdminPaymentRequest)(nil),     // 28: stream.app.v1.UpdateAdminPaymentRequest
-	(*UpdateAdminPaymentResponse)(nil),    // 29: stream.app.v1.UpdateAdminPaymentResponse
-	(*ListAdminPlansRequest)(nil),         // 30: stream.app.v1.ListAdminPlansRequest
-	(*ListAdminPlansResponse)(nil),        // 31: stream.app.v1.ListAdminPlansResponse
-	(*CreateAdminPlanRequest)(nil),        // 32: stream.app.v1.CreateAdminPlanRequest
-	(*CreateAdminPlanResponse)(nil),       // 33: stream.app.v1.CreateAdminPlanResponse
-	(*UpdateAdminPlanRequest)(nil),        // 34: stream.app.v1.UpdateAdminPlanRequest
-	(*UpdateAdminPlanResponse)(nil),       // 35: stream.app.v1.UpdateAdminPlanResponse
-	(*DeleteAdminPlanRequest)(nil),        // 36: stream.app.v1.DeleteAdminPlanRequest
-	(*DeleteAdminPlanResponse)(nil),       // 37: stream.app.v1.DeleteAdminPlanResponse
-	(*ListAdminAdTemplatesRequest)(nil),   // 38: stream.app.v1.ListAdminAdTemplatesRequest
-	(*ListAdminAdTemplatesResponse)(nil),  // 39: stream.app.v1.ListAdminAdTemplatesResponse
-	(*GetAdminAdTemplateRequest)(nil),     // 40: stream.app.v1.GetAdminAdTemplateRequest
-	(*GetAdminAdTemplateResponse)(nil),    // 41: stream.app.v1.GetAdminAdTemplateResponse
-	(*CreateAdminAdTemplateRequest)(nil),  // 42: stream.app.v1.CreateAdminAdTemplateRequest
-	(*CreateAdminAdTemplateResponse)(nil), // 43: stream.app.v1.CreateAdminAdTemplateResponse
-	(*UpdateAdminAdTemplateRequest)(nil),  // 44: stream.app.v1.UpdateAdminAdTemplateRequest
-	(*UpdateAdminAdTemplateResponse)(nil), // 45: stream.app.v1.UpdateAdminAdTemplateResponse
-	(*DeleteAdminAdTemplateRequest)(nil),  // 46: stream.app.v1.DeleteAdminAdTemplateRequest
-	(*ListAdminJobsRequest)(nil),          // 47: stream.app.v1.ListAdminJobsRequest
-	(*ListAdminJobsResponse)(nil),         // 48: stream.app.v1.ListAdminJobsResponse
-	(*GetAdminJobRequest)(nil),            // 49: stream.app.v1.GetAdminJobRequest
-	(*GetAdminJobResponse)(nil),           // 50: stream.app.v1.GetAdminJobResponse
-	(*GetAdminJobLogsRequest)(nil),        // 51: stream.app.v1.GetAdminJobLogsRequest
-	(*GetAdminJobLogsResponse)(nil),       // 52: stream.app.v1.GetAdminJobLogsResponse
-	(*CreateAdminJobRequest)(nil),         // 53: stream.app.v1.CreateAdminJobRequest
-	(*CreateAdminJobResponse)(nil),        // 54: stream.app.v1.CreateAdminJobResponse
-	(*CancelAdminJobRequest)(nil),         // 55: stream.app.v1.CancelAdminJobRequest
-	(*CancelAdminJobResponse)(nil),        // 56: stream.app.v1.CancelAdminJobResponse
-	(*RetryAdminJobRequest)(nil),          // 57: stream.app.v1.RetryAdminJobRequest
-	(*RetryAdminJobResponse)(nil),         // 58: stream.app.v1.RetryAdminJobResponse
-	(*ListAdminAgentsRequest)(nil),        // 59: stream.app.v1.ListAdminAgentsRequest
-	(*ListAdminAgentsResponse)(nil),       // 60: stream.app.v1.ListAdminAgentsResponse
-	(*RestartAdminAgentRequest)(nil),      // 61: stream.app.v1.RestartAdminAgentRequest
-	(*UpdateAdminAgentRequest)(nil),       // 62: stream.app.v1.UpdateAdminAgentRequest
-	(*AdminAgentCommandResponse)(nil),     // 63: stream.app.v1.AdminAgentCommandResponse
-	nil,                                   // 64: stream.app.v1.CreateAdminJobRequest.EnvEntry
-	(*AdminDashboard)(nil),                // 65: stream.app.v1.AdminDashboard
-	(*AdminUser)(nil),                     // 66: stream.app.v1.AdminUser
-	(*AdminUserDetail)(nil),               // 67: stream.app.v1.AdminUserDetail
-	(*AdminVideo)(nil),                    // 68: stream.app.v1.AdminVideo
-	(*AdminPayment)(nil),                  // 69: stream.app.v1.AdminPayment
-	(*PlanSubscription)(nil),              // 70: stream.app.v1.PlanSubscription
-	(*AdminPlan)(nil),                     // 71: stream.app.v1.AdminPlan
-	(*AdminAdTemplate)(nil),               // 72: stream.app.v1.AdminAdTemplate
-	(*AdminJob)(nil),                      // 73: stream.app.v1.AdminJob
-	(*AdminAgent)(nil),                    // 74: stream.app.v1.AdminAgent
-	(*MessageResponse)(nil),               // 75: stream.app.v1.MessageResponse
+	(*GetAdminDashboardRequest)(nil),                // 0: stream.app.v1.GetAdminDashboardRequest
+	(*GetAdminDashboardResponse)(nil),               // 1: stream.app.v1.GetAdminDashboardResponse
+	(*ListAdminUsersRequest)(nil),                   // 2: stream.app.v1.ListAdminUsersRequest
+	(*ListAdminUsersResponse)(nil),                  // 3: stream.app.v1.ListAdminUsersResponse
+	(*GetAdminUserRequest)(nil),                     // 4: stream.app.v1.GetAdminUserRequest
+	(*GetAdminUserResponse)(nil),                    // 5: stream.app.v1.GetAdminUserResponse
+	(*CreateAdminUserRequest)(nil),                  // 6: stream.app.v1.CreateAdminUserRequest
+	(*CreateAdminUserResponse)(nil),                 // 7: stream.app.v1.CreateAdminUserResponse
+	(*UpdateAdminUserRequest)(nil),                  // 8: stream.app.v1.UpdateAdminUserRequest
+	(*UpdateAdminUserResponse)(nil),                 // 9: stream.app.v1.UpdateAdminUserResponse
+	(*UpdateAdminUserReferralSettingsRequest)(nil),  // 10: stream.app.v1.UpdateAdminUserReferralSettingsRequest
+	(*UpdateAdminUserReferralSettingsResponse)(nil), // 11: stream.app.v1.UpdateAdminUserReferralSettingsResponse
+	(*UpdateAdminUserRoleRequest)(nil),              // 12: stream.app.v1.UpdateAdminUserRoleRequest
+	(*UpdateAdminUserRoleResponse)(nil),             // 13: stream.app.v1.UpdateAdminUserRoleResponse
+	(*DeleteAdminUserRequest)(nil),                  // 14: stream.app.v1.DeleteAdminUserRequest
+	(*ListAdminVideosRequest)(nil),                  // 15: stream.app.v1.ListAdminVideosRequest
+	(*ListAdminVideosResponse)(nil),                 // 16: stream.app.v1.ListAdminVideosResponse
+	(*GetAdminVideoRequest)(nil),                    // 17: stream.app.v1.GetAdminVideoRequest
+	(*GetAdminVideoResponse)(nil),                   // 18: stream.app.v1.GetAdminVideoResponse
+	(*CreateAdminVideoRequest)(nil),                 // 19: stream.app.v1.CreateAdminVideoRequest
+	(*CreateAdminVideoResponse)(nil),                // 20: stream.app.v1.CreateAdminVideoResponse
+	(*UpdateAdminVideoRequest)(nil),                 // 21: stream.app.v1.UpdateAdminVideoRequest
+	(*UpdateAdminVideoResponse)(nil),                // 22: stream.app.v1.UpdateAdminVideoResponse
+	(*DeleteAdminVideoRequest)(nil),                 // 23: stream.app.v1.DeleteAdminVideoRequest
+	(*ListAdminPaymentsRequest)(nil),                // 24: stream.app.v1.ListAdminPaymentsRequest
+	(*ListAdminPaymentsResponse)(nil),               // 25: stream.app.v1.ListAdminPaymentsResponse
+	(*GetAdminPaymentRequest)(nil),                  // 26: stream.app.v1.GetAdminPaymentRequest
+	(*GetAdminPaymentResponse)(nil),                 // 27: stream.app.v1.GetAdminPaymentResponse
+	(*CreateAdminPaymentRequest)(nil),               // 28: stream.app.v1.CreateAdminPaymentRequest
+	(*CreateAdminPaymentResponse)(nil),              // 29: stream.app.v1.CreateAdminPaymentResponse
+	(*UpdateAdminPaymentRequest)(nil),               // 30: stream.app.v1.UpdateAdminPaymentRequest
+	(*UpdateAdminPaymentResponse)(nil),              // 31: stream.app.v1.UpdateAdminPaymentResponse
+	(*ListAdminPlansRequest)(nil),                   // 32: stream.app.v1.ListAdminPlansRequest
+	(*ListAdminPlansResponse)(nil),                  // 33: stream.app.v1.ListAdminPlansResponse
+	(*CreateAdminPlanRequest)(nil),                  // 34: stream.app.v1.CreateAdminPlanRequest
+	(*CreateAdminPlanResponse)(nil),                 // 35: stream.app.v1.CreateAdminPlanResponse
+	(*UpdateAdminPlanRequest)(nil),                  // 36: stream.app.v1.UpdateAdminPlanRequest
+	(*UpdateAdminPlanResponse)(nil),                 // 37: stream.app.v1.UpdateAdminPlanResponse
+	(*DeleteAdminPlanRequest)(nil),                  // 38: stream.app.v1.DeleteAdminPlanRequest
+	(*DeleteAdminPlanResponse)(nil),                 // 39: stream.app.v1.DeleteAdminPlanResponse
+	(*ListAdminAdTemplatesRequest)(nil),             // 40: stream.app.v1.ListAdminAdTemplatesRequest
+	(*ListAdminAdTemplatesResponse)(nil),            // 41: stream.app.v1.ListAdminAdTemplatesResponse
+	(*GetAdminAdTemplateRequest)(nil),               // 42: stream.app.v1.GetAdminAdTemplateRequest
+	(*GetAdminAdTemplateResponse)(nil),              // 43: stream.app.v1.GetAdminAdTemplateResponse
+	(*CreateAdminAdTemplateRequest)(nil),            // 44: stream.app.v1.CreateAdminAdTemplateRequest
+	(*CreateAdminAdTemplateResponse)(nil),           // 45: stream.app.v1.CreateAdminAdTemplateResponse
+	(*UpdateAdminAdTemplateRequest)(nil),            // 46: stream.app.v1.UpdateAdminAdTemplateRequest
+	(*UpdateAdminAdTemplateResponse)(nil),           // 47: stream.app.v1.UpdateAdminAdTemplateResponse
+	(*DeleteAdminAdTemplateRequest)(nil),            // 48: stream.app.v1.DeleteAdminAdTemplateRequest
+	(*ListAdminPlayerConfigsRequest)(nil),           // 49: stream.app.v1.ListAdminPlayerConfigsRequest
+	(*ListAdminPlayerConfigsResponse)(nil),          // 50: stream.app.v1.ListAdminPlayerConfigsResponse
+	(*GetAdminPlayerConfigRequest)(nil),             // 51: stream.app.v1.GetAdminPlayerConfigRequest
+	(*GetAdminPlayerConfigResponse)(nil),            // 52: stream.app.v1.GetAdminPlayerConfigResponse
+	(*CreateAdminPlayerConfigRequest)(nil),          // 53: stream.app.v1.CreateAdminPlayerConfigRequest
+	(*CreateAdminPlayerConfigResponse)(nil),         // 54: stream.app.v1.CreateAdminPlayerConfigResponse
+	(*UpdateAdminPlayerConfigRequest)(nil),          // 55: stream.app.v1.UpdateAdminPlayerConfigRequest
+	(*UpdateAdminPlayerConfigResponse)(nil),         // 56: stream.app.v1.UpdateAdminPlayerConfigResponse
+	(*DeleteAdminPlayerConfigRequest)(nil),          // 57: stream.app.v1.DeleteAdminPlayerConfigRequest
+	(*ListAdminJobsRequest)(nil),                    // 58: stream.app.v1.ListAdminJobsRequest
+	(*ListAdminJobsResponse)(nil),                   // 59: stream.app.v1.ListAdminJobsResponse
+	(*GetAdminJobRequest)(nil),                      // 60: stream.app.v1.GetAdminJobRequest
+	(*GetAdminJobResponse)(nil),                     // 61: stream.app.v1.GetAdminJobResponse
+	(*GetAdminJobLogsRequest)(nil),                  // 62: stream.app.v1.GetAdminJobLogsRequest
+	(*GetAdminJobLogsResponse)(nil),                 // 63: stream.app.v1.GetAdminJobLogsResponse
+	(*CreateAdminJobRequest)(nil),                   // 64: stream.app.v1.CreateAdminJobRequest
+	(*CreateAdminJobResponse)(nil),                  // 65: stream.app.v1.CreateAdminJobResponse
+	(*CancelAdminJobRequest)(nil),                   // 66: stream.app.v1.CancelAdminJobRequest
+	(*CancelAdminJobResponse)(nil),                  // 67: stream.app.v1.CancelAdminJobResponse
+	(*RetryAdminJobRequest)(nil),                    // 68: stream.app.v1.RetryAdminJobRequest
+	(*RetryAdminJobResponse)(nil),                   // 69: stream.app.v1.RetryAdminJobResponse
+	(*ListAdminAgentsRequest)(nil),                  // 70: stream.app.v1.ListAdminAgentsRequest
+	(*ListAdminAgentsResponse)(nil),                 // 71: stream.app.v1.ListAdminAgentsResponse
+	(*RestartAdminAgentRequest)(nil),                // 72: stream.app.v1.RestartAdminAgentRequest
+	(*UpdateAdminAgentRequest)(nil),                 // 73: stream.app.v1.UpdateAdminAgentRequest
+	(*AdminAgentCommandResponse)(nil),               // 74: stream.app.v1.AdminAgentCommandResponse
+	nil,                                             // 75: stream.app.v1.CreateAdminJobRequest.EnvEntry
+	(*AdminDashboard)(nil),                          // 76: stream.app.v1.AdminDashboard
+	(*AdminUser)(nil),                               // 77: stream.app.v1.AdminUser
+	(*AdminUserDetail)(nil),                         // 78: stream.app.v1.AdminUserDetail
+	(*AdminVideo)(nil),                              // 79: stream.app.v1.AdminVideo
+	(*AdminPayment)(nil),                            // 80: stream.app.v1.AdminPayment
+	(*PlanSubscription)(nil),                        // 81: stream.app.v1.PlanSubscription
+	(*AdminPlan)(nil),                               // 82: stream.app.v1.AdminPlan
+	(*AdminAdTemplate)(nil),                         // 83: stream.app.v1.AdminAdTemplate
+	(*AdminPlayerConfig)(nil),                       // 84: stream.app.v1.AdminPlayerConfig
+	(*AdminJob)(nil),                                // 85: stream.app.v1.AdminJob
+	(*AdminAgent)(nil),                              // 86: stream.app.v1.AdminAgent
+	(*MessageResponse)(nil),                         // 87: stream.app.v1.MessageResponse
 }
 var file_app_v1_admin_proto_depIdxs = []int32{
-	65, // 0: stream.app.v1.GetAdminDashboardResponse.dashboard:type_name -> stream.app.v1.AdminDashboard
-	66, // 1: stream.app.v1.ListAdminUsersResponse.users:type_name -> stream.app.v1.AdminUser
-	67, // 2: stream.app.v1.GetAdminUserResponse.user:type_name -> stream.app.v1.AdminUserDetail
-	66, // 3: stream.app.v1.CreateAdminUserResponse.user:type_name -> stream.app.v1.AdminUser
-	66, // 4: stream.app.v1.UpdateAdminUserResponse.user:type_name -> stream.app.v1.AdminUser
-	68, // 5: stream.app.v1.ListAdminVideosResponse.videos:type_name -> stream.app.v1.AdminVideo
-	68, // 6: stream.app.v1.GetAdminVideoResponse.video:type_name -> stream.app.v1.AdminVideo
-	68, // 7: stream.app.v1.CreateAdminVideoResponse.video:type_name -> stream.app.v1.AdminVideo
-	68, // 8: stream.app.v1.UpdateAdminVideoResponse.video:type_name -> stream.app.v1.AdminVideo
-	69, // 9: stream.app.v1.ListAdminPaymentsResponse.payments:type_name -> stream.app.v1.AdminPayment
-	69, // 10: stream.app.v1.GetAdminPaymentResponse.payment:type_name -> stream.app.v1.AdminPayment
-	69, // 11: stream.app.v1.CreateAdminPaymentResponse.payment:type_name -> stream.app.v1.AdminPayment
-	70, // 12: stream.app.v1.CreateAdminPaymentResponse.subscription:type_name -> stream.app.v1.PlanSubscription
-	69, // 13: stream.app.v1.UpdateAdminPaymentResponse.payment:type_name -> stream.app.v1.AdminPayment
-	71, // 14: stream.app.v1.ListAdminPlansResponse.plans:type_name -> stream.app.v1.AdminPlan
-	71, // 15: stream.app.v1.CreateAdminPlanResponse.plan:type_name -> stream.app.v1.AdminPlan
-	71, // 16: stream.app.v1.UpdateAdminPlanResponse.plan:type_name -> stream.app.v1.AdminPlan
-	72, // 17: stream.app.v1.ListAdminAdTemplatesResponse.templates:type_name -> stream.app.v1.AdminAdTemplate
-	72, // 18: stream.app.v1.GetAdminAdTemplateResponse.template:type_name -> stream.app.v1.AdminAdTemplate
-	72, // 19: stream.app.v1.CreateAdminAdTemplateResponse.template:type_name -> stream.app.v1.AdminAdTemplate
-	72, // 20: stream.app.v1.UpdateAdminAdTemplateResponse.template:type_name -> stream.app.v1.AdminAdTemplate
-	73, // 21: stream.app.v1.ListAdminJobsResponse.jobs:type_name -> stream.app.v1.AdminJob
-	73, // 22: stream.app.v1.GetAdminJobResponse.job:type_name -> stream.app.v1.AdminJob
-	64, // 23: stream.app.v1.CreateAdminJobRequest.env:type_name -> stream.app.v1.CreateAdminJobRequest.EnvEntry
-	73, // 24: stream.app.v1.CreateAdminJobResponse.job:type_name -> stream.app.v1.AdminJob
-	73, // 25: stream.app.v1.RetryAdminJobResponse.job:type_name -> stream.app.v1.AdminJob
-	74, // 26: stream.app.v1.ListAdminAgentsResponse.agents:type_name -> stream.app.v1.AdminAgent
-	0,  // 27: stream.app.v1.AdminService.GetAdminDashboard:input_type -> stream.app.v1.GetAdminDashboardRequest
-	2,  // 28: stream.app.v1.AdminService.ListAdminUsers:input_type -> stream.app.v1.ListAdminUsersRequest
-	4,  // 29: stream.app.v1.AdminService.GetAdminUser:input_type -> stream.app.v1.GetAdminUserRequest
-	6,  // 30: stream.app.v1.AdminService.CreateAdminUser:input_type -> stream.app.v1.CreateAdminUserRequest
-	8,  // 31: stream.app.v1.AdminService.UpdateAdminUser:input_type -> stream.app.v1.UpdateAdminUserRequest
-	10, // 32: stream.app.v1.AdminService.UpdateAdminUserRole:input_type -> stream.app.v1.UpdateAdminUserRoleRequest
-	12, // 33: stream.app.v1.AdminService.DeleteAdminUser:input_type -> stream.app.v1.DeleteAdminUserRequest
-	13, // 34: stream.app.v1.AdminService.ListAdminVideos:input_type -> stream.app.v1.ListAdminVideosRequest
-	15, // 35: stream.app.v1.AdminService.GetAdminVideo:input_type -> stream.app.v1.GetAdminVideoRequest
-	17, // 36: stream.app.v1.AdminService.CreateAdminVideo:input_type -> stream.app.v1.CreateAdminVideoRequest
-	19, // 37: stream.app.v1.AdminService.UpdateAdminVideo:input_type -> stream.app.v1.UpdateAdminVideoRequest
-	21, // 38: stream.app.v1.AdminService.DeleteAdminVideo:input_type -> stream.app.v1.DeleteAdminVideoRequest
-	22, // 39: stream.app.v1.AdminService.ListAdminPayments:input_type -> stream.app.v1.ListAdminPaymentsRequest
-	24, // 40: stream.app.v1.AdminService.GetAdminPayment:input_type -> stream.app.v1.GetAdminPaymentRequest
-	26, // 41: stream.app.v1.AdminService.CreateAdminPayment:input_type -> stream.app.v1.CreateAdminPaymentRequest
-	28, // 42: stream.app.v1.AdminService.UpdateAdminPayment:input_type -> stream.app.v1.UpdateAdminPaymentRequest
-	30, // 43: stream.app.v1.AdminService.ListAdminPlans:input_type -> stream.app.v1.ListAdminPlansRequest
-	32, // 44: stream.app.v1.AdminService.CreateAdminPlan:input_type -> stream.app.v1.CreateAdminPlanRequest
-	34, // 45: stream.app.v1.AdminService.UpdateAdminPlan:input_type -> stream.app.v1.UpdateAdminPlanRequest
-	36, // 46: stream.app.v1.AdminService.DeleteAdminPlan:input_type -> stream.app.v1.DeleteAdminPlanRequest
-	38, // 47: stream.app.v1.AdminService.ListAdminAdTemplates:input_type -> stream.app.v1.ListAdminAdTemplatesRequest
-	40, // 48: stream.app.v1.AdminService.GetAdminAdTemplate:input_type -> stream.app.v1.GetAdminAdTemplateRequest
-	42, // 49: stream.app.v1.AdminService.CreateAdminAdTemplate:input_type -> stream.app.v1.CreateAdminAdTemplateRequest
-	44, // 50: stream.app.v1.AdminService.UpdateAdminAdTemplate:input_type -> stream.app.v1.UpdateAdminAdTemplateRequest
-	46, // 51: stream.app.v1.AdminService.DeleteAdminAdTemplate:input_type -> stream.app.v1.DeleteAdminAdTemplateRequest
-	47, // 52: stream.app.v1.AdminService.ListAdminJobs:input_type -> stream.app.v1.ListAdminJobsRequest
-	49, // 53: stream.app.v1.AdminService.GetAdminJob:input_type -> stream.app.v1.GetAdminJobRequest
-	51, // 54: stream.app.v1.AdminService.GetAdminJobLogs:input_type -> stream.app.v1.GetAdminJobLogsRequest
-	53, // 55: stream.app.v1.AdminService.CreateAdminJob:input_type -> stream.app.v1.CreateAdminJobRequest
-	55, // 56: stream.app.v1.AdminService.CancelAdminJob:input_type -> stream.app.v1.CancelAdminJobRequest
-	57, // 57: stream.app.v1.AdminService.RetryAdminJob:input_type -> stream.app.v1.RetryAdminJobRequest
-	59, // 58: stream.app.v1.AdminService.ListAdminAgents:input_type -> stream.app.v1.ListAdminAgentsRequest
-	61, // 59: stream.app.v1.AdminService.RestartAdminAgent:input_type -> stream.app.v1.RestartAdminAgentRequest
-	62, // 60: stream.app.v1.AdminService.UpdateAdminAgent:input_type -> stream.app.v1.UpdateAdminAgentRequest
-	1,  // 61: stream.app.v1.AdminService.GetAdminDashboard:output_type -> stream.app.v1.GetAdminDashboardResponse
-	3,  // 62: stream.app.v1.AdminService.ListAdminUsers:output_type -> stream.app.v1.ListAdminUsersResponse
-	5,  // 63: stream.app.v1.AdminService.GetAdminUser:output_type -> stream.app.v1.GetAdminUserResponse
-	7,  // 64: stream.app.v1.AdminService.CreateAdminUser:output_type -> stream.app.v1.CreateAdminUserResponse
-	9,  // 65: stream.app.v1.AdminService.UpdateAdminUser:output_type -> stream.app.v1.UpdateAdminUserResponse
-	11, // 66: stream.app.v1.AdminService.UpdateAdminUserRole:output_type -> stream.app.v1.UpdateAdminUserRoleResponse
-	75, // 67: stream.app.v1.AdminService.DeleteAdminUser:output_type -> stream.app.v1.MessageResponse
-	14, // 68: stream.app.v1.AdminService.ListAdminVideos:output_type -> stream.app.v1.ListAdminVideosResponse
-	16, // 69: stream.app.v1.AdminService.GetAdminVideo:output_type -> stream.app.v1.GetAdminVideoResponse
-	18, // 70: stream.app.v1.AdminService.CreateAdminVideo:output_type -> stream.app.v1.CreateAdminVideoResponse
-	20, // 71: stream.app.v1.AdminService.UpdateAdminVideo:output_type -> stream.app.v1.UpdateAdminVideoResponse
-	75, // 72: stream.app.v1.AdminService.DeleteAdminVideo:output_type -> stream.app.v1.MessageResponse
-	23, // 73: stream.app.v1.AdminService.ListAdminPayments:output_type -> stream.app.v1.ListAdminPaymentsResponse
-	25, // 74: stream.app.v1.AdminService.GetAdminPayment:output_type -> stream.app.v1.GetAdminPaymentResponse
-	27, // 75: stream.app.v1.AdminService.CreateAdminPayment:output_type -> stream.app.v1.CreateAdminPaymentResponse
-	29, // 76: stream.app.v1.AdminService.UpdateAdminPayment:output_type -> stream.app.v1.UpdateAdminPaymentResponse
-	31, // 77: stream.app.v1.AdminService.ListAdminPlans:output_type -> stream.app.v1.ListAdminPlansResponse
-	33, // 78: stream.app.v1.AdminService.CreateAdminPlan:output_type -> stream.app.v1.CreateAdminPlanResponse
-	35, // 79: stream.app.v1.AdminService.UpdateAdminPlan:output_type -> stream.app.v1.UpdateAdminPlanResponse
-	37, // 80: stream.app.v1.AdminService.DeleteAdminPlan:output_type -> stream.app.v1.DeleteAdminPlanResponse
-	39, // 81: stream.app.v1.AdminService.ListAdminAdTemplates:output_type -> stream.app.v1.ListAdminAdTemplatesResponse
-	41, // 82: stream.app.v1.AdminService.GetAdminAdTemplate:output_type -> stream.app.v1.GetAdminAdTemplateResponse
-	43, // 83: stream.app.v1.AdminService.CreateAdminAdTemplate:output_type -> stream.app.v1.CreateAdminAdTemplateResponse
-	45, // 84: stream.app.v1.AdminService.UpdateAdminAdTemplate:output_type -> stream.app.v1.UpdateAdminAdTemplateResponse
-	75, // 85: stream.app.v1.AdminService.DeleteAdminAdTemplate:output_type -> stream.app.v1.MessageResponse
-	48, // 86: stream.app.v1.AdminService.ListAdminJobs:output_type -> stream.app.v1.ListAdminJobsResponse
-	50, // 87: stream.app.v1.AdminService.GetAdminJob:output_type -> stream.app.v1.GetAdminJobResponse
-	52, // 88: stream.app.v1.AdminService.GetAdminJobLogs:output_type -> stream.app.v1.GetAdminJobLogsResponse
-	54, // 89: stream.app.v1.AdminService.CreateAdminJob:output_type -> stream.app.v1.CreateAdminJobResponse
-	56, // 90: stream.app.v1.AdminService.CancelAdminJob:output_type -> stream.app.v1.CancelAdminJobResponse
-	58, // 91: stream.app.v1.AdminService.RetryAdminJob:output_type -> stream.app.v1.RetryAdminJobResponse
-	60, // 92: stream.app.v1.AdminService.ListAdminAgents:output_type -> stream.app.v1.ListAdminAgentsResponse
-	63, // 93: stream.app.v1.AdminService.RestartAdminAgent:output_type -> stream.app.v1.AdminAgentCommandResponse
-	63, // 94: stream.app.v1.AdminService.UpdateAdminAgent:output_type -> stream.app.v1.AdminAgentCommandResponse
-	61, // [61:95] is the sub-list for method output_type
-	27, // [27:61] is the sub-list for method input_type
-	27, // [27:27] is the sub-list for extension type_name
-	27, // [27:27] is the sub-list for extension extendee
-	0,  // [0:27] is the sub-list for field type_name
+	76, // 0: stream.app.v1.GetAdminDashboardResponse.dashboard:type_name -> stream.app.v1.AdminDashboard
+	77, // 1: stream.app.v1.ListAdminUsersResponse.users:type_name -> stream.app.v1.AdminUser
+	78, // 2: stream.app.v1.GetAdminUserResponse.user:type_name -> stream.app.v1.AdminUserDetail
+	77, // 3: stream.app.v1.CreateAdminUserResponse.user:type_name -> stream.app.v1.AdminUser
+	77, // 4: stream.app.v1.UpdateAdminUserResponse.user:type_name -> stream.app.v1.AdminUser
+	78, // 5: stream.app.v1.UpdateAdminUserReferralSettingsResponse.user:type_name -> stream.app.v1.AdminUserDetail
+	79, // 6: stream.app.v1.ListAdminVideosResponse.videos:type_name -> stream.app.v1.AdminVideo
+	79, // 7: stream.app.v1.GetAdminVideoResponse.video:type_name -> stream.app.v1.AdminVideo
+	79, // 8: stream.app.v1.CreateAdminVideoResponse.video:type_name -> stream.app.v1.AdminVideo
+	79, // 9: stream.app.v1.UpdateAdminVideoResponse.video:type_name -> stream.app.v1.AdminVideo
+	80, // 10: stream.app.v1.ListAdminPaymentsResponse.payments:type_name -> stream.app.v1.AdminPayment
+	80, // 11: stream.app.v1.GetAdminPaymentResponse.payment:type_name -> stream.app.v1.AdminPayment
+	80, // 12: stream.app.v1.CreateAdminPaymentResponse.payment:type_name -> stream.app.v1.AdminPayment
+	81, // 13: stream.app.v1.CreateAdminPaymentResponse.subscription:type_name -> stream.app.v1.PlanSubscription
+	80, // 14: stream.app.v1.UpdateAdminPaymentResponse.payment:type_name -> stream.app.v1.AdminPayment
+	82, // 15: stream.app.v1.ListAdminPlansResponse.plans:type_name -> stream.app.v1.AdminPlan
+	82, // 16: stream.app.v1.CreateAdminPlanResponse.plan:type_name -> stream.app.v1.AdminPlan
+	82, // 17: stream.app.v1.UpdateAdminPlanResponse.plan:type_name -> stream.app.v1.AdminPlan
+	83, // 18: stream.app.v1.ListAdminAdTemplatesResponse.templates:type_name -> stream.app.v1.AdminAdTemplate
+	83, // 19: stream.app.v1.GetAdminAdTemplateResponse.template:type_name -> stream.app.v1.AdminAdTemplate
+	83, // 20: stream.app.v1.CreateAdminAdTemplateResponse.template:type_name -> stream.app.v1.AdminAdTemplate
+	83, // 21: stream.app.v1.UpdateAdminAdTemplateResponse.template:type_name -> stream.app.v1.AdminAdTemplate
+	84, // 22: stream.app.v1.ListAdminPlayerConfigsResponse.configs:type_name -> stream.app.v1.AdminPlayerConfig
+	84, // 23: stream.app.v1.GetAdminPlayerConfigResponse.config:type_name -> stream.app.v1.AdminPlayerConfig
+	84, // 24: stream.app.v1.CreateAdminPlayerConfigResponse.config:type_name -> stream.app.v1.AdminPlayerConfig
+	84, // 25: stream.app.v1.UpdateAdminPlayerConfigResponse.config:type_name -> stream.app.v1.AdminPlayerConfig
+	85, // 26: stream.app.v1.ListAdminJobsResponse.jobs:type_name -> stream.app.v1.AdminJob
+	85, // 27: stream.app.v1.GetAdminJobResponse.job:type_name -> stream.app.v1.AdminJob
+	75, // 28: stream.app.v1.CreateAdminJobRequest.env:type_name -> stream.app.v1.CreateAdminJobRequest.EnvEntry
+	85, // 29: stream.app.v1.CreateAdminJobResponse.job:type_name -> stream.app.v1.AdminJob
+	85, // 30: stream.app.v1.RetryAdminJobResponse.job:type_name -> stream.app.v1.AdminJob
+	86, // 31: stream.app.v1.ListAdminAgentsResponse.agents:type_name -> stream.app.v1.AdminAgent
+	0,  // 32: stream.app.v1.AdminService.GetAdminDashboard:input_type -> stream.app.v1.GetAdminDashboardRequest
+	2,  // 33: stream.app.v1.AdminService.ListAdminUsers:input_type -> stream.app.v1.ListAdminUsersRequest
+	4,  // 34: stream.app.v1.AdminService.GetAdminUser:input_type -> stream.app.v1.GetAdminUserRequest
+	6,  // 35: stream.app.v1.AdminService.CreateAdminUser:input_type -> stream.app.v1.CreateAdminUserRequest
+	8,  // 36: stream.app.v1.AdminService.UpdateAdminUser:input_type -> stream.app.v1.UpdateAdminUserRequest
+	10, // 37: stream.app.v1.AdminService.UpdateAdminUserReferralSettings:input_type -> stream.app.v1.UpdateAdminUserReferralSettingsRequest
+	12, // 38: stream.app.v1.AdminService.UpdateAdminUserRole:input_type -> stream.app.v1.UpdateAdminUserRoleRequest
+	14, // 39: stream.app.v1.AdminService.DeleteAdminUser:input_type -> stream.app.v1.DeleteAdminUserRequest
+	15, // 40: stream.app.v1.AdminService.ListAdminVideos:input_type -> stream.app.v1.ListAdminVideosRequest
+	17, // 41: stream.app.v1.AdminService.GetAdminVideo:input_type -> stream.app.v1.GetAdminVideoRequest
+	19, // 42: stream.app.v1.AdminService.CreateAdminVideo:input_type -> stream.app.v1.CreateAdminVideoRequest
+	21, // 43: stream.app.v1.AdminService.UpdateAdminVideo:input_type -> stream.app.v1.UpdateAdminVideoRequest
+	23, // 44: stream.app.v1.AdminService.DeleteAdminVideo:input_type -> stream.app.v1.DeleteAdminVideoRequest
+	24, // 45: stream.app.v1.AdminService.ListAdminPayments:input_type -> stream.app.v1.ListAdminPaymentsRequest
+	26, // 46: stream.app.v1.AdminService.GetAdminPayment:input_type -> stream.app.v1.GetAdminPaymentRequest
+	28, // 47: stream.app.v1.AdminService.CreateAdminPayment:input_type -> stream.app.v1.CreateAdminPaymentRequest
+	30, // 48: stream.app.v1.AdminService.UpdateAdminPayment:input_type -> stream.app.v1.UpdateAdminPaymentRequest
+	32, // 49: stream.app.v1.AdminService.ListAdminPlans:input_type -> stream.app.v1.ListAdminPlansRequest
+	34, // 50: stream.app.v1.AdminService.CreateAdminPlan:input_type -> stream.app.v1.CreateAdminPlanRequest
+	36, // 51: stream.app.v1.AdminService.UpdateAdminPlan:input_type -> stream.app.v1.UpdateAdminPlanRequest
+	38, // 52: stream.app.v1.AdminService.DeleteAdminPlan:input_type -> stream.app.v1.DeleteAdminPlanRequest
+	40, // 53: stream.app.v1.AdminService.ListAdminAdTemplates:input_type -> stream.app.v1.ListAdminAdTemplatesRequest
+	42, // 54: stream.app.v1.AdminService.GetAdminAdTemplate:input_type -> stream.app.v1.GetAdminAdTemplateRequest
+	44, // 55: stream.app.v1.AdminService.CreateAdminAdTemplate:input_type -> stream.app.v1.CreateAdminAdTemplateRequest
+	46, // 56: stream.app.v1.AdminService.UpdateAdminAdTemplate:input_type -> stream.app.v1.UpdateAdminAdTemplateRequest
+	48, // 57: stream.app.v1.AdminService.DeleteAdminAdTemplate:input_type -> stream.app.v1.DeleteAdminAdTemplateRequest
+	49, // 58: stream.app.v1.AdminService.ListAdminPlayerConfigs:input_type -> stream.app.v1.ListAdminPlayerConfigsRequest
+	51, // 59: stream.app.v1.AdminService.GetAdminPlayerConfig:input_type -> stream.app.v1.GetAdminPlayerConfigRequest
+	53, // 60: stream.app.v1.AdminService.CreateAdminPlayerConfig:input_type -> stream.app.v1.CreateAdminPlayerConfigRequest
+	55, // 61: stream.app.v1.AdminService.UpdateAdminPlayerConfig:input_type -> stream.app.v1.UpdateAdminPlayerConfigRequest
+	57, // 62: stream.app.v1.AdminService.DeleteAdminPlayerConfig:input_type -> stream.app.v1.DeleteAdminPlayerConfigRequest
+	58, // 63: stream.app.v1.AdminService.ListAdminJobs:input_type -> stream.app.v1.ListAdminJobsRequest
+	60, // 64: stream.app.v1.AdminService.GetAdminJob:input_type -> stream.app.v1.GetAdminJobRequest
+	62, // 65: stream.app.v1.AdminService.GetAdminJobLogs:input_type -> stream.app.v1.GetAdminJobLogsRequest
+	64, // 66: stream.app.v1.AdminService.CreateAdminJob:input_type -> stream.app.v1.CreateAdminJobRequest
+	66, // 67: stream.app.v1.AdminService.CancelAdminJob:input_type -> stream.app.v1.CancelAdminJobRequest
+	68, // 68: stream.app.v1.AdminService.RetryAdminJob:input_type -> stream.app.v1.RetryAdminJobRequest
+	70, // 69: stream.app.v1.AdminService.ListAdminAgents:input_type -> stream.app.v1.ListAdminAgentsRequest
+	72, // 70: stream.app.v1.AdminService.RestartAdminAgent:input_type -> stream.app.v1.RestartAdminAgentRequest
+	73, // 71: stream.app.v1.AdminService.UpdateAdminAgent:input_type -> stream.app.v1.UpdateAdminAgentRequest
+	1,  // 72: stream.app.v1.AdminService.GetAdminDashboard:output_type -> stream.app.v1.GetAdminDashboardResponse
+	3,  // 73: stream.app.v1.AdminService.ListAdminUsers:output_type -> stream.app.v1.ListAdminUsersResponse
+	5,  // 74: stream.app.v1.AdminService.GetAdminUser:output_type -> stream.app.v1.GetAdminUserResponse
+	7,  // 75: stream.app.v1.AdminService.CreateAdminUser:output_type -> stream.app.v1.CreateAdminUserResponse
+	9,  // 76: stream.app.v1.AdminService.UpdateAdminUser:output_type -> stream.app.v1.UpdateAdminUserResponse
+	11, // 77: stream.app.v1.AdminService.UpdateAdminUserReferralSettings:output_type -> stream.app.v1.UpdateAdminUserReferralSettingsResponse
+	13, // 78: stream.app.v1.AdminService.UpdateAdminUserRole:output_type -> stream.app.v1.UpdateAdminUserRoleResponse
+	87, // 79: stream.app.v1.AdminService.DeleteAdminUser:output_type -> stream.app.v1.MessageResponse
+	16, // 80: stream.app.v1.AdminService.ListAdminVideos:output_type -> stream.app.v1.ListAdminVideosResponse
+	18, // 81: stream.app.v1.AdminService.GetAdminVideo:output_type -> stream.app.v1.GetAdminVideoResponse
+	20, // 82: stream.app.v1.AdminService.CreateAdminVideo:output_type -> stream.app.v1.CreateAdminVideoResponse
+	22, // 83: stream.app.v1.AdminService.UpdateAdminVideo:output_type -> stream.app.v1.UpdateAdminVideoResponse
+	87, // 84: stream.app.v1.AdminService.DeleteAdminVideo:output_type -> stream.app.v1.MessageResponse
+	25, // 85: stream.app.v1.AdminService.ListAdminPayments:output_type -> stream.app.v1.ListAdminPaymentsResponse
+	27, // 86: stream.app.v1.AdminService.GetAdminPayment:output_type -> stream.app.v1.GetAdminPaymentResponse
+	29, // 87: stream.app.v1.AdminService.CreateAdminPayment:output_type -> stream.app.v1.CreateAdminPaymentResponse
+	31, // 88: stream.app.v1.AdminService.UpdateAdminPayment:output_type -> stream.app.v1.UpdateAdminPaymentResponse
+	33, // 89: stream.app.v1.AdminService.ListAdminPlans:output_type -> stream.app.v1.ListAdminPlansResponse
+	35, // 90: stream.app.v1.AdminService.CreateAdminPlan:output_type -> stream.app.v1.CreateAdminPlanResponse
+	37, // 91: stream.app.v1.AdminService.UpdateAdminPlan:output_type -> stream.app.v1.UpdateAdminPlanResponse
+	39, // 92: stream.app.v1.AdminService.DeleteAdminPlan:output_type -> stream.app.v1.DeleteAdminPlanResponse
+	41, // 93: stream.app.v1.AdminService.ListAdminAdTemplates:output_type -> stream.app.v1.ListAdminAdTemplatesResponse
+	43, // 94: stream.app.v1.AdminService.GetAdminAdTemplate:output_type -> stream.app.v1.GetAdminAdTemplateResponse
+	45, // 95: stream.app.v1.AdminService.CreateAdminAdTemplate:output_type -> stream.app.v1.CreateAdminAdTemplateResponse
+	47, // 96: stream.app.v1.AdminService.UpdateAdminAdTemplate:output_type -> stream.app.v1.UpdateAdminAdTemplateResponse
+	87, // 97: stream.app.v1.AdminService.DeleteAdminAdTemplate:output_type -> stream.app.v1.MessageResponse
+	50, // 98: stream.app.v1.AdminService.ListAdminPlayerConfigs:output_type -> stream.app.v1.ListAdminPlayerConfigsResponse
+	52, // 99: stream.app.v1.AdminService.GetAdminPlayerConfig:output_type -> stream.app.v1.GetAdminPlayerConfigResponse
+	54, // 100: stream.app.v1.AdminService.CreateAdminPlayerConfig:output_type -> stream.app.v1.CreateAdminPlayerConfigResponse
+	56, // 101: stream.app.v1.AdminService.UpdateAdminPlayerConfig:output_type -> stream.app.v1.UpdateAdminPlayerConfigResponse
+	87, // 102: stream.app.v1.AdminService.DeleteAdminPlayerConfig:output_type -> stream.app.v1.MessageResponse
+	59, // 103: stream.app.v1.AdminService.ListAdminJobs:output_type -> stream.app.v1.ListAdminJobsResponse
+	61, // 104: stream.app.v1.AdminService.GetAdminJob:output_type -> stream.app.v1.GetAdminJobResponse
+	63, // 105: stream.app.v1.AdminService.GetAdminJobLogs:output_type -> stream.app.v1.GetAdminJobLogsResponse
+	65, // 106: stream.app.v1.AdminService.CreateAdminJob:output_type -> stream.app.v1.CreateAdminJobResponse
+	67, // 107: stream.app.v1.AdminService.CancelAdminJob:output_type -> stream.app.v1.CancelAdminJobResponse
+	69, // 108: stream.app.v1.AdminService.RetryAdminJob:output_type -> stream.app.v1.RetryAdminJobResponse
+	71, // 109: stream.app.v1.AdminService.ListAdminAgents:output_type -> stream.app.v1.ListAdminAgentsResponse
+	74, // 110: stream.app.v1.AdminService.RestartAdminAgent:output_type -> stream.app.v1.AdminAgentCommandResponse
+	74, // 111: stream.app.v1.AdminService.UpdateAdminAgent:output_type -> stream.app.v1.AdminAgentCommandResponse
+	72, // [72:112] is the sub-list for method output_type
+	32, // [32:72] is the sub-list for method input_type
+	32, // [32:32] is the sub-list for extension type_name
+	32, // [32:32] is the sub-list for extension extendee
+	0,  // [0:32] is the sub-list for field type_name
 }
 
 func init() { file_app_v1_admin_proto_init() }
@@ -4194,25 +5156,30 @@ func file_app_v1_admin_proto_init() {
 	file_app_v1_admin_proto_msgTypes[2].OneofWrappers = []any{}
 	file_app_v1_admin_proto_msgTypes[6].OneofWrappers = []any{}
 	file_app_v1_admin_proto_msgTypes[8].OneofWrappers = []any{}
-	file_app_v1_admin_proto_msgTypes[13].OneofWrappers = []any{}
-	file_app_v1_admin_proto_msgTypes[17].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[10].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[15].OneofWrappers = []any{}
 	file_app_v1_admin_proto_msgTypes[19].OneofWrappers = []any{}
-	file_app_v1_admin_proto_msgTypes[22].OneofWrappers = []any{}
-	file_app_v1_admin_proto_msgTypes[26].OneofWrappers = []any{}
-	file_app_v1_admin_proto_msgTypes[32].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[21].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[24].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[28].OneofWrappers = []any{}
 	file_app_v1_admin_proto_msgTypes[34].OneofWrappers = []any{}
-	file_app_v1_admin_proto_msgTypes[38].OneofWrappers = []any{}
-	file_app_v1_admin_proto_msgTypes[42].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[36].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[40].OneofWrappers = []any{}
 	file_app_v1_admin_proto_msgTypes[44].OneofWrappers = []any{}
-	file_app_v1_admin_proto_msgTypes[47].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[46].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[49].OneofWrappers = []any{}
 	file_app_v1_admin_proto_msgTypes[53].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[55].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[58].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[59].OneofWrappers = []any{}
+	file_app_v1_admin_proto_msgTypes[64].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_app_v1_admin_proto_rawDesc), len(file_app_v1_admin_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   65,
+			NumMessages:   76,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/internal/gen/proto/app/v1/admin_grpc.pb.go b/internal/gen/proto/app/v1/admin_grpc.pb.go
index ad8e7b3..3ac05a1 100644
--- a/internal/gen/proto/app/v1/admin_grpc.pb.go
+++ b/internal/gen/proto/app/v1/admin_grpc.pb.go
@@ -19,40 +19,46 @@ import (
 const _ = grpc.SupportPackageIsVersion9
 
 const (
-	AdminService_GetAdminDashboard_FullMethodName     = "/stream.app.v1.AdminService/GetAdminDashboard"
-	AdminService_ListAdminUsers_FullMethodName        = "/stream.app.v1.AdminService/ListAdminUsers"
-	AdminService_GetAdminUser_FullMethodName          = "/stream.app.v1.AdminService/GetAdminUser"
-	AdminService_CreateAdminUser_FullMethodName       = "/stream.app.v1.AdminService/CreateAdminUser"
-	AdminService_UpdateAdminUser_FullMethodName       = "/stream.app.v1.AdminService/UpdateAdminUser"
-	AdminService_UpdateAdminUserRole_FullMethodName   = "/stream.app.v1.AdminService/UpdateAdminUserRole"
-	AdminService_DeleteAdminUser_FullMethodName       = "/stream.app.v1.AdminService/DeleteAdminUser"
-	AdminService_ListAdminVideos_FullMethodName       = "/stream.app.v1.AdminService/ListAdminVideos"
-	AdminService_GetAdminVideo_FullMethodName         = "/stream.app.v1.AdminService/GetAdminVideo"
-	AdminService_CreateAdminVideo_FullMethodName      = "/stream.app.v1.AdminService/CreateAdminVideo"
-	AdminService_UpdateAdminVideo_FullMethodName      = "/stream.app.v1.AdminService/UpdateAdminVideo"
-	AdminService_DeleteAdminVideo_FullMethodName      = "/stream.app.v1.AdminService/DeleteAdminVideo"
-	AdminService_ListAdminPayments_FullMethodName     = "/stream.app.v1.AdminService/ListAdminPayments"
-	AdminService_GetAdminPayment_FullMethodName       = "/stream.app.v1.AdminService/GetAdminPayment"
-	AdminService_CreateAdminPayment_FullMethodName    = "/stream.app.v1.AdminService/CreateAdminPayment"
-	AdminService_UpdateAdminPayment_FullMethodName    = "/stream.app.v1.AdminService/UpdateAdminPayment"
-	AdminService_ListAdminPlans_FullMethodName        = "/stream.app.v1.AdminService/ListAdminPlans"
-	AdminService_CreateAdminPlan_FullMethodName       = "/stream.app.v1.AdminService/CreateAdminPlan"
-	AdminService_UpdateAdminPlan_FullMethodName       = "/stream.app.v1.AdminService/UpdateAdminPlan"
-	AdminService_DeleteAdminPlan_FullMethodName       = "/stream.app.v1.AdminService/DeleteAdminPlan"
-	AdminService_ListAdminAdTemplates_FullMethodName  = "/stream.app.v1.AdminService/ListAdminAdTemplates"
-	AdminService_GetAdminAdTemplate_FullMethodName    = "/stream.app.v1.AdminService/GetAdminAdTemplate"
-	AdminService_CreateAdminAdTemplate_FullMethodName = "/stream.app.v1.AdminService/CreateAdminAdTemplate"
-	AdminService_UpdateAdminAdTemplate_FullMethodName = "/stream.app.v1.AdminService/UpdateAdminAdTemplate"
-	AdminService_DeleteAdminAdTemplate_FullMethodName = "/stream.app.v1.AdminService/DeleteAdminAdTemplate"
-	AdminService_ListAdminJobs_FullMethodName         = "/stream.app.v1.AdminService/ListAdminJobs"
-	AdminService_GetAdminJob_FullMethodName           = "/stream.app.v1.AdminService/GetAdminJob"
-	AdminService_GetAdminJobLogs_FullMethodName       = "/stream.app.v1.AdminService/GetAdminJobLogs"
-	AdminService_CreateAdminJob_FullMethodName        = "/stream.app.v1.AdminService/CreateAdminJob"
-	AdminService_CancelAdminJob_FullMethodName        = "/stream.app.v1.AdminService/CancelAdminJob"
-	AdminService_RetryAdminJob_FullMethodName         = "/stream.app.v1.AdminService/RetryAdminJob"
-	AdminService_ListAdminAgents_FullMethodName       = "/stream.app.v1.AdminService/ListAdminAgents"
-	AdminService_RestartAdminAgent_FullMethodName     = "/stream.app.v1.AdminService/RestartAdminAgent"
-	AdminService_UpdateAdminAgent_FullMethodName      = "/stream.app.v1.AdminService/UpdateAdminAgent"
+	AdminService_GetAdminDashboard_FullMethodName               = "/stream.app.v1.AdminService/GetAdminDashboard"
+	AdminService_ListAdminUsers_FullMethodName                  = "/stream.app.v1.AdminService/ListAdminUsers"
+	AdminService_GetAdminUser_FullMethodName                    = "/stream.app.v1.AdminService/GetAdminUser"
+	AdminService_CreateAdminUser_FullMethodName                 = "/stream.app.v1.AdminService/CreateAdminUser"
+	AdminService_UpdateAdminUser_FullMethodName                 = "/stream.app.v1.AdminService/UpdateAdminUser"
+	AdminService_UpdateAdminUserReferralSettings_FullMethodName = "/stream.app.v1.AdminService/UpdateAdminUserReferralSettings"
+	AdminService_UpdateAdminUserRole_FullMethodName             = "/stream.app.v1.AdminService/UpdateAdminUserRole"
+	AdminService_DeleteAdminUser_FullMethodName                 = "/stream.app.v1.AdminService/DeleteAdminUser"
+	AdminService_ListAdminVideos_FullMethodName                 = "/stream.app.v1.AdminService/ListAdminVideos"
+	AdminService_GetAdminVideo_FullMethodName                   = "/stream.app.v1.AdminService/GetAdminVideo"
+	AdminService_CreateAdminVideo_FullMethodName                = "/stream.app.v1.AdminService/CreateAdminVideo"
+	AdminService_UpdateAdminVideo_FullMethodName                = "/stream.app.v1.AdminService/UpdateAdminVideo"
+	AdminService_DeleteAdminVideo_FullMethodName                = "/stream.app.v1.AdminService/DeleteAdminVideo"
+	AdminService_ListAdminPayments_FullMethodName               = "/stream.app.v1.AdminService/ListAdminPayments"
+	AdminService_GetAdminPayment_FullMethodName                 = "/stream.app.v1.AdminService/GetAdminPayment"
+	AdminService_CreateAdminPayment_FullMethodName              = "/stream.app.v1.AdminService/CreateAdminPayment"
+	AdminService_UpdateAdminPayment_FullMethodName              = "/stream.app.v1.AdminService/UpdateAdminPayment"
+	AdminService_ListAdminPlans_FullMethodName                  = "/stream.app.v1.AdminService/ListAdminPlans"
+	AdminService_CreateAdminPlan_FullMethodName                 = "/stream.app.v1.AdminService/CreateAdminPlan"
+	AdminService_UpdateAdminPlan_FullMethodName                 = "/stream.app.v1.AdminService/UpdateAdminPlan"
+	AdminService_DeleteAdminPlan_FullMethodName                 = "/stream.app.v1.AdminService/DeleteAdminPlan"
+	AdminService_ListAdminAdTemplates_FullMethodName            = "/stream.app.v1.AdminService/ListAdminAdTemplates"
+	AdminService_GetAdminAdTemplate_FullMethodName              = "/stream.app.v1.AdminService/GetAdminAdTemplate"
+	AdminService_CreateAdminAdTemplate_FullMethodName           = "/stream.app.v1.AdminService/CreateAdminAdTemplate"
+	AdminService_UpdateAdminAdTemplate_FullMethodName           = "/stream.app.v1.AdminService/UpdateAdminAdTemplate"
+	AdminService_DeleteAdminAdTemplate_FullMethodName           = "/stream.app.v1.AdminService/DeleteAdminAdTemplate"
+	AdminService_ListAdminPlayerConfigs_FullMethodName          = "/stream.app.v1.AdminService/ListAdminPlayerConfigs"
+	AdminService_GetAdminPlayerConfig_FullMethodName            = "/stream.app.v1.AdminService/GetAdminPlayerConfig"
+	AdminService_CreateAdminPlayerConfig_FullMethodName         = "/stream.app.v1.AdminService/CreateAdminPlayerConfig"
+	AdminService_UpdateAdminPlayerConfig_FullMethodName         = "/stream.app.v1.AdminService/UpdateAdminPlayerConfig"
+	AdminService_DeleteAdminPlayerConfig_FullMethodName         = "/stream.app.v1.AdminService/DeleteAdminPlayerConfig"
+	AdminService_ListAdminJobs_FullMethodName                   = "/stream.app.v1.AdminService/ListAdminJobs"
+	AdminService_GetAdminJob_FullMethodName                     = "/stream.app.v1.AdminService/GetAdminJob"
+	AdminService_GetAdminJobLogs_FullMethodName                 = "/stream.app.v1.AdminService/GetAdminJobLogs"
+	AdminService_CreateAdminJob_FullMethodName                  = "/stream.app.v1.AdminService/CreateAdminJob"
+	AdminService_CancelAdminJob_FullMethodName                  = "/stream.app.v1.AdminService/CancelAdminJob"
+	AdminService_RetryAdminJob_FullMethodName                   = "/stream.app.v1.AdminService/RetryAdminJob"
+	AdminService_ListAdminAgents_FullMethodName                 = "/stream.app.v1.AdminService/ListAdminAgents"
+	AdminService_RestartAdminAgent_FullMethodName               = "/stream.app.v1.AdminService/RestartAdminAgent"
+	AdminService_UpdateAdminAgent_FullMethodName                = "/stream.app.v1.AdminService/UpdateAdminAgent"
 )
 
 // AdminServiceClient is the client API for AdminService service.
@@ -64,6 +70,7 @@ type AdminServiceClient interface {
 	GetAdminUser(ctx context.Context, in *GetAdminUserRequest, opts ...grpc.CallOption) (*GetAdminUserResponse, error)
 	CreateAdminUser(ctx context.Context, in *CreateAdminUserRequest, opts ...grpc.CallOption) (*CreateAdminUserResponse, error)
 	UpdateAdminUser(ctx context.Context, in *UpdateAdminUserRequest, opts ...grpc.CallOption) (*UpdateAdminUserResponse, error)
+	UpdateAdminUserReferralSettings(ctx context.Context, in *UpdateAdminUserReferralSettingsRequest, opts ...grpc.CallOption) (*UpdateAdminUserReferralSettingsResponse, error)
 	UpdateAdminUserRole(ctx context.Context, in *UpdateAdminUserRoleRequest, opts ...grpc.CallOption) (*UpdateAdminUserRoleResponse, error)
 	DeleteAdminUser(ctx context.Context, in *DeleteAdminUserRequest, opts ...grpc.CallOption) (*MessageResponse, error)
 	ListAdminVideos(ctx context.Context, in *ListAdminVideosRequest, opts ...grpc.CallOption) (*ListAdminVideosResponse, error)
@@ -84,6 +91,11 @@ type AdminServiceClient interface {
 	CreateAdminAdTemplate(ctx context.Context, in *CreateAdminAdTemplateRequest, opts ...grpc.CallOption) (*CreateAdminAdTemplateResponse, error)
 	UpdateAdminAdTemplate(ctx context.Context, in *UpdateAdminAdTemplateRequest, opts ...grpc.CallOption) (*UpdateAdminAdTemplateResponse, error)
 	DeleteAdminAdTemplate(ctx context.Context, in *DeleteAdminAdTemplateRequest, opts ...grpc.CallOption) (*MessageResponse, error)
+	ListAdminPlayerConfigs(ctx context.Context, in *ListAdminPlayerConfigsRequest, opts ...grpc.CallOption) (*ListAdminPlayerConfigsResponse, error)
+	GetAdminPlayerConfig(ctx context.Context, in *GetAdminPlayerConfigRequest, opts ...grpc.CallOption) (*GetAdminPlayerConfigResponse, error)
+	CreateAdminPlayerConfig(ctx context.Context, in *CreateAdminPlayerConfigRequest, opts ...grpc.CallOption) (*CreateAdminPlayerConfigResponse, error)
+	UpdateAdminPlayerConfig(ctx context.Context, in *UpdateAdminPlayerConfigRequest, opts ...grpc.CallOption) (*UpdateAdminPlayerConfigResponse, error)
+	DeleteAdminPlayerConfig(ctx context.Context, in *DeleteAdminPlayerConfigRequest, opts ...grpc.CallOption) (*MessageResponse, error)
 	ListAdminJobs(ctx context.Context, in *ListAdminJobsRequest, opts ...grpc.CallOption) (*ListAdminJobsResponse, error)
 	GetAdminJob(ctx context.Context, in *GetAdminJobRequest, opts ...grpc.CallOption) (*GetAdminJobResponse, error)
 	GetAdminJobLogs(ctx context.Context, in *GetAdminJobLogsRequest, opts ...grpc.CallOption) (*GetAdminJobLogsResponse, error)
@@ -153,6 +165,16 @@ func (c *adminServiceClient) UpdateAdminUser(ctx context.Context, in *UpdateAdmi
 	return out, nil
 }
 
+func (c *adminServiceClient) UpdateAdminUserReferralSettings(ctx context.Context, in *UpdateAdminUserReferralSettingsRequest, opts ...grpc.CallOption) (*UpdateAdminUserReferralSettingsResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UpdateAdminUserReferralSettingsResponse)
+	err := c.cc.Invoke(ctx, AdminService_UpdateAdminUserReferralSettings_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *adminServiceClient) UpdateAdminUserRole(ctx context.Context, in *UpdateAdminUserRoleRequest, opts ...grpc.CallOption) (*UpdateAdminUserRoleResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(UpdateAdminUserRoleResponse)
@@ -353,6 +375,56 @@ func (c *adminServiceClient) DeleteAdminAdTemplate(ctx context.Context, in *Dele
 	return out, nil
 }
 
+func (c *adminServiceClient) ListAdminPlayerConfigs(ctx context.Context, in *ListAdminPlayerConfigsRequest, opts ...grpc.CallOption) (*ListAdminPlayerConfigsResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(ListAdminPlayerConfigsResponse)
+	err := c.cc.Invoke(ctx, AdminService_ListAdminPlayerConfigs_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *adminServiceClient) GetAdminPlayerConfig(ctx context.Context, in *GetAdminPlayerConfigRequest, opts ...grpc.CallOption) (*GetAdminPlayerConfigResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(GetAdminPlayerConfigResponse)
+	err := c.cc.Invoke(ctx, AdminService_GetAdminPlayerConfig_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *adminServiceClient) CreateAdminPlayerConfig(ctx context.Context, in *CreateAdminPlayerConfigRequest, opts ...grpc.CallOption) (*CreateAdminPlayerConfigResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(CreateAdminPlayerConfigResponse)
+	err := c.cc.Invoke(ctx, AdminService_CreateAdminPlayerConfig_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *adminServiceClient) UpdateAdminPlayerConfig(ctx context.Context, in *UpdateAdminPlayerConfigRequest, opts ...grpc.CallOption) (*UpdateAdminPlayerConfigResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UpdateAdminPlayerConfigResponse)
+	err := c.cc.Invoke(ctx, AdminService_UpdateAdminPlayerConfig_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *adminServiceClient) DeleteAdminPlayerConfig(ctx context.Context, in *DeleteAdminPlayerConfigRequest, opts ...grpc.CallOption) (*MessageResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(MessageResponse)
+	err := c.cc.Invoke(ctx, AdminService_DeleteAdminPlayerConfig_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *adminServiceClient) ListAdminJobs(ctx context.Context, in *ListAdminJobsRequest, opts ...grpc.CallOption) (*ListAdminJobsResponse, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(ListAdminJobsResponse)
@@ -452,6 +524,7 @@ type AdminServiceServer interface {
 	GetAdminUser(context.Context, *GetAdminUserRequest) (*GetAdminUserResponse, error)
 	CreateAdminUser(context.Context, *CreateAdminUserRequest) (*CreateAdminUserResponse, error)
 	UpdateAdminUser(context.Context, *UpdateAdminUserRequest) (*UpdateAdminUserResponse, error)
+	UpdateAdminUserReferralSettings(context.Context, *UpdateAdminUserReferralSettingsRequest) (*UpdateAdminUserReferralSettingsResponse, error)
 	UpdateAdminUserRole(context.Context, *UpdateAdminUserRoleRequest) (*UpdateAdminUserRoleResponse, error)
 	DeleteAdminUser(context.Context, *DeleteAdminUserRequest) (*MessageResponse, error)
 	ListAdminVideos(context.Context, *ListAdminVideosRequest) (*ListAdminVideosResponse, error)
@@ -472,6 +545,11 @@ type AdminServiceServer interface {
 	CreateAdminAdTemplate(context.Context, *CreateAdminAdTemplateRequest) (*CreateAdminAdTemplateResponse, error)
 	UpdateAdminAdTemplate(context.Context, *UpdateAdminAdTemplateRequest) (*UpdateAdminAdTemplateResponse, error)
 	DeleteAdminAdTemplate(context.Context, *DeleteAdminAdTemplateRequest) (*MessageResponse, error)
+	ListAdminPlayerConfigs(context.Context, *ListAdminPlayerConfigsRequest) (*ListAdminPlayerConfigsResponse, error)
+	GetAdminPlayerConfig(context.Context, *GetAdminPlayerConfigRequest) (*GetAdminPlayerConfigResponse, error)
+	CreateAdminPlayerConfig(context.Context, *CreateAdminPlayerConfigRequest) (*CreateAdminPlayerConfigResponse, error)
+	UpdateAdminPlayerConfig(context.Context, *UpdateAdminPlayerConfigRequest) (*UpdateAdminPlayerConfigResponse, error)
+	DeleteAdminPlayerConfig(context.Context, *DeleteAdminPlayerConfigRequest) (*MessageResponse, error)
 	ListAdminJobs(context.Context, *ListAdminJobsRequest) (*ListAdminJobsResponse, error)
 	GetAdminJob(context.Context, *GetAdminJobRequest) (*GetAdminJobResponse, error)
 	GetAdminJobLogs(context.Context, *GetAdminJobLogsRequest) (*GetAdminJobLogsResponse, error)
@@ -506,6 +584,9 @@ func (UnimplementedAdminServiceServer) CreateAdminUser(context.Context, *CreateA
 func (UnimplementedAdminServiceServer) UpdateAdminUser(context.Context, *UpdateAdminUserRequest) (*UpdateAdminUserResponse, error) {
 	return nil, status.Error(codes.Unimplemented, "method UpdateAdminUser not implemented")
 }
+func (UnimplementedAdminServiceServer) UpdateAdminUserReferralSettings(context.Context, *UpdateAdminUserReferralSettingsRequest) (*UpdateAdminUserReferralSettingsResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "method UpdateAdminUserReferralSettings not implemented")
+}
 func (UnimplementedAdminServiceServer) UpdateAdminUserRole(context.Context, *UpdateAdminUserRoleRequest) (*UpdateAdminUserRoleResponse, error) {
 	return nil, status.Error(codes.Unimplemented, "method UpdateAdminUserRole not implemented")
 }
@@ -566,6 +647,21 @@ func (UnimplementedAdminServiceServer) UpdateAdminAdTemplate(context.Context, *U
 func (UnimplementedAdminServiceServer) DeleteAdminAdTemplate(context.Context, *DeleteAdminAdTemplateRequest) (*MessageResponse, error) {
 	return nil, status.Error(codes.Unimplemented, "method DeleteAdminAdTemplate not implemented")
 }
+func (UnimplementedAdminServiceServer) ListAdminPlayerConfigs(context.Context, *ListAdminPlayerConfigsRequest) (*ListAdminPlayerConfigsResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "method ListAdminPlayerConfigs not implemented")
+}
+func (UnimplementedAdminServiceServer) GetAdminPlayerConfig(context.Context, *GetAdminPlayerConfigRequest) (*GetAdminPlayerConfigResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "method GetAdminPlayerConfig not implemented")
+}
+func (UnimplementedAdminServiceServer) CreateAdminPlayerConfig(context.Context, *CreateAdminPlayerConfigRequest) (*CreateAdminPlayerConfigResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "method CreateAdminPlayerConfig not implemented")
+}
+func (UnimplementedAdminServiceServer) UpdateAdminPlayerConfig(context.Context, *UpdateAdminPlayerConfigRequest) (*UpdateAdminPlayerConfigResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "method UpdateAdminPlayerConfig not implemented")
+}
+func (UnimplementedAdminServiceServer) DeleteAdminPlayerConfig(context.Context, *DeleteAdminPlayerConfigRequest) (*MessageResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "method DeleteAdminPlayerConfig not implemented")
+}
 func (UnimplementedAdminServiceServer) ListAdminJobs(context.Context, *ListAdminJobsRequest) (*ListAdminJobsResponse, error) {
 	return nil, status.Error(codes.Unimplemented, "method ListAdminJobs not implemented")
 }
@@ -704,6 +800,24 @@ func _AdminService_UpdateAdminUser_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _AdminService_UpdateAdminUserReferralSettings_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateAdminUserReferralSettingsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AdminServiceServer).UpdateAdminUserReferralSettings(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: AdminService_UpdateAdminUserReferralSettings_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AdminServiceServer).UpdateAdminUserReferralSettings(ctx, req.(*UpdateAdminUserReferralSettingsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _AdminService_UpdateAdminUserRole_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(UpdateAdminUserRoleRequest)
 	if err := dec(in); err != nil {
@@ -1064,6 +1178,96 @@ func _AdminService_DeleteAdminAdTemplate_Handler(srv interface{}, ctx context.Co
 	return interceptor(ctx, in, info, handler)
 }
 
+func _AdminService_ListAdminPlayerConfigs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListAdminPlayerConfigsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AdminServiceServer).ListAdminPlayerConfigs(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: AdminService_ListAdminPlayerConfigs_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AdminServiceServer).ListAdminPlayerConfigs(ctx, req.(*ListAdminPlayerConfigsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AdminService_GetAdminPlayerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetAdminPlayerConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AdminServiceServer).GetAdminPlayerConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: AdminService_GetAdminPlayerConfig_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AdminServiceServer).GetAdminPlayerConfig(ctx, req.(*GetAdminPlayerConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AdminService_CreateAdminPlayerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateAdminPlayerConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AdminServiceServer).CreateAdminPlayerConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: AdminService_CreateAdminPlayerConfig_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AdminServiceServer).CreateAdminPlayerConfig(ctx, req.(*CreateAdminPlayerConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AdminService_UpdateAdminPlayerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateAdminPlayerConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AdminServiceServer).UpdateAdminPlayerConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: AdminService_UpdateAdminPlayerConfig_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AdminServiceServer).UpdateAdminPlayerConfig(ctx, req.(*UpdateAdminPlayerConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AdminService_DeleteAdminPlayerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteAdminPlayerConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AdminServiceServer).DeleteAdminPlayerConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: AdminService_DeleteAdminPlayerConfig_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AdminServiceServer).DeleteAdminPlayerConfig(ctx, req.(*DeleteAdminPlayerConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _AdminService_ListAdminJobs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ListAdminJobsRequest)
 	if err := dec(in); err != nil {
@@ -1253,6 +1457,10 @@ var AdminService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "UpdateAdminUser",
 			Handler:    _AdminService_UpdateAdminUser_Handler,
 		},
+		{
+			MethodName: "UpdateAdminUserReferralSettings",
+			Handler:    _AdminService_UpdateAdminUserReferralSettings_Handler,
+		},
 		{
 			MethodName: "UpdateAdminUserRole",
 			Handler:    _AdminService_UpdateAdminUserRole_Handler,
@@ -1333,6 +1541,26 @@ var AdminService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "DeleteAdminAdTemplate",
 			Handler:    _AdminService_DeleteAdminAdTemplate_Handler,
 		},
+		{
+			MethodName: "ListAdminPlayerConfigs",
+			Handler:    _AdminService_ListAdminPlayerConfigs_Handler,
+		},
+		{
+			MethodName: "GetAdminPlayerConfig",
+			Handler:    _AdminService_GetAdminPlayerConfig_Handler,
+		},
+		{
+			MethodName: "CreateAdminPlayerConfig",
+			Handler:    _AdminService_CreateAdminPlayerConfig_Handler,
+		},
+		{
+			MethodName: "UpdateAdminPlayerConfig",
+			Handler:    _AdminService_UpdateAdminPlayerConfig_Handler,
+		},
+		{
+			MethodName: "DeleteAdminPlayerConfig",
+			Handler:    _AdminService_DeleteAdminPlayerConfig_Handler,
+		},
 		{
 			MethodName: "ListAdminJobs",
 			Handler:    _AdminService_ListAdminJobs_Handler,
diff --git a/internal/gen/proto/app/v1/auth.pb.go b/internal/gen/proto/app/v1/auth.pb.go
index 29dd742..f1759c5 100644
--- a/internal/gen/proto/app/v1/auth.pb.go
+++ b/internal/gen/proto/app/v1/auth.pb.go
@@ -122,6 +122,7 @@ type RegisterRequest struct {
 	Username      string                 `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
 	Email         string                 `protobuf:"bytes,2,opt,name=email,proto3" json:"email,omitempty"`
 	Password      string                 `protobuf:"bytes,3,opt,name=password,proto3" json:"password,omitempty"`
+	RefUsername   *string                `protobuf:"bytes,4,opt,name=ref_username,json=refUsername,proto3,oneof" json:"ref_username,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -177,6 +178,13 @@ func (x *RegisterRequest) GetPassword() string {
 	return ""
 }
 
+func (x *RegisterRequest) GetRefUsername() string {
+	if x != nil && x.RefUsername != nil {
+		return *x.RefUsername
+	}
+	return ""
+}
+
 type RegisterResponse struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	User          *User                  `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"`
@@ -488,6 +496,7 @@ func (x *GetGoogleLoginUrlResponse) GetUrl() string {
 type CompleteGoogleLoginRequest struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Code          string                 `protobuf:"bytes,1,opt,name=code,proto3" json:"code,omitempty"`
+	RefUsername   *string                `protobuf:"bytes,2,opt,name=ref_username,json=refUsername,proto3,oneof" json:"ref_username,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -529,6 +538,13 @@ func (x *CompleteGoogleLoginRequest) GetCode() string {
 	return ""
 }
 
+func (x *CompleteGoogleLoginRequest) GetRefUsername() string {
+	if x != nil && x.RefUsername != nil {
+		return *x.RefUsername
+	}
+	return ""
+}
+
 type CompleteGoogleLoginResponse struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	User          *User                  `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"`
@@ -582,11 +598,13 @@ const file_app_v1_auth_proto_rawDesc = "" +
 	"\x05email\x18\x01 \x01(\tR\x05email\x12\x1a\n" +
 	"\bpassword\x18\x02 \x01(\tR\bpassword\"8\n" +
 	"\rLoginResponse\x12'\n" +
-	"\x04user\x18\x01 \x01(\v2\x13.stream.app.v1.UserR\x04user\"_\n" +
+	"\x04user\x18\x01 \x01(\v2\x13.stream.app.v1.UserR\x04user\"\x98\x01\n" +
 	"\x0fRegisterRequest\x12\x1a\n" +
 	"\busername\x18\x01 \x01(\tR\busername\x12\x14\n" +
 	"\x05email\x18\x02 \x01(\tR\x05email\x12\x1a\n" +
-	"\bpassword\x18\x03 \x01(\tR\bpassword\";\n" +
+	"\bpassword\x18\x03 \x01(\tR\bpassword\x12&\n" +
+	"\fref_username\x18\x04 \x01(\tH\x00R\vrefUsername\x88\x01\x01B\x0f\n" +
+	"\r_ref_username\";\n" +
 	"\x10RegisterResponse\x12'\n" +
 	"\x04user\x18\x01 \x01(\v2\x13.stream.app.v1.UserR\x04user\"\x0f\n" +
 	"\rLogoutRequest\"e\n" +
@@ -600,9 +618,11 @@ const file_app_v1_auth_proto_rawDesc = "" +
 	"\fnew_password\x18\x02 \x01(\tR\vnewPassword\"\x1a\n" +
 	"\x18GetGoogleLoginUrlRequest\"-\n" +
 	"\x19GetGoogleLoginUrlResponse\x12\x10\n" +
-	"\x03url\x18\x01 \x01(\tR\x03url\"0\n" +
+	"\x03url\x18\x01 \x01(\tR\x03url\"i\n" +
 	"\x1aCompleteGoogleLoginRequest\x12\x12\n" +
-	"\x04code\x18\x01 \x01(\tR\x04code\"F\n" +
+	"\x04code\x18\x01 \x01(\tR\x04code\x12&\n" +
+	"\fref_username\x18\x02 \x01(\tH\x00R\vrefUsername\x88\x01\x01B\x0f\n" +
+	"\r_ref_username\"F\n" +
 	"\x1bCompleteGoogleLoginResponse\x12'\n" +
 	"\x04user\x18\x01 \x01(\v2\x13.stream.app.v1.UserR\x04user2\xc2\x05\n" +
 	"\vAuthService\x12B\n" +
@@ -677,6 +697,8 @@ func file_app_v1_auth_proto_init() {
 		return
 	}
 	file_app_v1_common_proto_init()
+	file_app_v1_auth_proto_msgTypes[2].OneofWrappers = []any{}
+	file_app_v1_auth_proto_msgTypes[10].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/internal/gen/proto/app/v1/catalog.pb.go b/internal/gen/proto/app/v1/catalog.pb.go
index cb804d5..0896a3a 100644
--- a/internal/gen/proto/app/v1/catalog.pb.go
+++ b/internal/gen/proto/app/v1/catalog.pb.go
@@ -637,6 +637,506 @@ func (x *DeleteAdTemplateRequest) GetId() string {
 	return ""
 }
 
+type ListPlayerConfigsRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *ListPlayerConfigsRequest) Reset() {
+	*x = ListPlayerConfigsRequest{}
+	mi := &file_app_v1_catalog_proto_msgTypes[12]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ListPlayerConfigsRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ListPlayerConfigsRequest) ProtoMessage() {}
+
+func (x *ListPlayerConfigsRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_catalog_proto_msgTypes[12]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ListPlayerConfigsRequest.ProtoReflect.Descriptor instead.
+func (*ListPlayerConfigsRequest) Descriptor() ([]byte, []int) {
+	return file_app_v1_catalog_proto_rawDescGZIP(), []int{12}
+}
+
+type ListPlayerConfigsResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Configs       []*PlayerConfig        `protobuf:"bytes,1,rep,name=configs,proto3" json:"configs,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *ListPlayerConfigsResponse) Reset() {
+	*x = ListPlayerConfigsResponse{}
+	mi := &file_app_v1_catalog_proto_msgTypes[13]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ListPlayerConfigsResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ListPlayerConfigsResponse) ProtoMessage() {}
+
+func (x *ListPlayerConfigsResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_catalog_proto_msgTypes[13]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ListPlayerConfigsResponse.ProtoReflect.Descriptor instead.
+func (*ListPlayerConfigsResponse) Descriptor() ([]byte, []int) {
+	return file_app_v1_catalog_proto_rawDescGZIP(), []int{13}
+}
+
+func (x *ListPlayerConfigsResponse) GetConfigs() []*PlayerConfig {
+	if x != nil {
+		return x.Configs
+	}
+	return nil
+}
+
+type CreatePlayerConfigRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Description   *string                `protobuf:"bytes,2,opt,name=description,proto3,oneof" json:"description,omitempty"`
+	Autoplay      bool                   `protobuf:"varint,3,opt,name=autoplay,proto3" json:"autoplay,omitempty"`
+	Loop          bool                   `protobuf:"varint,4,opt,name=loop,proto3" json:"loop,omitempty"`
+	Muted         bool                   `protobuf:"varint,5,opt,name=muted,proto3" json:"muted,omitempty"`
+	ShowControls  bool                   `protobuf:"varint,6,opt,name=show_controls,json=showControls,proto3" json:"show_controls,omitempty"`
+	Pip           bool                   `protobuf:"varint,7,opt,name=pip,proto3" json:"pip,omitempty"`
+	Airplay       bool                   `protobuf:"varint,8,opt,name=airplay,proto3" json:"airplay,omitempty"`
+	Chromecast    bool                   `protobuf:"varint,9,opt,name=chromecast,proto3" json:"chromecast,omitempty"`
+	IsActive      *bool                  `protobuf:"varint,10,opt,name=is_active,json=isActive,proto3,oneof" json:"is_active,omitempty"`
+	IsDefault     *bool                  `protobuf:"varint,11,opt,name=is_default,json=isDefault,proto3,oneof" json:"is_default,omitempty"`
+	EncrytionM3U8 *bool                  `protobuf:"varint,12,opt,name=encrytion_m3u8,json=encrytionM3u8,proto3,oneof" json:"encrytion_m3u8,omitempty"`
+	LogoUrl       *string                `protobuf:"bytes,13,opt,name=logo_url,json=logoUrl,proto3,oneof" json:"logo_url,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *CreatePlayerConfigRequest) Reset() {
+	*x = CreatePlayerConfigRequest{}
+	mi := &file_app_v1_catalog_proto_msgTypes[14]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *CreatePlayerConfigRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CreatePlayerConfigRequest) ProtoMessage() {}
+
+func (x *CreatePlayerConfigRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_catalog_proto_msgTypes[14]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CreatePlayerConfigRequest.ProtoReflect.Descriptor instead.
+func (*CreatePlayerConfigRequest) Descriptor() ([]byte, []int) {
+	return file_app_v1_catalog_proto_rawDescGZIP(), []int{14}
+}
+
+func (x *CreatePlayerConfigRequest) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *CreatePlayerConfigRequest) GetDescription() string {
+	if x != nil && x.Description != nil {
+		return *x.Description
+	}
+	return ""
+}
+
+func (x *CreatePlayerConfigRequest) GetAutoplay() bool {
+	if x != nil {
+		return x.Autoplay
+	}
+	return false
+}
+
+func (x *CreatePlayerConfigRequest) GetLoop() bool {
+	if x != nil {
+		return x.Loop
+	}
+	return false
+}
+
+func (x *CreatePlayerConfigRequest) GetMuted() bool {
+	if x != nil {
+		return x.Muted
+	}
+	return false
+}
+
+func (x *CreatePlayerConfigRequest) GetShowControls() bool {
+	if x != nil {
+		return x.ShowControls
+	}
+	return false
+}
+
+func (x *CreatePlayerConfigRequest) GetPip() bool {
+	if x != nil {
+		return x.Pip
+	}
+	return false
+}
+
+func (x *CreatePlayerConfigRequest) GetAirplay() bool {
+	if x != nil {
+		return x.Airplay
+	}
+	return false
+}
+
+func (x *CreatePlayerConfigRequest) GetChromecast() bool {
+	if x != nil {
+		return x.Chromecast
+	}
+	return false
+}
+
+func (x *CreatePlayerConfigRequest) GetIsActive() bool {
+	if x != nil && x.IsActive != nil {
+		return *x.IsActive
+	}
+	return false
+}
+
+func (x *CreatePlayerConfigRequest) GetIsDefault() bool {
+	if x != nil && x.IsDefault != nil {
+		return *x.IsDefault
+	}
+	return false
+}
+
+func (x *CreatePlayerConfigRequest) GetEncrytionM3U8() bool {
+	if x != nil && x.EncrytionM3U8 != nil {
+		return *x.EncrytionM3U8
+	}
+	return false
+}
+
+func (x *CreatePlayerConfigRequest) GetLogoUrl() string {
+	if x != nil && x.LogoUrl != nil {
+		return *x.LogoUrl
+	}
+	return ""
+}
+
+type CreatePlayerConfigResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Config        *PlayerConfig          `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *CreatePlayerConfigResponse) Reset() {
+	*x = CreatePlayerConfigResponse{}
+	mi := &file_app_v1_catalog_proto_msgTypes[15]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *CreatePlayerConfigResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CreatePlayerConfigResponse) ProtoMessage() {}
+
+func (x *CreatePlayerConfigResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_catalog_proto_msgTypes[15]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CreatePlayerConfigResponse.ProtoReflect.Descriptor instead.
+func (*CreatePlayerConfigResponse) Descriptor() ([]byte, []int) {
+	return file_app_v1_catalog_proto_rawDescGZIP(), []int{15}
+}
+
+func (x *CreatePlayerConfigResponse) GetConfig() *PlayerConfig {
+	if x != nil {
+		return x.Config
+	}
+	return nil
+}
+
+type UpdatePlayerConfigRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Name          string                 `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Description   *string                `protobuf:"bytes,3,opt,name=description,proto3,oneof" json:"description,omitempty"`
+	Autoplay      bool                   `protobuf:"varint,4,opt,name=autoplay,proto3" json:"autoplay,omitempty"`
+	Loop          bool                   `protobuf:"varint,5,opt,name=loop,proto3" json:"loop,omitempty"`
+	Muted         bool                   `protobuf:"varint,6,opt,name=muted,proto3" json:"muted,omitempty"`
+	ShowControls  bool                   `protobuf:"varint,7,opt,name=show_controls,json=showControls,proto3" json:"show_controls,omitempty"`
+	Pip           bool                   `protobuf:"varint,8,opt,name=pip,proto3" json:"pip,omitempty"`
+	Airplay       bool                   `protobuf:"varint,9,opt,name=airplay,proto3" json:"airplay,omitempty"`
+	Chromecast    bool                   `protobuf:"varint,10,opt,name=chromecast,proto3" json:"chromecast,omitempty"`
+	IsActive      *bool                  `protobuf:"varint,11,opt,name=is_active,json=isActive,proto3,oneof" json:"is_active,omitempty"`
+	IsDefault     *bool                  `protobuf:"varint,12,opt,name=is_default,json=isDefault,proto3,oneof" json:"is_default,omitempty"`
+	EncrytionM3U8 *bool                  `protobuf:"varint,13,opt,name=encrytion_m3u8,json=encrytionM3u8,proto3,oneof" json:"encrytion_m3u8,omitempty"`
+	LogoUrl       *string                `protobuf:"bytes,14,opt,name=logo_url,json=logoUrl,proto3,oneof" json:"logo_url,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *UpdatePlayerConfigRequest) Reset() {
+	*x = UpdatePlayerConfigRequest{}
+	mi := &file_app_v1_catalog_proto_msgTypes[16]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *UpdatePlayerConfigRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpdatePlayerConfigRequest) ProtoMessage() {}
+
+func (x *UpdatePlayerConfigRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_catalog_proto_msgTypes[16]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpdatePlayerConfigRequest.ProtoReflect.Descriptor instead.
+func (*UpdatePlayerConfigRequest) Descriptor() ([]byte, []int) {
+	return file_app_v1_catalog_proto_rawDescGZIP(), []int{16}
+}
+
+func (x *UpdatePlayerConfigRequest) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *UpdatePlayerConfigRequest) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *UpdatePlayerConfigRequest) GetDescription() string {
+	if x != nil && x.Description != nil {
+		return *x.Description
+	}
+	return ""
+}
+
+func (x *UpdatePlayerConfigRequest) GetAutoplay() bool {
+	if x != nil {
+		return x.Autoplay
+	}
+	return false
+}
+
+func (x *UpdatePlayerConfigRequest) GetLoop() bool {
+	if x != nil {
+		return x.Loop
+	}
+	return false
+}
+
+func (x *UpdatePlayerConfigRequest) GetMuted() bool {
+	if x != nil {
+		return x.Muted
+	}
+	return false
+}
+
+func (x *UpdatePlayerConfigRequest) GetShowControls() bool {
+	if x != nil {
+		return x.ShowControls
+	}
+	return false
+}
+
+func (x *UpdatePlayerConfigRequest) GetPip() bool {
+	if x != nil {
+		return x.Pip
+	}
+	return false
+}
+
+func (x *UpdatePlayerConfigRequest) GetAirplay() bool {
+	if x != nil {
+		return x.Airplay
+	}
+	return false
+}
+
+func (x *UpdatePlayerConfigRequest) GetChromecast() bool {
+	if x != nil {
+		return x.Chromecast
+	}
+	return false
+}
+
+func (x *UpdatePlayerConfigRequest) GetIsActive() bool {
+	if x != nil && x.IsActive != nil {
+		return *x.IsActive
+	}
+	return false
+}
+
+func (x *UpdatePlayerConfigRequest) GetIsDefault() bool {
+	if x != nil && x.IsDefault != nil {
+		return *x.IsDefault
+	}
+	return false
+}
+
+func (x *UpdatePlayerConfigRequest) GetEncrytionM3U8() bool {
+	if x != nil && x.EncrytionM3U8 != nil {
+		return *x.EncrytionM3U8
+	}
+	return false
+}
+
+func (x *UpdatePlayerConfigRequest) GetLogoUrl() string {
+	if x != nil && x.LogoUrl != nil {
+		return *x.LogoUrl
+	}
+	return ""
+}
+
+type UpdatePlayerConfigResponse struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Config        *PlayerConfig          `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *UpdatePlayerConfigResponse) Reset() {
+	*x = UpdatePlayerConfigResponse{}
+	mi := &file_app_v1_catalog_proto_msgTypes[17]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *UpdatePlayerConfigResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UpdatePlayerConfigResponse) ProtoMessage() {}
+
+func (x *UpdatePlayerConfigResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_catalog_proto_msgTypes[17]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UpdatePlayerConfigResponse.ProtoReflect.Descriptor instead.
+func (*UpdatePlayerConfigResponse) Descriptor() ([]byte, []int) {
+	return file_app_v1_catalog_proto_rawDescGZIP(), []int{17}
+}
+
+func (x *UpdatePlayerConfigResponse) GetConfig() *PlayerConfig {
+	if x != nil {
+		return x.Config
+	}
+	return nil
+}
+
+type DeletePlayerConfigRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *DeletePlayerConfigRequest) Reset() {
+	*x = DeletePlayerConfigRequest{}
+	mi := &file_app_v1_catalog_proto_msgTypes[18]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *DeletePlayerConfigRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DeletePlayerConfigRequest) ProtoMessage() {}
+
+func (x *DeletePlayerConfigRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_catalog_proto_msgTypes[18]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use DeletePlayerConfigRequest.ProtoReflect.Descriptor instead.
+func (*DeletePlayerConfigRequest) Descriptor() ([]byte, []int) {
+	return file_app_v1_catalog_proto_rawDescGZIP(), []int{18}
+}
+
+func (x *DeletePlayerConfigRequest) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
 type ListPlansRequest struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
@@ -645,7 +1145,7 @@ type ListPlansRequest struct {
 
 func (x *ListPlansRequest) Reset() {
 	*x = ListPlansRequest{}
-	mi := &file_app_v1_catalog_proto_msgTypes[12]
+	mi := &file_app_v1_catalog_proto_msgTypes[19]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -657,7 +1157,7 @@ func (x *ListPlansRequest) String() string {
 func (*ListPlansRequest) ProtoMessage() {}
 
 func (x *ListPlansRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_catalog_proto_msgTypes[12]
+	mi := &file_app_v1_catalog_proto_msgTypes[19]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -670,7 +1170,7 @@ func (x *ListPlansRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListPlansRequest.ProtoReflect.Descriptor instead.
 func (*ListPlansRequest) Descriptor() ([]byte, []int) {
-	return file_app_v1_catalog_proto_rawDescGZIP(), []int{12}
+	return file_app_v1_catalog_proto_rawDescGZIP(), []int{19}
 }
 
 type ListPlansResponse struct {
@@ -682,7 +1182,7 @@ type ListPlansResponse struct {
 
 func (x *ListPlansResponse) Reset() {
 	*x = ListPlansResponse{}
-	mi := &file_app_v1_catalog_proto_msgTypes[13]
+	mi := &file_app_v1_catalog_proto_msgTypes[20]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -694,7 +1194,7 @@ func (x *ListPlansResponse) String() string {
 func (*ListPlansResponse) ProtoMessage() {}
 
 func (x *ListPlansResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_catalog_proto_msgTypes[13]
+	mi := &file_app_v1_catalog_proto_msgTypes[20]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -707,7 +1207,7 @@ func (x *ListPlansResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListPlansResponse.ProtoReflect.Descriptor instead.
 func (*ListPlansResponse) Descriptor() ([]byte, []int) {
-	return file_app_v1_catalog_proto_rawDescGZIP(), []int{13}
+	return file_app_v1_catalog_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *ListPlansResponse) GetPlans() []*Plan {
@@ -774,6 +1274,64 @@ const file_app_v1_catalog_proto_rawDesc = "" +
 	"\x18UpdateAdTemplateResponse\x125\n" +
 	"\btemplate\x18\x01 \x01(\v2\x19.stream.app.v1.AdTemplateR\btemplate\")\n" +
 	"\x17DeleteAdTemplateRequest\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\"\x1a\n" +
+	"\x18ListPlayerConfigsRequest\"R\n" +
+	"\x19ListPlayerConfigsResponse\x125\n" +
+	"\aconfigs\x18\x01 \x03(\v2\x1b.stream.app.v1.PlayerConfigR\aconfigs\"\xec\x03\n" +
+	"\x19CreatePlayerConfigRequest\x12\x12\n" +
+	"\x04name\x18\x01 \x01(\tR\x04name\x12%\n" +
+	"\vdescription\x18\x02 \x01(\tH\x00R\vdescription\x88\x01\x01\x12\x1a\n" +
+	"\bautoplay\x18\x03 \x01(\bR\bautoplay\x12\x12\n" +
+	"\x04loop\x18\x04 \x01(\bR\x04loop\x12\x14\n" +
+	"\x05muted\x18\x05 \x01(\bR\x05muted\x12#\n" +
+	"\rshow_controls\x18\x06 \x01(\bR\fshowControls\x12\x10\n" +
+	"\x03pip\x18\a \x01(\bR\x03pip\x12\x18\n" +
+	"\aairplay\x18\b \x01(\bR\aairplay\x12\x1e\n" +
+	"\n" +
+	"chromecast\x18\t \x01(\bR\n" +
+	"chromecast\x12 \n" +
+	"\tis_active\x18\n" +
+	" \x01(\bH\x01R\bisActive\x88\x01\x01\x12\"\n" +
+	"\n" +
+	"is_default\x18\v \x01(\bH\x02R\tisDefault\x88\x01\x01\x12*\n" +
+	"\x0eencrytion_m3u8\x18\f \x01(\bH\x03R\rencrytionM3u8\x88\x01\x01\x12\x1e\n" +
+	"\blogo_url\x18\r \x01(\tH\x04R\alogoUrl\x88\x01\x01B\x0e\n" +
+	"\f_descriptionB\f\n" +
+	"\n" +
+	"_is_activeB\r\n" +
+	"\v_is_defaultB\x11\n" +
+	"\x0f_encrytion_m3u8B\v\n" +
+	"\t_logo_url\"Q\n" +
+	"\x1aCreatePlayerConfigResponse\x123\n" +
+	"\x06config\x18\x01 \x01(\v2\x1b.stream.app.v1.PlayerConfigR\x06config\"\xfc\x03\n" +
+	"\x19UpdatePlayerConfigRequest\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
+	"\x04name\x18\x02 \x01(\tR\x04name\x12%\n" +
+	"\vdescription\x18\x03 \x01(\tH\x00R\vdescription\x88\x01\x01\x12\x1a\n" +
+	"\bautoplay\x18\x04 \x01(\bR\bautoplay\x12\x12\n" +
+	"\x04loop\x18\x05 \x01(\bR\x04loop\x12\x14\n" +
+	"\x05muted\x18\x06 \x01(\bR\x05muted\x12#\n" +
+	"\rshow_controls\x18\a \x01(\bR\fshowControls\x12\x10\n" +
+	"\x03pip\x18\b \x01(\bR\x03pip\x12\x18\n" +
+	"\aairplay\x18\t \x01(\bR\aairplay\x12\x1e\n" +
+	"\n" +
+	"chromecast\x18\n" +
+	" \x01(\bR\n" +
+	"chromecast\x12 \n" +
+	"\tis_active\x18\v \x01(\bH\x01R\bisActive\x88\x01\x01\x12\"\n" +
+	"\n" +
+	"is_default\x18\f \x01(\bH\x02R\tisDefault\x88\x01\x01\x12*\n" +
+	"\x0eencrytion_m3u8\x18\r \x01(\bH\x03R\rencrytionM3u8\x88\x01\x01\x12\x1e\n" +
+	"\blogo_url\x18\x0e \x01(\tH\x04R\alogoUrl\x88\x01\x01B\x0e\n" +
+	"\f_descriptionB\f\n" +
+	"\n" +
+	"_is_activeB\r\n" +
+	"\v_is_defaultB\x11\n" +
+	"\x0f_encrytion_m3u8B\v\n" +
+	"\t_logo_url\"Q\n" +
+	"\x1aUpdatePlayerConfigResponse\x123\n" +
+	"\x06config\x18\x01 \x01(\v2\x1b.stream.app.v1.PlayerConfigR\x06config\"+\n" +
+	"\x19DeletePlayerConfigRequest\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\"\x12\n" +
 	"\x10ListPlansRequest\">\n" +
 	"\x11ListPlansResponse\x12)\n" +
@@ -786,7 +1344,12 @@ const file_app_v1_catalog_proto_rawDesc = "" +
 	"\x0fListAdTemplates\x12%.stream.app.v1.ListAdTemplatesRequest\x1a&.stream.app.v1.ListAdTemplatesResponse\x12c\n" +
 	"\x10CreateAdTemplate\x12&.stream.app.v1.CreateAdTemplateRequest\x1a'.stream.app.v1.CreateAdTemplateResponse\x12c\n" +
 	"\x10UpdateAdTemplate\x12&.stream.app.v1.UpdateAdTemplateRequest\x1a'.stream.app.v1.UpdateAdTemplateResponse\x12Z\n" +
-	"\x10DeleteAdTemplate\x12&.stream.app.v1.DeleteAdTemplateRequest\x1a\x1e.stream.app.v1.MessageResponse2^\n" +
+	"\x10DeleteAdTemplate\x12&.stream.app.v1.DeleteAdTemplateRequest\x1a\x1e.stream.app.v1.MessageResponse2\xb4\x03\n" +
+	"\x14PlayerConfigsService\x12f\n" +
+	"\x11ListPlayerConfigs\x12'.stream.app.v1.ListPlayerConfigsRequest\x1a(.stream.app.v1.ListPlayerConfigsResponse\x12i\n" +
+	"\x12CreatePlayerConfig\x12(.stream.app.v1.CreatePlayerConfigRequest\x1a).stream.app.v1.CreatePlayerConfigResponse\x12i\n" +
+	"\x12UpdatePlayerConfig\x12(.stream.app.v1.UpdatePlayerConfigRequest\x1a).stream.app.v1.UpdatePlayerConfigResponse\x12^\n" +
+	"\x12DeletePlayerConfig\x12(.stream.app.v1.DeletePlayerConfigRequest\x1a\x1e.stream.app.v1.MessageResponse2^\n" +
 	"\fPlansService\x12N\n" +
 	"\tListPlans\x12\x1f.stream.app.v1.ListPlansRequest\x1a .stream.app.v1.ListPlansResponseB,Z*stream.api/internal/gen/proto/app/v1;appv1b\x06proto3"
 
@@ -802,55 +1365,74 @@ func file_app_v1_catalog_proto_rawDescGZIP() []byte {
 	return file_app_v1_catalog_proto_rawDescData
 }
 
-var file_app_v1_catalog_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
+var file_app_v1_catalog_proto_msgTypes = make([]protoimpl.MessageInfo, 21)
 var file_app_v1_catalog_proto_goTypes = []any{
-	(*ListDomainsRequest)(nil),       // 0: stream.app.v1.ListDomainsRequest
-	(*ListDomainsResponse)(nil),      // 1: stream.app.v1.ListDomainsResponse
-	(*CreateDomainRequest)(nil),      // 2: stream.app.v1.CreateDomainRequest
-	(*CreateDomainResponse)(nil),     // 3: stream.app.v1.CreateDomainResponse
-	(*DeleteDomainRequest)(nil),      // 4: stream.app.v1.DeleteDomainRequest
-	(*ListAdTemplatesRequest)(nil),   // 5: stream.app.v1.ListAdTemplatesRequest
-	(*ListAdTemplatesResponse)(nil),  // 6: stream.app.v1.ListAdTemplatesResponse
-	(*CreateAdTemplateRequest)(nil),  // 7: stream.app.v1.CreateAdTemplateRequest
-	(*CreateAdTemplateResponse)(nil), // 8: stream.app.v1.CreateAdTemplateResponse
-	(*UpdateAdTemplateRequest)(nil),  // 9: stream.app.v1.UpdateAdTemplateRequest
-	(*UpdateAdTemplateResponse)(nil), // 10: stream.app.v1.UpdateAdTemplateResponse
-	(*DeleteAdTemplateRequest)(nil),  // 11: stream.app.v1.DeleteAdTemplateRequest
-	(*ListPlansRequest)(nil),         // 12: stream.app.v1.ListPlansRequest
-	(*ListPlansResponse)(nil),        // 13: stream.app.v1.ListPlansResponse
-	(*Domain)(nil),                   // 14: stream.app.v1.Domain
-	(*AdTemplate)(nil),               // 15: stream.app.v1.AdTemplate
-	(*Plan)(nil),                     // 16: stream.app.v1.Plan
-	(*MessageResponse)(nil),          // 17: stream.app.v1.MessageResponse
+	(*ListDomainsRequest)(nil),         // 0: stream.app.v1.ListDomainsRequest
+	(*ListDomainsResponse)(nil),        // 1: stream.app.v1.ListDomainsResponse
+	(*CreateDomainRequest)(nil),        // 2: stream.app.v1.CreateDomainRequest
+	(*CreateDomainResponse)(nil),       // 3: stream.app.v1.CreateDomainResponse
+	(*DeleteDomainRequest)(nil),        // 4: stream.app.v1.DeleteDomainRequest
+	(*ListAdTemplatesRequest)(nil),     // 5: stream.app.v1.ListAdTemplatesRequest
+	(*ListAdTemplatesResponse)(nil),    // 6: stream.app.v1.ListAdTemplatesResponse
+	(*CreateAdTemplateRequest)(nil),    // 7: stream.app.v1.CreateAdTemplateRequest
+	(*CreateAdTemplateResponse)(nil),   // 8: stream.app.v1.CreateAdTemplateResponse
+	(*UpdateAdTemplateRequest)(nil),    // 9: stream.app.v1.UpdateAdTemplateRequest
+	(*UpdateAdTemplateResponse)(nil),   // 10: stream.app.v1.UpdateAdTemplateResponse
+	(*DeleteAdTemplateRequest)(nil),    // 11: stream.app.v1.DeleteAdTemplateRequest
+	(*ListPlayerConfigsRequest)(nil),   // 12: stream.app.v1.ListPlayerConfigsRequest
+	(*ListPlayerConfigsResponse)(nil),  // 13: stream.app.v1.ListPlayerConfigsResponse
+	(*CreatePlayerConfigRequest)(nil),  // 14: stream.app.v1.CreatePlayerConfigRequest
+	(*CreatePlayerConfigResponse)(nil), // 15: stream.app.v1.CreatePlayerConfigResponse
+	(*UpdatePlayerConfigRequest)(nil),  // 16: stream.app.v1.UpdatePlayerConfigRequest
+	(*UpdatePlayerConfigResponse)(nil), // 17: stream.app.v1.UpdatePlayerConfigResponse
+	(*DeletePlayerConfigRequest)(nil),  // 18: stream.app.v1.DeletePlayerConfigRequest
+	(*ListPlansRequest)(nil),           // 19: stream.app.v1.ListPlansRequest
+	(*ListPlansResponse)(nil),          // 20: stream.app.v1.ListPlansResponse
+	(*Domain)(nil),                     // 21: stream.app.v1.Domain
+	(*AdTemplate)(nil),                 // 22: stream.app.v1.AdTemplate
+	(*PlayerConfig)(nil),               // 23: stream.app.v1.PlayerConfig
+	(*Plan)(nil),                       // 24: stream.app.v1.Plan
+	(*MessageResponse)(nil),            // 25: stream.app.v1.MessageResponse
 }
 var file_app_v1_catalog_proto_depIdxs = []int32{
-	14, // 0: stream.app.v1.ListDomainsResponse.domains:type_name -> stream.app.v1.Domain
-	14, // 1: stream.app.v1.CreateDomainResponse.domain:type_name -> stream.app.v1.Domain
-	15, // 2: stream.app.v1.ListAdTemplatesResponse.templates:type_name -> stream.app.v1.AdTemplate
-	15, // 3: stream.app.v1.CreateAdTemplateResponse.template:type_name -> stream.app.v1.AdTemplate
-	15, // 4: stream.app.v1.UpdateAdTemplateResponse.template:type_name -> stream.app.v1.AdTemplate
-	16, // 5: stream.app.v1.ListPlansResponse.plans:type_name -> stream.app.v1.Plan
-	0,  // 6: stream.app.v1.DomainsService.ListDomains:input_type -> stream.app.v1.ListDomainsRequest
-	2,  // 7: stream.app.v1.DomainsService.CreateDomain:input_type -> stream.app.v1.CreateDomainRequest
-	4,  // 8: stream.app.v1.DomainsService.DeleteDomain:input_type -> stream.app.v1.DeleteDomainRequest
-	5,  // 9: stream.app.v1.AdTemplatesService.ListAdTemplates:input_type -> stream.app.v1.ListAdTemplatesRequest
-	7,  // 10: stream.app.v1.AdTemplatesService.CreateAdTemplate:input_type -> stream.app.v1.CreateAdTemplateRequest
-	9,  // 11: stream.app.v1.AdTemplatesService.UpdateAdTemplate:input_type -> stream.app.v1.UpdateAdTemplateRequest
-	11, // 12: stream.app.v1.AdTemplatesService.DeleteAdTemplate:input_type -> stream.app.v1.DeleteAdTemplateRequest
-	12, // 13: stream.app.v1.PlansService.ListPlans:input_type -> stream.app.v1.ListPlansRequest
-	1,  // 14: stream.app.v1.DomainsService.ListDomains:output_type -> stream.app.v1.ListDomainsResponse
-	3,  // 15: stream.app.v1.DomainsService.CreateDomain:output_type -> stream.app.v1.CreateDomainResponse
-	17, // 16: stream.app.v1.DomainsService.DeleteDomain:output_type -> stream.app.v1.MessageResponse
-	6,  // 17: stream.app.v1.AdTemplatesService.ListAdTemplates:output_type -> stream.app.v1.ListAdTemplatesResponse
-	8,  // 18: stream.app.v1.AdTemplatesService.CreateAdTemplate:output_type -> stream.app.v1.CreateAdTemplateResponse
-	10, // 19: stream.app.v1.AdTemplatesService.UpdateAdTemplate:output_type -> stream.app.v1.UpdateAdTemplateResponse
-	17, // 20: stream.app.v1.AdTemplatesService.DeleteAdTemplate:output_type -> stream.app.v1.MessageResponse
-	13, // 21: stream.app.v1.PlansService.ListPlans:output_type -> stream.app.v1.ListPlansResponse
-	14, // [14:22] is the sub-list for method output_type
-	6,  // [6:14] is the sub-list for method input_type
-	6,  // [6:6] is the sub-list for extension type_name
-	6,  // [6:6] is the sub-list for extension extendee
-	0,  // [0:6] is the sub-list for field type_name
+	21, // 0: stream.app.v1.ListDomainsResponse.domains:type_name -> stream.app.v1.Domain
+	21, // 1: stream.app.v1.CreateDomainResponse.domain:type_name -> stream.app.v1.Domain
+	22, // 2: stream.app.v1.ListAdTemplatesResponse.templates:type_name -> stream.app.v1.AdTemplate
+	22, // 3: stream.app.v1.CreateAdTemplateResponse.template:type_name -> stream.app.v1.AdTemplate
+	22, // 4: stream.app.v1.UpdateAdTemplateResponse.template:type_name -> stream.app.v1.AdTemplate
+	23, // 5: stream.app.v1.ListPlayerConfigsResponse.configs:type_name -> stream.app.v1.PlayerConfig
+	23, // 6: stream.app.v1.CreatePlayerConfigResponse.config:type_name -> stream.app.v1.PlayerConfig
+	23, // 7: stream.app.v1.UpdatePlayerConfigResponse.config:type_name -> stream.app.v1.PlayerConfig
+	24, // 8: stream.app.v1.ListPlansResponse.plans:type_name -> stream.app.v1.Plan
+	0,  // 9: stream.app.v1.DomainsService.ListDomains:input_type -> stream.app.v1.ListDomainsRequest
+	2,  // 10: stream.app.v1.DomainsService.CreateDomain:input_type -> stream.app.v1.CreateDomainRequest
+	4,  // 11: stream.app.v1.DomainsService.DeleteDomain:input_type -> stream.app.v1.DeleteDomainRequest
+	5,  // 12: stream.app.v1.AdTemplatesService.ListAdTemplates:input_type -> stream.app.v1.ListAdTemplatesRequest
+	7,  // 13: stream.app.v1.AdTemplatesService.CreateAdTemplate:input_type -> stream.app.v1.CreateAdTemplateRequest
+	9,  // 14: stream.app.v1.AdTemplatesService.UpdateAdTemplate:input_type -> stream.app.v1.UpdateAdTemplateRequest
+	11, // 15: stream.app.v1.AdTemplatesService.DeleteAdTemplate:input_type -> stream.app.v1.DeleteAdTemplateRequest
+	12, // 16: stream.app.v1.PlayerConfigsService.ListPlayerConfigs:input_type -> stream.app.v1.ListPlayerConfigsRequest
+	14, // 17: stream.app.v1.PlayerConfigsService.CreatePlayerConfig:input_type -> stream.app.v1.CreatePlayerConfigRequest
+	16, // 18: stream.app.v1.PlayerConfigsService.UpdatePlayerConfig:input_type -> stream.app.v1.UpdatePlayerConfigRequest
+	18, // 19: stream.app.v1.PlayerConfigsService.DeletePlayerConfig:input_type -> stream.app.v1.DeletePlayerConfigRequest
+	19, // 20: stream.app.v1.PlansService.ListPlans:input_type -> stream.app.v1.ListPlansRequest
+	1,  // 21: stream.app.v1.DomainsService.ListDomains:output_type -> stream.app.v1.ListDomainsResponse
+	3,  // 22: stream.app.v1.DomainsService.CreateDomain:output_type -> stream.app.v1.CreateDomainResponse
+	25, // 23: stream.app.v1.DomainsService.DeleteDomain:output_type -> stream.app.v1.MessageResponse
+	6,  // 24: stream.app.v1.AdTemplatesService.ListAdTemplates:output_type -> stream.app.v1.ListAdTemplatesResponse
+	8,  // 25: stream.app.v1.AdTemplatesService.CreateAdTemplate:output_type -> stream.app.v1.CreateAdTemplateResponse
+	10, // 26: stream.app.v1.AdTemplatesService.UpdateAdTemplate:output_type -> stream.app.v1.UpdateAdTemplateResponse
+	25, // 27: stream.app.v1.AdTemplatesService.DeleteAdTemplate:output_type -> stream.app.v1.MessageResponse
+	13, // 28: stream.app.v1.PlayerConfigsService.ListPlayerConfigs:output_type -> stream.app.v1.ListPlayerConfigsResponse
+	15, // 29: stream.app.v1.PlayerConfigsService.CreatePlayerConfig:output_type -> stream.app.v1.CreatePlayerConfigResponse
+	17, // 30: stream.app.v1.PlayerConfigsService.UpdatePlayerConfig:output_type -> stream.app.v1.UpdatePlayerConfigResponse
+	25, // 31: stream.app.v1.PlayerConfigsService.DeletePlayerConfig:output_type -> stream.app.v1.MessageResponse
+	20, // 32: stream.app.v1.PlansService.ListPlans:output_type -> stream.app.v1.ListPlansResponse
+	21, // [21:33] is the sub-list for method output_type
+	9,  // [9:21] is the sub-list for method input_type
+	9,  // [9:9] is the sub-list for extension type_name
+	9,  // [9:9] is the sub-list for extension extendee
+	0,  // [0:9] is the sub-list for field type_name
 }
 
 func init() { file_app_v1_catalog_proto_init() }
@@ -861,15 +1443,17 @@ func file_app_v1_catalog_proto_init() {
 	file_app_v1_common_proto_init()
 	file_app_v1_catalog_proto_msgTypes[7].OneofWrappers = []any{}
 	file_app_v1_catalog_proto_msgTypes[9].OneofWrappers = []any{}
+	file_app_v1_catalog_proto_msgTypes[14].OneofWrappers = []any{}
+	file_app_v1_catalog_proto_msgTypes[16].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_app_v1_catalog_proto_rawDesc), len(file_app_v1_catalog_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   14,
+			NumMessages:   21,
 			NumExtensions: 0,
-			NumServices:   3,
+			NumServices:   4,
 		},
 		GoTypes:           file_app_v1_catalog_proto_goTypes,
 		DependencyIndexes: file_app_v1_catalog_proto_depIdxs,
diff --git a/internal/gen/proto/app/v1/catalog_grpc.pb.go b/internal/gen/proto/app/v1/catalog_grpc.pb.go
index 53a235f..c42357c 100644
--- a/internal/gen/proto/app/v1/catalog_grpc.pb.go
+++ b/internal/gen/proto/app/v1/catalog_grpc.pb.go
@@ -412,6 +412,222 @@ var AdTemplatesService_ServiceDesc = grpc.ServiceDesc{
 	Metadata: "app/v1/catalog.proto",
 }
 
+const (
+	PlayerConfigsService_ListPlayerConfigs_FullMethodName  = "/stream.app.v1.PlayerConfigsService/ListPlayerConfigs"
+	PlayerConfigsService_CreatePlayerConfig_FullMethodName = "/stream.app.v1.PlayerConfigsService/CreatePlayerConfig"
+	PlayerConfigsService_UpdatePlayerConfig_FullMethodName = "/stream.app.v1.PlayerConfigsService/UpdatePlayerConfig"
+	PlayerConfigsService_DeletePlayerConfig_FullMethodName = "/stream.app.v1.PlayerConfigsService/DeletePlayerConfig"
+)
+
+// PlayerConfigsServiceClient is the client API for PlayerConfigsService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type PlayerConfigsServiceClient interface {
+	ListPlayerConfigs(ctx context.Context, in *ListPlayerConfigsRequest, opts ...grpc.CallOption) (*ListPlayerConfigsResponse, error)
+	CreatePlayerConfig(ctx context.Context, in *CreatePlayerConfigRequest, opts ...grpc.CallOption) (*CreatePlayerConfigResponse, error)
+	UpdatePlayerConfig(ctx context.Context, in *UpdatePlayerConfigRequest, opts ...grpc.CallOption) (*UpdatePlayerConfigResponse, error)
+	DeletePlayerConfig(ctx context.Context, in *DeletePlayerConfigRequest, opts ...grpc.CallOption) (*MessageResponse, error)
+}
+
+type playerConfigsServiceClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewPlayerConfigsServiceClient(cc grpc.ClientConnInterface) PlayerConfigsServiceClient {
+	return &playerConfigsServiceClient{cc}
+}
+
+func (c *playerConfigsServiceClient) ListPlayerConfigs(ctx context.Context, in *ListPlayerConfigsRequest, opts ...grpc.CallOption) (*ListPlayerConfigsResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(ListPlayerConfigsResponse)
+	err := c.cc.Invoke(ctx, PlayerConfigsService_ListPlayerConfigs_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *playerConfigsServiceClient) CreatePlayerConfig(ctx context.Context, in *CreatePlayerConfigRequest, opts ...grpc.CallOption) (*CreatePlayerConfigResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(CreatePlayerConfigResponse)
+	err := c.cc.Invoke(ctx, PlayerConfigsService_CreatePlayerConfig_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *playerConfigsServiceClient) UpdatePlayerConfig(ctx context.Context, in *UpdatePlayerConfigRequest, opts ...grpc.CallOption) (*UpdatePlayerConfigResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UpdatePlayerConfigResponse)
+	err := c.cc.Invoke(ctx, PlayerConfigsService_UpdatePlayerConfig_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *playerConfigsServiceClient) DeletePlayerConfig(ctx context.Context, in *DeletePlayerConfigRequest, opts ...grpc.CallOption) (*MessageResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(MessageResponse)
+	err := c.cc.Invoke(ctx, PlayerConfigsService_DeletePlayerConfig_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// PlayerConfigsServiceServer is the server API for PlayerConfigsService service.
+// All implementations must embed UnimplementedPlayerConfigsServiceServer
+// for forward compatibility.
+type PlayerConfigsServiceServer interface {
+	ListPlayerConfigs(context.Context, *ListPlayerConfigsRequest) (*ListPlayerConfigsResponse, error)
+	CreatePlayerConfig(context.Context, *CreatePlayerConfigRequest) (*CreatePlayerConfigResponse, error)
+	UpdatePlayerConfig(context.Context, *UpdatePlayerConfigRequest) (*UpdatePlayerConfigResponse, error)
+	DeletePlayerConfig(context.Context, *DeletePlayerConfigRequest) (*MessageResponse, error)
+	mustEmbedUnimplementedPlayerConfigsServiceServer()
+}
+
+// UnimplementedPlayerConfigsServiceServer must be embedded to have
+// forward compatible implementations.
+//
+// NOTE: this should be embedded by value instead of pointer to avoid a nil
+// pointer dereference when methods are called.
+type UnimplementedPlayerConfigsServiceServer struct{}
+
+func (UnimplementedPlayerConfigsServiceServer) ListPlayerConfigs(context.Context, *ListPlayerConfigsRequest) (*ListPlayerConfigsResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "method ListPlayerConfigs not implemented")
+}
+func (UnimplementedPlayerConfigsServiceServer) CreatePlayerConfig(context.Context, *CreatePlayerConfigRequest) (*CreatePlayerConfigResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "method CreatePlayerConfig not implemented")
+}
+func (UnimplementedPlayerConfigsServiceServer) UpdatePlayerConfig(context.Context, *UpdatePlayerConfigRequest) (*UpdatePlayerConfigResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "method UpdatePlayerConfig not implemented")
+}
+func (UnimplementedPlayerConfigsServiceServer) DeletePlayerConfig(context.Context, *DeletePlayerConfigRequest) (*MessageResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "method DeletePlayerConfig not implemented")
+}
+func (UnimplementedPlayerConfigsServiceServer) mustEmbedUnimplementedPlayerConfigsServiceServer() {}
+func (UnimplementedPlayerConfigsServiceServer) testEmbeddedByValue()                              {}
+
+// UnsafePlayerConfigsServiceServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to PlayerConfigsServiceServer will
+// result in compilation errors.
+type UnsafePlayerConfigsServiceServer interface {
+	mustEmbedUnimplementedPlayerConfigsServiceServer()
+}
+
+func RegisterPlayerConfigsServiceServer(s grpc.ServiceRegistrar, srv PlayerConfigsServiceServer) {
+	// If the following call panics, it indicates UnimplementedPlayerConfigsServiceServer was
+	// embedded by pointer and is nil.  This will cause panics if an
+	// unimplemented method is ever invoked, so we test this at initialization
+	// time to prevent it from happening at runtime later due to I/O.
+	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
+		t.testEmbeddedByValue()
+	}
+	s.RegisterService(&PlayerConfigsService_ServiceDesc, srv)
+}
+
+func _PlayerConfigsService_ListPlayerConfigs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ListPlayerConfigsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PlayerConfigsServiceServer).ListPlayerConfigs(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: PlayerConfigsService_ListPlayerConfigs_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PlayerConfigsServiceServer).ListPlayerConfigs(ctx, req.(*ListPlayerConfigsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _PlayerConfigsService_CreatePlayerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreatePlayerConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PlayerConfigsServiceServer).CreatePlayerConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: PlayerConfigsService_CreatePlayerConfig_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PlayerConfigsServiceServer).CreatePlayerConfig(ctx, req.(*CreatePlayerConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _PlayerConfigsService_UpdatePlayerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdatePlayerConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PlayerConfigsServiceServer).UpdatePlayerConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: PlayerConfigsService_UpdatePlayerConfig_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PlayerConfigsServiceServer).UpdatePlayerConfig(ctx, req.(*UpdatePlayerConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _PlayerConfigsService_DeletePlayerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeletePlayerConfigRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PlayerConfigsServiceServer).DeletePlayerConfig(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: PlayerConfigsService_DeletePlayerConfig_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PlayerConfigsServiceServer).DeletePlayerConfig(ctx, req.(*DeletePlayerConfigRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// PlayerConfigsService_ServiceDesc is the grpc.ServiceDesc for PlayerConfigsService service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var PlayerConfigsService_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "stream.app.v1.PlayerConfigsService",
+	HandlerType: (*PlayerConfigsServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "ListPlayerConfigs",
+			Handler:    _PlayerConfigsService_ListPlayerConfigs_Handler,
+		},
+		{
+			MethodName: "CreatePlayerConfig",
+			Handler:    _PlayerConfigsService_CreatePlayerConfig_Handler,
+		},
+		{
+			MethodName: "UpdatePlayerConfig",
+			Handler:    _PlayerConfigsService_UpdatePlayerConfig_Handler,
+		},
+		{
+			MethodName: "DeletePlayerConfig",
+			Handler:    _PlayerConfigsService_DeletePlayerConfig_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "app/v1/catalog.proto",
+}
+
 const (
 	PlansService_ListPlans_FullMethodName = "/stream.app.v1.PlansService/ListPlans"
 )
diff --git a/internal/gen/proto/app/v1/common.pb.go b/internal/gen/proto/app/v1/common.pb.go
index 8112666..684ee67 100644
--- a/internal/gen/proto/app/v1/common.pb.go
+++ b/internal/gen/proto/app/v1/common.pb.go
@@ -84,8 +84,9 @@ type User struct {
 	WalletBalance     float64                `protobuf:"fixed64,14,opt,name=wallet_balance,json=walletBalance,proto3" json:"wallet_balance,omitempty"`
 	Language          string                 `protobuf:"bytes,15,opt,name=language,proto3" json:"language,omitempty"`
 	Locale            string                 `protobuf:"bytes,16,opt,name=locale,proto3" json:"locale,omitempty"`
-	CreatedAt         *timestamppb.Timestamp `protobuf:"bytes,17,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
-	UpdatedAt         *timestamppb.Timestamp `protobuf:"bytes,18,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
+	TelegramId        string                 `protobuf:"bytes,17,opt,name=telegram_id,json=telegramId,proto3" json:"telegram_id,omitempty"`
+	CreatedAt         *timestamppb.Timestamp `protobuf:"bytes,18,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
+	UpdatedAt         *timestamppb.Timestamp `protobuf:"bytes,19,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
 	unknownFields     protoimpl.UnknownFields
 	sizeCache         protoimpl.SizeCache
 }
@@ -232,6 +233,13 @@ func (x *User) GetLocale() string {
 	return ""
 }
 
+func (x *User) GetTelegramId() string {
+	if x != nil {
+		return x.TelegramId
+	}
+	return ""
+}
+
 func (x *User) GetCreatedAt() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreatedAt
@@ -670,6 +678,350 @@ func (x *AdTemplate) GetUpdatedAt() *timestamppb.Timestamp {
 	return nil
 }
 
+type PlayerConfig struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Name          string                 `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Description   *string                `protobuf:"bytes,3,opt,name=description,proto3,oneof" json:"description,omitempty"`
+	Autoplay      bool                   `protobuf:"varint,4,opt,name=autoplay,proto3" json:"autoplay,omitempty"`
+	Loop          bool                   `protobuf:"varint,5,opt,name=loop,proto3" json:"loop,omitempty"`
+	Muted         bool                   `protobuf:"varint,6,opt,name=muted,proto3" json:"muted,omitempty"`
+	ShowControls  bool                   `protobuf:"varint,7,opt,name=show_controls,json=showControls,proto3" json:"show_controls,omitempty"`
+	Pip           bool                   `protobuf:"varint,8,opt,name=pip,proto3" json:"pip,omitempty"`
+	Airplay       bool                   `protobuf:"varint,9,opt,name=airplay,proto3" json:"airplay,omitempty"`
+	Chromecast    bool                   `protobuf:"varint,10,opt,name=chromecast,proto3" json:"chromecast,omitempty"`
+	IsActive      bool                   `protobuf:"varint,11,opt,name=is_active,json=isActive,proto3" json:"is_active,omitempty"`
+	IsDefault     bool                   `protobuf:"varint,12,opt,name=is_default,json=isDefault,proto3" json:"is_default,omitempty"`
+	CreatedAt     *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
+	UpdatedAt     *timestamppb.Timestamp `protobuf:"bytes,14,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
+	EncrytionM3U8 bool                   `protobuf:"varint,15,opt,name=encrytion_m3u8,json=encrytionM3u8,proto3" json:"encrytion_m3u8,omitempty"`
+	LogoUrl       *string                `protobuf:"bytes,16,opt,name=logo_url,json=logoUrl,proto3,oneof" json:"logo_url,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *PlayerConfig) Reset() {
+	*x = PlayerConfig{}
+	mi := &file_app_v1_common_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *PlayerConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PlayerConfig) ProtoMessage() {}
+
+func (x *PlayerConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_common_proto_msgTypes[6]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PlayerConfig.ProtoReflect.Descriptor instead.
+func (*PlayerConfig) Descriptor() ([]byte, []int) {
+	return file_app_v1_common_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *PlayerConfig) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *PlayerConfig) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *PlayerConfig) GetDescription() string {
+	if x != nil && x.Description != nil {
+		return *x.Description
+	}
+	return ""
+}
+
+func (x *PlayerConfig) GetAutoplay() bool {
+	if x != nil {
+		return x.Autoplay
+	}
+	return false
+}
+
+func (x *PlayerConfig) GetLoop() bool {
+	if x != nil {
+		return x.Loop
+	}
+	return false
+}
+
+func (x *PlayerConfig) GetMuted() bool {
+	if x != nil {
+		return x.Muted
+	}
+	return false
+}
+
+func (x *PlayerConfig) GetShowControls() bool {
+	if x != nil {
+		return x.ShowControls
+	}
+	return false
+}
+
+func (x *PlayerConfig) GetPip() bool {
+	if x != nil {
+		return x.Pip
+	}
+	return false
+}
+
+func (x *PlayerConfig) GetAirplay() bool {
+	if x != nil {
+		return x.Airplay
+	}
+	return false
+}
+
+func (x *PlayerConfig) GetChromecast() bool {
+	if x != nil {
+		return x.Chromecast
+	}
+	return false
+}
+
+func (x *PlayerConfig) GetIsActive() bool {
+	if x != nil {
+		return x.IsActive
+	}
+	return false
+}
+
+func (x *PlayerConfig) GetIsDefault() bool {
+	if x != nil {
+		return x.IsDefault
+	}
+	return false
+}
+
+func (x *PlayerConfig) GetCreatedAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.CreatedAt
+	}
+	return nil
+}
+
+func (x *PlayerConfig) GetUpdatedAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.UpdatedAt
+	}
+	return nil
+}
+
+func (x *PlayerConfig) GetEncrytionM3U8() bool {
+	if x != nil {
+		return x.EncrytionM3U8
+	}
+	return false
+}
+
+func (x *PlayerConfig) GetLogoUrl() string {
+	if x != nil && x.LogoUrl != nil {
+		return *x.LogoUrl
+	}
+	return ""
+}
+
+type AdminPlayerConfig struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	UserId        string                 `protobuf:"bytes,2,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
+	Name          string                 `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	Description   *string                `protobuf:"bytes,4,opt,name=description,proto3,oneof" json:"description,omitempty"`
+	Autoplay      bool                   `protobuf:"varint,5,opt,name=autoplay,proto3" json:"autoplay,omitempty"`
+	Loop          bool                   `protobuf:"varint,6,opt,name=loop,proto3" json:"loop,omitempty"`
+	Muted         bool                   `protobuf:"varint,7,opt,name=muted,proto3" json:"muted,omitempty"`
+	ShowControls  bool                   `protobuf:"varint,8,opt,name=show_controls,json=showControls,proto3" json:"show_controls,omitempty"`
+	Pip           bool                   `protobuf:"varint,9,opt,name=pip,proto3" json:"pip,omitempty"`
+	Airplay       bool                   `protobuf:"varint,10,opt,name=airplay,proto3" json:"airplay,omitempty"`
+	Chromecast    bool                   `protobuf:"varint,11,opt,name=chromecast,proto3" json:"chromecast,omitempty"`
+	IsActive      bool                   `protobuf:"varint,12,opt,name=is_active,json=isActive,proto3" json:"is_active,omitempty"`
+	IsDefault     bool                   `protobuf:"varint,13,opt,name=is_default,json=isDefault,proto3" json:"is_default,omitempty"`
+	OwnerEmail    *string                `protobuf:"bytes,14,opt,name=owner_email,json=ownerEmail,proto3,oneof" json:"owner_email,omitempty"`
+	CreatedAt     *timestamppb.Timestamp `protobuf:"bytes,15,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
+	UpdatedAt     *timestamppb.Timestamp `protobuf:"bytes,16,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
+	EncrytionM3U8 bool                   `protobuf:"varint,17,opt,name=encrytion_m3u8,json=encrytionM3u8,proto3" json:"encrytion_m3u8,omitempty"`
+	LogoUrl       *string                `protobuf:"bytes,18,opt,name=logo_url,json=logoUrl,proto3,oneof" json:"logo_url,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *AdminPlayerConfig) Reset() {
+	*x = AdminPlayerConfig{}
+	mi := &file_app_v1_common_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *AdminPlayerConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AdminPlayerConfig) ProtoMessage() {}
+
+func (x *AdminPlayerConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_common_proto_msgTypes[7]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use AdminPlayerConfig.ProtoReflect.Descriptor instead.
+func (*AdminPlayerConfig) Descriptor() ([]byte, []int) {
+	return file_app_v1_common_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *AdminPlayerConfig) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *AdminPlayerConfig) GetUserId() string {
+	if x != nil {
+		return x.UserId
+	}
+	return ""
+}
+
+func (x *AdminPlayerConfig) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *AdminPlayerConfig) GetDescription() string {
+	if x != nil && x.Description != nil {
+		return *x.Description
+	}
+	return ""
+}
+
+func (x *AdminPlayerConfig) GetAutoplay() bool {
+	if x != nil {
+		return x.Autoplay
+	}
+	return false
+}
+
+func (x *AdminPlayerConfig) GetLoop() bool {
+	if x != nil {
+		return x.Loop
+	}
+	return false
+}
+
+func (x *AdminPlayerConfig) GetMuted() bool {
+	if x != nil {
+		return x.Muted
+	}
+	return false
+}
+
+func (x *AdminPlayerConfig) GetShowControls() bool {
+	if x != nil {
+		return x.ShowControls
+	}
+	return false
+}
+
+func (x *AdminPlayerConfig) GetPip() bool {
+	if x != nil {
+		return x.Pip
+	}
+	return false
+}
+
+func (x *AdminPlayerConfig) GetAirplay() bool {
+	if x != nil {
+		return x.Airplay
+	}
+	return false
+}
+
+func (x *AdminPlayerConfig) GetChromecast() bool {
+	if x != nil {
+		return x.Chromecast
+	}
+	return false
+}
+
+func (x *AdminPlayerConfig) GetIsActive() bool {
+	if x != nil {
+		return x.IsActive
+	}
+	return false
+}
+
+func (x *AdminPlayerConfig) GetIsDefault() bool {
+	if x != nil {
+		return x.IsDefault
+	}
+	return false
+}
+
+func (x *AdminPlayerConfig) GetOwnerEmail() string {
+	if x != nil && x.OwnerEmail != nil {
+		return *x.OwnerEmail
+	}
+	return ""
+}
+
+func (x *AdminPlayerConfig) GetCreatedAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.CreatedAt
+	}
+	return nil
+}
+
+func (x *AdminPlayerConfig) GetUpdatedAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.UpdatedAt
+	}
+	return nil
+}
+
+func (x *AdminPlayerConfig) GetEncrytionM3U8() bool {
+	if x != nil {
+		return x.EncrytionM3U8
+	}
+	return false
+}
+
+func (x *AdminPlayerConfig) GetLogoUrl() string {
+	if x != nil && x.LogoUrl != nil {
+		return *x.LogoUrl
+	}
+	return ""
+}
+
 type Plan struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -689,7 +1041,7 @@ type Plan struct {
 
 func (x *Plan) Reset() {
 	*x = Plan{}
-	mi := &file_app_v1_common_proto_msgTypes[6]
+	mi := &file_app_v1_common_proto_msgTypes[8]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -701,7 +1053,7 @@ func (x *Plan) String() string {
 func (*Plan) ProtoMessage() {}
 
 func (x *Plan) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[6]
+	mi := &file_app_v1_common_proto_msgTypes[8]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -714,7 +1066,7 @@ func (x *Plan) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Plan.ProtoReflect.Descriptor instead.
 func (*Plan) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{6}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *Plan) GetId() string {
@@ -812,7 +1164,7 @@ type Payment struct {
 
 func (x *Payment) Reset() {
 	*x = Payment{}
-	mi := &file_app_v1_common_proto_msgTypes[7]
+	mi := &file_app_v1_common_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -824,7 +1176,7 @@ func (x *Payment) String() string {
 func (*Payment) ProtoMessage() {}
 
 func (x *Payment) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[7]
+	mi := &file_app_v1_common_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -837,7 +1189,7 @@ func (x *Payment) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Payment.ProtoReflect.Descriptor instead.
 func (*Payment) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{7}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *Payment) GetId() string {
@@ -930,7 +1282,7 @@ type PlanSubscription struct {
 
 func (x *PlanSubscription) Reset() {
 	*x = PlanSubscription{}
-	mi := &file_app_v1_common_proto_msgTypes[8]
+	mi := &file_app_v1_common_proto_msgTypes[10]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -942,7 +1294,7 @@ func (x *PlanSubscription) String() string {
 func (*PlanSubscription) ProtoMessage() {}
 
 func (x *PlanSubscription) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[8]
+	mi := &file_app_v1_common_proto_msgTypes[10]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -955,7 +1307,7 @@ func (x *PlanSubscription) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PlanSubscription.ProtoReflect.Descriptor instead.
 func (*PlanSubscription) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{8}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *PlanSubscription) GetId() string {
@@ -1061,7 +1413,7 @@ type WalletTransaction struct {
 
 func (x *WalletTransaction) Reset() {
 	*x = WalletTransaction{}
-	mi := &file_app_v1_common_proto_msgTypes[9]
+	mi := &file_app_v1_common_proto_msgTypes[11]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1073,7 +1425,7 @@ func (x *WalletTransaction) String() string {
 func (*WalletTransaction) ProtoMessage() {}
 
 func (x *WalletTransaction) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[9]
+	mi := &file_app_v1_common_proto_msgTypes[11]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1086,7 +1438,7 @@ func (x *WalletTransaction) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WalletTransaction.ProtoReflect.Descriptor instead.
 func (*WalletTransaction) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{9}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *WalletTransaction) GetId() string {
@@ -1186,7 +1538,7 @@ type PaymentHistoryItem struct {
 
 func (x *PaymentHistoryItem) Reset() {
 	*x = PaymentHistoryItem{}
-	mi := &file_app_v1_common_proto_msgTypes[10]
+	mi := &file_app_v1_common_proto_msgTypes[12]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1198,7 +1550,7 @@ func (x *PaymentHistoryItem) String() string {
 func (*PaymentHistoryItem) ProtoMessage() {}
 
 func (x *PaymentHistoryItem) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[10]
+	mi := &file_app_v1_common_proto_msgTypes[12]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1211,7 +1563,7 @@ func (x *PaymentHistoryItem) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PaymentHistoryItem.ProtoReflect.Descriptor instead.
 func (*PaymentHistoryItem) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{10}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *PaymentHistoryItem) GetId() string {
@@ -1314,13 +1666,14 @@ type Video struct {
 	StorageType      *string                `protobuf:"bytes,12,opt,name=storage_type,json=storageType,proto3,oneof" json:"storage_type,omitempty"`
 	CreatedAt        *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
 	UpdatedAt        *timestamppb.Timestamp `protobuf:"bytes,14,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
+	JobId            *string                `protobuf:"bytes,15,opt,name=job_id,json=jobId,proto3,oneof" json:"job_id,omitempty"`
 	unknownFields    protoimpl.UnknownFields
 	sizeCache        protoimpl.SizeCache
 }
 
 func (x *Video) Reset() {
 	*x = Video{}
-	mi := &file_app_v1_common_proto_msgTypes[11]
+	mi := &file_app_v1_common_proto_msgTypes[13]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1332,7 +1685,7 @@ func (x *Video) String() string {
 func (*Video) ProtoMessage() {}
 
 func (x *Video) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[11]
+	mi := &file_app_v1_common_proto_msgTypes[13]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1345,7 +1698,7 @@ func (x *Video) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Video.ProtoReflect.Descriptor instead.
 func (*Video) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{11}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *Video) GetId() string {
@@ -1446,6 +1799,13 @@ func (x *Video) GetUpdatedAt() *timestamppb.Timestamp {
 	return nil
 }
 
+func (x *Video) GetJobId() string {
+	if x != nil && x.JobId != nil {
+		return *x.JobId
+	}
+	return ""
+}
+
 type AdminDashboard struct {
 	state               protoimpl.MessageState `protogen:"open.v1"`
 	TotalUsers          int64                  `protobuf:"varint,1,opt,name=total_users,json=totalUsers,proto3" json:"total_users,omitempty"`
@@ -1463,7 +1823,7 @@ type AdminDashboard struct {
 
 func (x *AdminDashboard) Reset() {
 	*x = AdminDashboard{}
-	mi := &file_app_v1_common_proto_msgTypes[12]
+	mi := &file_app_v1_common_proto_msgTypes[14]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1475,7 +1835,7 @@ func (x *AdminDashboard) String() string {
 func (*AdminDashboard) ProtoMessage() {}
 
 func (x *AdminDashboard) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[12]
+	mi := &file_app_v1_common_proto_msgTypes[14]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1488,7 +1848,7 @@ func (x *AdminDashboard) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AdminDashboard.ProtoReflect.Descriptor instead.
 func (*AdminDashboard) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{12}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *AdminDashboard) GetTotalUsers() int64 {
@@ -1574,7 +1934,7 @@ type AdminUser struct {
 
 func (x *AdminUser) Reset() {
 	*x = AdminUser{}
-	mi := &file_app_v1_common_proto_msgTypes[13]
+	mi := &file_app_v1_common_proto_msgTypes[15]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1586,7 +1946,7 @@ func (x *AdminUser) String() string {
 func (*AdminUser) ProtoMessage() {}
 
 func (x *AdminUser) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[13]
+	mi := &file_app_v1_common_proto_msgTypes[15]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1599,7 +1959,7 @@ func (x *AdminUser) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AdminUser.ProtoReflect.Descriptor instead.
 func (*AdminUser) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{13}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *AdminUser) GetId() string {
@@ -1686,17 +2046,186 @@ func (x *AdminUser) GetUpdatedAt() *timestamppb.Timestamp {
 	return nil
 }
 
+type ReferralUserSummary struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Email         string                 `protobuf:"bytes,2,opt,name=email,proto3" json:"email,omitempty"`
+	Username      *string                `protobuf:"bytes,3,opt,name=username,proto3,oneof" json:"username,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *ReferralUserSummary) Reset() {
+	*x = ReferralUserSummary{}
+	mi := &file_app_v1_common_proto_msgTypes[16]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *ReferralUserSummary) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ReferralUserSummary) ProtoMessage() {}
+
+func (x *ReferralUserSummary) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_common_proto_msgTypes[16]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ReferralUserSummary.ProtoReflect.Descriptor instead.
+func (*ReferralUserSummary) Descriptor() ([]byte, []int) {
+	return file_app_v1_common_proto_rawDescGZIP(), []int{16}
+}
+
+func (x *ReferralUserSummary) GetId() string {
+	if x != nil {
+		return x.Id
+	}
+	return ""
+}
+
+func (x *ReferralUserSummary) GetEmail() string {
+	if x != nil {
+		return x.Email
+	}
+	return ""
+}
+
+func (x *ReferralUserSummary) GetUsername() string {
+	if x != nil && x.Username != nil {
+		return *x.Username
+	}
+	return ""
+}
+
+type AdminUserReferralInfo struct {
+	state                  protoimpl.MessageState `protogen:"open.v1"`
+	Referrer               *ReferralUserSummary   `protobuf:"bytes,1,opt,name=referrer,proto3,oneof" json:"referrer,omitempty"`
+	ReferralEligible       bool                   `protobuf:"varint,2,opt,name=referral_eligible,json=referralEligible,proto3" json:"referral_eligible,omitempty"`
+	EffectiveRewardPercent float64                `protobuf:"fixed64,3,opt,name=effective_reward_percent,json=effectiveRewardPercent,proto3" json:"effective_reward_percent,omitempty"`
+	RewardOverridePercent  *float64               `protobuf:"fixed64,4,opt,name=reward_override_percent,json=rewardOverridePercent,proto3,oneof" json:"reward_override_percent,omitempty"`
+	ShareLink              *string                `protobuf:"bytes,5,opt,name=share_link,json=shareLink,proto3,oneof" json:"share_link,omitempty"`
+	RewardGranted          bool                   `protobuf:"varint,6,opt,name=reward_granted,json=rewardGranted,proto3" json:"reward_granted,omitempty"`
+	RewardGrantedAt        *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=reward_granted_at,json=rewardGrantedAt,proto3" json:"reward_granted_at,omitempty"`
+	RewardPaymentId        *string                `protobuf:"bytes,8,opt,name=reward_payment_id,json=rewardPaymentId,proto3,oneof" json:"reward_payment_id,omitempty"`
+	RewardAmount           *float64               `protobuf:"fixed64,9,opt,name=reward_amount,json=rewardAmount,proto3,oneof" json:"reward_amount,omitempty"`
+	unknownFields          protoimpl.UnknownFields
+	sizeCache              protoimpl.SizeCache
+}
+
+func (x *AdminUserReferralInfo) Reset() {
+	*x = AdminUserReferralInfo{}
+	mi := &file_app_v1_common_proto_msgTypes[17]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *AdminUserReferralInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AdminUserReferralInfo) ProtoMessage() {}
+
+func (x *AdminUserReferralInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_common_proto_msgTypes[17]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use AdminUserReferralInfo.ProtoReflect.Descriptor instead.
+func (*AdminUserReferralInfo) Descriptor() ([]byte, []int) {
+	return file_app_v1_common_proto_rawDescGZIP(), []int{17}
+}
+
+func (x *AdminUserReferralInfo) GetReferrer() *ReferralUserSummary {
+	if x != nil {
+		return x.Referrer
+	}
+	return nil
+}
+
+func (x *AdminUserReferralInfo) GetReferralEligible() bool {
+	if x != nil {
+		return x.ReferralEligible
+	}
+	return false
+}
+
+func (x *AdminUserReferralInfo) GetEffectiveRewardPercent() float64 {
+	if x != nil {
+		return x.EffectiveRewardPercent
+	}
+	return 0
+}
+
+func (x *AdminUserReferralInfo) GetRewardOverridePercent() float64 {
+	if x != nil && x.RewardOverridePercent != nil {
+		return *x.RewardOverridePercent
+	}
+	return 0
+}
+
+func (x *AdminUserReferralInfo) GetShareLink() string {
+	if x != nil && x.ShareLink != nil {
+		return *x.ShareLink
+	}
+	return ""
+}
+
+func (x *AdminUserReferralInfo) GetRewardGranted() bool {
+	if x != nil {
+		return x.RewardGranted
+	}
+	return false
+}
+
+func (x *AdminUserReferralInfo) GetRewardGrantedAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.RewardGrantedAt
+	}
+	return nil
+}
+
+func (x *AdminUserReferralInfo) GetRewardPaymentId() string {
+	if x != nil && x.RewardPaymentId != nil {
+		return *x.RewardPaymentId
+	}
+	return ""
+}
+
+func (x *AdminUserReferralInfo) GetRewardAmount() float64 {
+	if x != nil && x.RewardAmount != nil {
+		return *x.RewardAmount
+	}
+	return 0
+}
+
 type AdminUserDetail struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	User          *AdminUser             `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"`
 	Subscription  *PlanSubscription      `protobuf:"bytes,2,opt,name=subscription,proto3,oneof" json:"subscription,omitempty"`
+	Referral      *AdminUserReferralInfo `protobuf:"bytes,3,opt,name=referral,proto3,oneof" json:"referral,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
 
 func (x *AdminUserDetail) Reset() {
 	*x = AdminUserDetail{}
-	mi := &file_app_v1_common_proto_msgTypes[14]
+	mi := &file_app_v1_common_proto_msgTypes[18]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1708,7 +2237,7 @@ func (x *AdminUserDetail) String() string {
 func (*AdminUserDetail) ProtoMessage() {}
 
 func (x *AdminUserDetail) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[14]
+	mi := &file_app_v1_common_proto_msgTypes[18]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1721,7 +2250,7 @@ func (x *AdminUserDetail) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AdminUserDetail.ProtoReflect.Descriptor instead.
 func (*AdminUserDetail) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{14}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *AdminUserDetail) GetUser() *AdminUser {
@@ -1738,29 +2267,38 @@ func (x *AdminUserDetail) GetSubscription() *PlanSubscription {
 	return nil
 }
 
+func (x *AdminUserDetail) GetReferral() *AdminUserReferralInfo {
+	if x != nil {
+		return x.Referral
+	}
+	return nil
+}
+
 type AdminVideo struct {
-	state          protoimpl.MessageState `protogen:"open.v1"`
-	Id             string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	UserId         string                 `protobuf:"bytes,2,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
-	Title          string                 `protobuf:"bytes,3,opt,name=title,proto3" json:"title,omitempty"`
-	Description    *string                `protobuf:"bytes,4,opt,name=description,proto3,oneof" json:"description,omitempty"`
-	Url            string                 `protobuf:"bytes,5,opt,name=url,proto3" json:"url,omitempty"`
-	Status         string                 `protobuf:"bytes,6,opt,name=status,proto3" json:"status,omitempty"`
-	Size           int64                  `protobuf:"varint,7,opt,name=size,proto3" json:"size,omitempty"`
-	Duration       int32                  `protobuf:"varint,8,opt,name=duration,proto3" json:"duration,omitempty"`
-	Format         string                 `protobuf:"bytes,9,opt,name=format,proto3" json:"format,omitempty"`
-	OwnerEmail     *string                `protobuf:"bytes,10,opt,name=owner_email,json=ownerEmail,proto3,oneof" json:"owner_email,omitempty"`
-	AdTemplateId   *string                `protobuf:"bytes,11,opt,name=ad_template_id,json=adTemplateId,proto3,oneof" json:"ad_template_id,omitempty"`
-	AdTemplateName *string                `protobuf:"bytes,12,opt,name=ad_template_name,json=adTemplateName,proto3,oneof" json:"ad_template_name,omitempty"`
-	CreatedAt      *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
-	UpdatedAt      *timestamppb.Timestamp `protobuf:"bytes,14,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
-	unknownFields  protoimpl.UnknownFields
-	sizeCache      protoimpl.SizeCache
+	state            protoimpl.MessageState `protogen:"open.v1"`
+	Id               string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	UserId           string                 `protobuf:"bytes,2,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
+	Title            string                 `protobuf:"bytes,3,opt,name=title,proto3" json:"title,omitempty"`
+	Description      *string                `protobuf:"bytes,4,opt,name=description,proto3,oneof" json:"description,omitempty"`
+	Url              string                 `protobuf:"bytes,5,opt,name=url,proto3" json:"url,omitempty"`
+	Status           string                 `protobuf:"bytes,6,opt,name=status,proto3" json:"status,omitempty"`
+	Size             int64                  `protobuf:"varint,7,opt,name=size,proto3" json:"size,omitempty"`
+	Duration         int32                  `protobuf:"varint,8,opt,name=duration,proto3" json:"duration,omitempty"`
+	Format           string                 `protobuf:"bytes,9,opt,name=format,proto3" json:"format,omitempty"`
+	OwnerEmail       *string                `protobuf:"bytes,10,opt,name=owner_email,json=ownerEmail,proto3,oneof" json:"owner_email,omitempty"`
+	AdTemplateId     *string                `protobuf:"bytes,11,opt,name=ad_template_id,json=adTemplateId,proto3,oneof" json:"ad_template_id,omitempty"`
+	AdTemplateName   *string                `protobuf:"bytes,12,opt,name=ad_template_name,json=adTemplateName,proto3,oneof" json:"ad_template_name,omitempty"`
+	CreatedAt        *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
+	UpdatedAt        *timestamppb.Timestamp `protobuf:"bytes,14,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
+	ProcessingStatus *string                `protobuf:"bytes,15,opt,name=processing_status,json=processingStatus,proto3,oneof" json:"processing_status,omitempty"`
+	JobId            *string                `protobuf:"bytes,16,opt,name=job_id,json=jobId,proto3,oneof" json:"job_id,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *AdminVideo) Reset() {
 	*x = AdminVideo{}
-	mi := &file_app_v1_common_proto_msgTypes[15]
+	mi := &file_app_v1_common_proto_msgTypes[19]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1772,7 +2310,7 @@ func (x *AdminVideo) String() string {
 func (*AdminVideo) ProtoMessage() {}
 
 func (x *AdminVideo) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[15]
+	mi := &file_app_v1_common_proto_msgTypes[19]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1785,7 +2323,7 @@ func (x *AdminVideo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AdminVideo.ProtoReflect.Descriptor instead.
 func (*AdminVideo) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{15}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *AdminVideo) GetId() string {
@@ -1886,6 +2424,20 @@ func (x *AdminVideo) GetUpdatedAt() *timestamppb.Timestamp {
 	return nil
 }
 
+func (x *AdminVideo) GetProcessingStatus() string {
+	if x != nil && x.ProcessingStatus != nil {
+		return *x.ProcessingStatus
+	}
+	return ""
+}
+
+func (x *AdminVideo) GetJobId() string {
+	if x != nil && x.JobId != nil {
+		return *x.JobId
+	}
+	return ""
+}
+
 type AdminPayment struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -1912,7 +2464,7 @@ type AdminPayment struct {
 
 func (x *AdminPayment) Reset() {
 	*x = AdminPayment{}
-	mi := &file_app_v1_common_proto_msgTypes[16]
+	mi := &file_app_v1_common_proto_msgTypes[20]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1924,7 +2476,7 @@ func (x *AdminPayment) String() string {
 func (*AdminPayment) ProtoMessage() {}
 
 func (x *AdminPayment) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[16]
+	mi := &file_app_v1_common_proto_msgTypes[20]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1937,7 +2489,7 @@ func (x *AdminPayment) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AdminPayment.ProtoReflect.Descriptor instead.
 func (*AdminPayment) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{16}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *AdminPayment) GetId() string {
@@ -2088,7 +2640,7 @@ type AdminPlan struct {
 
 func (x *AdminPlan) Reset() {
 	*x = AdminPlan{}
-	mi := &file_app_v1_common_proto_msgTypes[17]
+	mi := &file_app_v1_common_proto_msgTypes[21]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2100,7 +2652,7 @@ func (x *AdminPlan) String() string {
 func (*AdminPlan) ProtoMessage() {}
 
 func (x *AdminPlan) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[17]
+	mi := &file_app_v1_common_proto_msgTypes[21]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2113,7 +2665,7 @@ func (x *AdminPlan) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AdminPlan.ProtoReflect.Descriptor instead.
 func (*AdminPlan) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{17}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *AdminPlan) GetId() string {
@@ -2234,7 +2786,7 @@ type AdminAdTemplate struct {
 
 func (x *AdminAdTemplate) Reset() {
 	*x = AdminAdTemplate{}
-	mi := &file_app_v1_common_proto_msgTypes[18]
+	mi := &file_app_v1_common_proto_msgTypes[22]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2246,7 +2798,7 @@ func (x *AdminAdTemplate) String() string {
 func (*AdminAdTemplate) ProtoMessage() {}
 
 func (x *AdminAdTemplate) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[18]
+	mi := &file_app_v1_common_proto_msgTypes[22]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2259,7 +2811,7 @@ func (x *AdminAdTemplate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AdminAdTemplate.ProtoReflect.Descriptor instead.
 func (*AdminAdTemplate) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{18}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *AdminAdTemplate) GetId() string {
@@ -2367,13 +2919,14 @@ type AdminJob struct {
 	MaxRetries    int32                  `protobuf:"varint,17,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"`
 	CreatedAt     *timestamppb.Timestamp `protobuf:"bytes,18,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
 	UpdatedAt     *timestamppb.Timestamp `protobuf:"bytes,19,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
+	VideoId       *string                `protobuf:"bytes,20,opt,name=video_id,json=videoId,proto3,oneof" json:"video_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
 
 func (x *AdminJob) Reset() {
 	*x = AdminJob{}
-	mi := &file_app_v1_common_proto_msgTypes[19]
+	mi := &file_app_v1_common_proto_msgTypes[23]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2385,7 +2938,7 @@ func (x *AdminJob) String() string {
 func (*AdminJob) ProtoMessage() {}
 
 func (x *AdminJob) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[19]
+	mi := &file_app_v1_common_proto_msgTypes[23]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2398,7 +2951,7 @@ func (x *AdminJob) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AdminJob.ProtoReflect.Descriptor instead.
 func (*AdminJob) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{19}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *AdminJob) GetId() string {
@@ -2534,6 +3087,13 @@ func (x *AdminJob) GetUpdatedAt() *timestamppb.Timestamp {
 	return nil
 }
 
+func (x *AdminJob) GetVideoId() string {
+	if x != nil && x.VideoId != nil {
+		return *x.VideoId
+	}
+	return ""
+}
+
 type AdminAgent struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
@@ -2554,7 +3114,7 @@ type AdminAgent struct {
 
 func (x *AdminAgent) Reset() {
 	*x = AdminAgent{}
-	mi := &file_app_v1_common_proto_msgTypes[20]
+	mi := &file_app_v1_common_proto_msgTypes[24]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -2566,7 +3126,7 @@ func (x *AdminAgent) String() string {
 func (*AdminAgent) ProtoMessage() {}
 
 func (x *AdminAgent) ProtoReflect() protoreflect.Message {
-	mi := &file_app_v1_common_proto_msgTypes[20]
+	mi := &file_app_v1_common_proto_msgTypes[24]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2579,7 +3139,7 @@ func (x *AdminAgent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AdminAgent.ProtoReflect.Descriptor instead.
 func (*AdminAgent) Descriptor() ([]byte, []int) {
-	return file_app_v1_common_proto_rawDescGZIP(), []int{20}
+	return file_app_v1_common_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *AdminAgent) GetId() string {
@@ -2672,7 +3232,7 @@ const file_app_v1_common_proto_rawDesc = "" +
 	"\n" +
 	"\x13app/v1/common.proto\x12\rstream.app.v1\x1a\x1fgoogle/protobuf/timestamp.proto\"+\n" +
 	"\x0fMessageResponse\x12\x18\n" +
-	"\amessage\x18\x01 \x01(\tR\amessage\"\xb9\x06\n" +
+	"\amessage\x18\x01 \x01(\tR\amessage\"\xda\x06\n" +
 	"\x04User\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x14\n" +
 	"\x05email\x18\x02 \x01(\tR\x05email\x12\x1f\n" +
@@ -2690,11 +3250,13 @@ const file_app_v1_common_proto_rawDesc = "" +
 	"\x12plan_expiring_soon\x18\r \x01(\bR\x10planExpiringSoon\x12%\n" +
 	"\x0ewallet_balance\x18\x0e \x01(\x01R\rwalletBalance\x12\x1a\n" +
 	"\blanguage\x18\x0f \x01(\tR\blanguage\x12\x16\n" +
-	"\x06locale\x18\x10 \x01(\tR\x06locale\x129\n" +
+	"\x06locale\x18\x10 \x01(\tR\x06locale\x12\x1f\n" +
+	"\vtelegram_id\x18\x11 \x01(\tR\n" +
+	"telegramId\x129\n" +
 	"\n" +
-	"created_at\x18\x11 \x01(\v2\x1a.google.protobuf.TimestampR\tcreatedAt\x129\n" +
+	"created_at\x18\x12 \x01(\v2\x1a.google.protobuf.TimestampR\tcreatedAt\x129\n" +
 	"\n" +
-	"updated_at\x18\x12 \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAtB\v\n" +
+	"updated_at\x18\x13 \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAtB\v\n" +
 	"\t_usernameB\t\n" +
 	"\a_avatarB\a\n" +
 	"\x05_roleB\f\n" +
@@ -2759,7 +3321,61 @@ const file_app_v1_common_proto_rawDesc = "" +
 	"updated_at\x18\n" +
 	" \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAtB\x0e\n" +
 	"\f_descriptionB\v\n" +
-	"\t_duration\"\xda\x02\n" +
+	"\t_duration\"\xa6\x04\n" +
+	"\fPlayerConfig\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
+	"\x04name\x18\x02 \x01(\tR\x04name\x12%\n" +
+	"\vdescription\x18\x03 \x01(\tH\x00R\vdescription\x88\x01\x01\x12\x1a\n" +
+	"\bautoplay\x18\x04 \x01(\bR\bautoplay\x12\x12\n" +
+	"\x04loop\x18\x05 \x01(\bR\x04loop\x12\x14\n" +
+	"\x05muted\x18\x06 \x01(\bR\x05muted\x12#\n" +
+	"\rshow_controls\x18\a \x01(\bR\fshowControls\x12\x10\n" +
+	"\x03pip\x18\b \x01(\bR\x03pip\x12\x18\n" +
+	"\aairplay\x18\t \x01(\bR\aairplay\x12\x1e\n" +
+	"\n" +
+	"chromecast\x18\n" +
+	" \x01(\bR\n" +
+	"chromecast\x12\x1b\n" +
+	"\tis_active\x18\v \x01(\bR\bisActive\x12\x1d\n" +
+	"\n" +
+	"is_default\x18\f \x01(\bR\tisDefault\x129\n" +
+	"\n" +
+	"created_at\x18\r \x01(\v2\x1a.google.protobuf.TimestampR\tcreatedAt\x129\n" +
+	"\n" +
+	"updated_at\x18\x0e \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAt\x12%\n" +
+	"\x0eencrytion_m3u8\x18\x0f \x01(\bR\rencrytionM3u8\x12\x1e\n" +
+	"\blogo_url\x18\x10 \x01(\tH\x01R\alogoUrl\x88\x01\x01B\x0e\n" +
+	"\f_descriptionB\v\n" +
+	"\t_logo_url\"\xfa\x04\n" +
+	"\x11AdminPlayerConfig\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n" +
+	"\auser_id\x18\x02 \x01(\tR\x06userId\x12\x12\n" +
+	"\x04name\x18\x03 \x01(\tR\x04name\x12%\n" +
+	"\vdescription\x18\x04 \x01(\tH\x00R\vdescription\x88\x01\x01\x12\x1a\n" +
+	"\bautoplay\x18\x05 \x01(\bR\bautoplay\x12\x12\n" +
+	"\x04loop\x18\x06 \x01(\bR\x04loop\x12\x14\n" +
+	"\x05muted\x18\a \x01(\bR\x05muted\x12#\n" +
+	"\rshow_controls\x18\b \x01(\bR\fshowControls\x12\x10\n" +
+	"\x03pip\x18\t \x01(\bR\x03pip\x12\x18\n" +
+	"\aairplay\x18\n" +
+	" \x01(\bR\aairplay\x12\x1e\n" +
+	"\n" +
+	"chromecast\x18\v \x01(\bR\n" +
+	"chromecast\x12\x1b\n" +
+	"\tis_active\x18\f \x01(\bR\bisActive\x12\x1d\n" +
+	"\n" +
+	"is_default\x18\r \x01(\bR\tisDefault\x12$\n" +
+	"\vowner_email\x18\x0e \x01(\tH\x01R\n" +
+	"ownerEmail\x88\x01\x01\x129\n" +
+	"\n" +
+	"created_at\x18\x0f \x01(\v2\x1a.google.protobuf.TimestampR\tcreatedAt\x129\n" +
+	"\n" +
+	"updated_at\x18\x10 \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAt\x12%\n" +
+	"\x0eencrytion_m3u8\x18\x11 \x01(\bR\rencrytionM3u8\x12\x1e\n" +
+	"\blogo_url\x18\x12 \x01(\tH\x02R\alogoUrl\x88\x01\x01B\x0e\n" +
+	"\f_descriptionB\x0e\n" +
+	"\f_owner_emailB\v\n" +
+	"\t_logo_url\"\xda\x02\n" +
 	"\x04Plan\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
 	"\x04name\x18\x02 \x01(\tR\x04name\x12%\n" +
@@ -2856,7 +3472,7 @@ const file_app_v1_common_proto_rawDesc = "" +
 	"\n" +
 	"_plan_nameB\x0e\n" +
 	"\f_term_monthsB\x11\n" +
-	"\x0f_payment_method\"\x97\x04\n" +
+	"\x0f_payment_method\"\xbe\x04\n" +
 	"\x05Video\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n" +
 	"\auser_id\x18\x02 \x01(\tR\x06userId\x12\x14\n" +
@@ -2874,12 +3490,14 @@ const file_app_v1_common_proto_rawDesc = "" +
 	"\n" +
 	"created_at\x18\r \x01(\v2\x1a.google.protobuf.TimestampR\tcreatedAt\x129\n" +
 	"\n" +
-	"updated_at\x18\x0e \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAtB\x0e\n" +
+	"updated_at\x18\x0e \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAt\x12\x1a\n" +
+	"\x06job_id\x18\x0f \x01(\tH\x04R\x05jobId\x88\x01\x01B\x0e\n" +
 	"\f_descriptionB\f\n" +
 	"\n" +
 	"_thumbnailB\x14\n" +
 	"\x12_processing_statusB\x0f\n" +
-	"\r_storage_type\"\x81\x03\n" +
+	"\r_storage_typeB\t\n" +
+	"\a_job_id\"\x81\x03\n" +
 	"\x0eAdminDashboard\x12\x1f\n" +
 	"\vtotal_users\x18\x01 \x01(\x03R\n" +
 	"totalUsers\x12!\n" +
@@ -2914,11 +3532,34 @@ const file_app_v1_common_proto_rawDesc = "" +
 	"\n" +
 	"\b_plan_idB\f\n" +
 	"\n" +
-	"_plan_name\"\x9a\x01\n" +
+	"_plan_name\"i\n" +
+	"\x13ReferralUserSummary\x12\x0e\n" +
+	"\x02id\x18\x01 \x01(\tR\x02id\x12\x14\n" +
+	"\x05email\x18\x02 \x01(\tR\x05email\x12\x1f\n" +
+	"\busername\x18\x03 \x01(\tH\x00R\busername\x88\x01\x01B\v\n" +
+	"\t_username\"\xce\x04\n" +
+	"\x15AdminUserReferralInfo\x12C\n" +
+	"\breferrer\x18\x01 \x01(\v2\".stream.app.v1.ReferralUserSummaryH\x00R\breferrer\x88\x01\x01\x12+\n" +
+	"\x11referral_eligible\x18\x02 \x01(\bR\x10referralEligible\x128\n" +
+	"\x18effective_reward_percent\x18\x03 \x01(\x01R\x16effectiveRewardPercent\x12;\n" +
+	"\x17reward_override_percent\x18\x04 \x01(\x01H\x01R\x15rewardOverridePercent\x88\x01\x01\x12\"\n" +
+	"\n" +
+	"share_link\x18\x05 \x01(\tH\x02R\tshareLink\x88\x01\x01\x12%\n" +
+	"\x0ereward_granted\x18\x06 \x01(\bR\rrewardGranted\x12F\n" +
+	"\x11reward_granted_at\x18\a \x01(\v2\x1a.google.protobuf.TimestampR\x0frewardGrantedAt\x12/\n" +
+	"\x11reward_payment_id\x18\b \x01(\tH\x03R\x0frewardPaymentId\x88\x01\x01\x12(\n" +
+	"\rreward_amount\x18\t \x01(\x01H\x04R\frewardAmount\x88\x01\x01B\v\n" +
+	"\t_referrerB\x1a\n" +
+	"\x18_reward_override_percentB\r\n" +
+	"\v_share_linkB\x14\n" +
+	"\x12_reward_payment_idB\x10\n" +
+	"\x0e_reward_amount\"\xee\x01\n" +
 	"\x0fAdminUserDetail\x12,\n" +
 	"\x04user\x18\x01 \x01(\v2\x18.stream.app.v1.AdminUserR\x04user\x12H\n" +
-	"\fsubscription\x18\x02 \x01(\v2\x1f.stream.app.v1.PlanSubscriptionH\x00R\fsubscription\x88\x01\x01B\x0f\n" +
-	"\r_subscription\"\xa2\x04\n" +
+	"\fsubscription\x18\x02 \x01(\v2\x1f.stream.app.v1.PlanSubscriptionH\x00R\fsubscription\x88\x01\x01\x12E\n" +
+	"\breferral\x18\x03 \x01(\v2$.stream.app.v1.AdminUserReferralInfoH\x01R\breferral\x88\x01\x01B\x0f\n" +
+	"\r_subscriptionB\v\n" +
+	"\t_referral\"\x91\x05\n" +
 	"\n" +
 	"AdminVideo\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n" +
@@ -2938,11 +3579,15 @@ const file_app_v1_common_proto_rawDesc = "" +
 	"\n" +
 	"created_at\x18\r \x01(\v2\x1a.google.protobuf.TimestampR\tcreatedAt\x129\n" +
 	"\n" +
-	"updated_at\x18\x0e \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAtB\x0e\n" +
+	"updated_at\x18\x0e \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAt\x120\n" +
+	"\x11processing_status\x18\x0f \x01(\tH\x04R\x10processingStatus\x88\x01\x01\x12\x1a\n" +
+	"\x06job_id\x18\x10 \x01(\tH\x05R\x05jobId\x88\x01\x01B\x0e\n" +
 	"\f_descriptionB\x0e\n" +
 	"\f_owner_emailB\x11\n" +
 	"\x0f_ad_template_idB\x13\n" +
-	"\x11_ad_template_name\"\x9d\x06\n" +
+	"\x11_ad_template_nameB\x14\n" +
+	"\x12_processing_statusB\t\n" +
+	"\a_job_id\"\x9d\x06\n" +
 	"\fAdminPayment\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x17\n" +
 	"\auser_id\x18\x02 \x01(\tR\x06userId\x12\x1c\n" +
@@ -3019,7 +3664,7 @@ const file_app_v1_common_proto_rawDesc = "" +
 	"updated_at\x18\f \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAtB\x0e\n" +
 	"\f_descriptionB\v\n" +
 	"\t_durationB\x0e\n" +
-	"\f_owner_email\"\xeb\x04\n" +
+	"\f_owner_email\"\x98\x05\n" +
 	"\bAdminJob\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x16\n" +
 	"\x06status\x18\x02 \x01(\tR\x06status\x12\x1a\n" +
@@ -3046,8 +3691,10 @@ const file_app_v1_common_proto_rawDesc = "" +
 	"\n" +
 	"created_at\x18\x12 \x01(\v2\x1a.google.protobuf.TimestampR\tcreatedAt\x129\n" +
 	"\n" +
-	"updated_at\x18\x13 \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAtB\v\n" +
-	"\t_agent_id\"\x91\x03\n" +
+	"updated_at\x18\x13 \x01(\v2\x1a.google.protobuf.TimestampR\tupdatedAt\x12\x1e\n" +
+	"\bvideo_id\x18\x14 \x01(\tH\x01R\avideoId\x88\x01\x01B\v\n" +
+	"\t_agent_idB\v\n" +
+	"\t_video_id\"\x91\x03\n" +
 	"\n" +
 	"AdminAgent\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
@@ -3078,7 +3725,7 @@ func file_app_v1_common_proto_rawDescGZIP() []byte {
 	return file_app_v1_common_proto_rawDescData
 }
 
-var file_app_v1_common_proto_msgTypes = make([]protoimpl.MessageInfo, 21)
+var file_app_v1_common_proto_msgTypes = make([]protoimpl.MessageInfo, 25)
 var file_app_v1_common_proto_goTypes = []any{
 	(*MessageResponse)(nil),       // 0: stream.app.v1.MessageResponse
 	(*User)(nil),                  // 1: stream.app.v1.User
@@ -3086,65 +3733,76 @@ var file_app_v1_common_proto_goTypes = []any{
 	(*Notification)(nil),          // 3: stream.app.v1.Notification
 	(*Domain)(nil),                // 4: stream.app.v1.Domain
 	(*AdTemplate)(nil),            // 5: stream.app.v1.AdTemplate
-	(*Plan)(nil),                  // 6: stream.app.v1.Plan
-	(*Payment)(nil),               // 7: stream.app.v1.Payment
-	(*PlanSubscription)(nil),      // 8: stream.app.v1.PlanSubscription
-	(*WalletTransaction)(nil),     // 9: stream.app.v1.WalletTransaction
-	(*PaymentHistoryItem)(nil),    // 10: stream.app.v1.PaymentHistoryItem
-	(*Video)(nil),                 // 11: stream.app.v1.Video
-	(*AdminDashboard)(nil),        // 12: stream.app.v1.AdminDashboard
-	(*AdminUser)(nil),             // 13: stream.app.v1.AdminUser
-	(*AdminUserDetail)(nil),       // 14: stream.app.v1.AdminUserDetail
-	(*AdminVideo)(nil),            // 15: stream.app.v1.AdminVideo
-	(*AdminPayment)(nil),          // 16: stream.app.v1.AdminPayment
-	(*AdminPlan)(nil),             // 17: stream.app.v1.AdminPlan
-	(*AdminAdTemplate)(nil),       // 18: stream.app.v1.AdminAdTemplate
-	(*AdminJob)(nil),              // 19: stream.app.v1.AdminJob
-	(*AdminAgent)(nil),            // 20: stream.app.v1.AdminAgent
-	(*timestamppb.Timestamp)(nil), // 21: google.protobuf.Timestamp
+	(*PlayerConfig)(nil),          // 6: stream.app.v1.PlayerConfig
+	(*AdminPlayerConfig)(nil),     // 7: stream.app.v1.AdminPlayerConfig
+	(*Plan)(nil),                  // 8: stream.app.v1.Plan
+	(*Payment)(nil),               // 9: stream.app.v1.Payment
+	(*PlanSubscription)(nil),      // 10: stream.app.v1.PlanSubscription
+	(*WalletTransaction)(nil),     // 11: stream.app.v1.WalletTransaction
+	(*PaymentHistoryItem)(nil),    // 12: stream.app.v1.PaymentHistoryItem
+	(*Video)(nil),                 // 13: stream.app.v1.Video
+	(*AdminDashboard)(nil),        // 14: stream.app.v1.AdminDashboard
+	(*AdminUser)(nil),             // 15: stream.app.v1.AdminUser
+	(*ReferralUserSummary)(nil),   // 16: stream.app.v1.ReferralUserSummary
+	(*AdminUserReferralInfo)(nil), // 17: stream.app.v1.AdminUserReferralInfo
+	(*AdminUserDetail)(nil),       // 18: stream.app.v1.AdminUserDetail
+	(*AdminVideo)(nil),            // 19: stream.app.v1.AdminVideo
+	(*AdminPayment)(nil),          // 20: stream.app.v1.AdminPayment
+	(*AdminPlan)(nil),             // 21: stream.app.v1.AdminPlan
+	(*AdminAdTemplate)(nil),       // 22: stream.app.v1.AdminAdTemplate
+	(*AdminJob)(nil),              // 23: stream.app.v1.AdminJob
+	(*AdminAgent)(nil),            // 24: stream.app.v1.AdminAgent
+	(*timestamppb.Timestamp)(nil), // 25: google.protobuf.Timestamp
 }
 var file_app_v1_common_proto_depIdxs = []int32{
-	21, // 0: stream.app.v1.User.plan_started_at:type_name -> google.protobuf.Timestamp
-	21, // 1: stream.app.v1.User.plan_expires_at:type_name -> google.protobuf.Timestamp
-	21, // 2: stream.app.v1.User.created_at:type_name -> google.protobuf.Timestamp
-	21, // 3: stream.app.v1.User.updated_at:type_name -> google.protobuf.Timestamp
-	21, // 4: stream.app.v1.Notification.created_at:type_name -> google.protobuf.Timestamp
-	21, // 5: stream.app.v1.Domain.created_at:type_name -> google.protobuf.Timestamp
-	21, // 6: stream.app.v1.Domain.updated_at:type_name -> google.protobuf.Timestamp
-	21, // 7: stream.app.v1.AdTemplate.created_at:type_name -> google.protobuf.Timestamp
-	21, // 8: stream.app.v1.AdTemplate.updated_at:type_name -> google.protobuf.Timestamp
-	21, // 9: stream.app.v1.Payment.created_at:type_name -> google.protobuf.Timestamp
-	21, // 10: stream.app.v1.Payment.updated_at:type_name -> google.protobuf.Timestamp
-	21, // 11: stream.app.v1.PlanSubscription.started_at:type_name -> google.protobuf.Timestamp
-	21, // 12: stream.app.v1.PlanSubscription.expires_at:type_name -> google.protobuf.Timestamp
-	21, // 13: stream.app.v1.PlanSubscription.created_at:type_name -> google.protobuf.Timestamp
-	21, // 14: stream.app.v1.PlanSubscription.updated_at:type_name -> google.protobuf.Timestamp
-	21, // 15: stream.app.v1.WalletTransaction.created_at:type_name -> google.protobuf.Timestamp
-	21, // 16: stream.app.v1.WalletTransaction.updated_at:type_name -> google.protobuf.Timestamp
-	21, // 17: stream.app.v1.PaymentHistoryItem.expires_at:type_name -> google.protobuf.Timestamp
-	21, // 18: stream.app.v1.PaymentHistoryItem.created_at:type_name -> google.protobuf.Timestamp
-	21, // 19: stream.app.v1.Video.created_at:type_name -> google.protobuf.Timestamp
-	21, // 20: stream.app.v1.Video.updated_at:type_name -> google.protobuf.Timestamp
-	21, // 21: stream.app.v1.AdminUser.created_at:type_name -> google.protobuf.Timestamp
-	21, // 22: stream.app.v1.AdminUser.updated_at:type_name -> google.protobuf.Timestamp
-	13, // 23: stream.app.v1.AdminUserDetail.user:type_name -> stream.app.v1.AdminUser
-	8,  // 24: stream.app.v1.AdminUserDetail.subscription:type_name -> stream.app.v1.PlanSubscription
-	21, // 25: stream.app.v1.AdminVideo.created_at:type_name -> google.protobuf.Timestamp
-	21, // 26: stream.app.v1.AdminVideo.updated_at:type_name -> google.protobuf.Timestamp
-	21, // 27: stream.app.v1.AdminPayment.created_at:type_name -> google.protobuf.Timestamp
-	21, // 28: stream.app.v1.AdminPayment.updated_at:type_name -> google.protobuf.Timestamp
-	21, // 29: stream.app.v1.AdminAdTemplate.created_at:type_name -> google.protobuf.Timestamp
-	21, // 30: stream.app.v1.AdminAdTemplate.updated_at:type_name -> google.protobuf.Timestamp
-	21, // 31: stream.app.v1.AdminJob.created_at:type_name -> google.protobuf.Timestamp
-	21, // 32: stream.app.v1.AdminJob.updated_at:type_name -> google.protobuf.Timestamp
-	21, // 33: stream.app.v1.AdminAgent.last_heartbeat:type_name -> google.protobuf.Timestamp
-	21, // 34: stream.app.v1.AdminAgent.created_at:type_name -> google.protobuf.Timestamp
-	21, // 35: stream.app.v1.AdminAgent.updated_at:type_name -> google.protobuf.Timestamp
-	36, // [36:36] is the sub-list for method output_type
-	36, // [36:36] is the sub-list for method input_type
-	36, // [36:36] is the sub-list for extension type_name
-	36, // [36:36] is the sub-list for extension extendee
-	0,  // [0:36] is the sub-list for field type_name
+	25, // 0: stream.app.v1.User.plan_started_at:type_name -> google.protobuf.Timestamp
+	25, // 1: stream.app.v1.User.plan_expires_at:type_name -> google.protobuf.Timestamp
+	25, // 2: stream.app.v1.User.created_at:type_name -> google.protobuf.Timestamp
+	25, // 3: stream.app.v1.User.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 4: stream.app.v1.Notification.created_at:type_name -> google.protobuf.Timestamp
+	25, // 5: stream.app.v1.Domain.created_at:type_name -> google.protobuf.Timestamp
+	25, // 6: stream.app.v1.Domain.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 7: stream.app.v1.AdTemplate.created_at:type_name -> google.protobuf.Timestamp
+	25, // 8: stream.app.v1.AdTemplate.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 9: stream.app.v1.PlayerConfig.created_at:type_name -> google.protobuf.Timestamp
+	25, // 10: stream.app.v1.PlayerConfig.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 11: stream.app.v1.AdminPlayerConfig.created_at:type_name -> google.protobuf.Timestamp
+	25, // 12: stream.app.v1.AdminPlayerConfig.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 13: stream.app.v1.Payment.created_at:type_name -> google.protobuf.Timestamp
+	25, // 14: stream.app.v1.Payment.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 15: stream.app.v1.PlanSubscription.started_at:type_name -> google.protobuf.Timestamp
+	25, // 16: stream.app.v1.PlanSubscription.expires_at:type_name -> google.protobuf.Timestamp
+	25, // 17: stream.app.v1.PlanSubscription.created_at:type_name -> google.protobuf.Timestamp
+	25, // 18: stream.app.v1.PlanSubscription.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 19: stream.app.v1.WalletTransaction.created_at:type_name -> google.protobuf.Timestamp
+	25, // 20: stream.app.v1.WalletTransaction.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 21: stream.app.v1.PaymentHistoryItem.expires_at:type_name -> google.protobuf.Timestamp
+	25, // 22: stream.app.v1.PaymentHistoryItem.created_at:type_name -> google.protobuf.Timestamp
+	25, // 23: stream.app.v1.Video.created_at:type_name -> google.protobuf.Timestamp
+	25, // 24: stream.app.v1.Video.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 25: stream.app.v1.AdminUser.created_at:type_name -> google.protobuf.Timestamp
+	25, // 26: stream.app.v1.AdminUser.updated_at:type_name -> google.protobuf.Timestamp
+	16, // 27: stream.app.v1.AdminUserReferralInfo.referrer:type_name -> stream.app.v1.ReferralUserSummary
+	25, // 28: stream.app.v1.AdminUserReferralInfo.reward_granted_at:type_name -> google.protobuf.Timestamp
+	15, // 29: stream.app.v1.AdminUserDetail.user:type_name -> stream.app.v1.AdminUser
+	10, // 30: stream.app.v1.AdminUserDetail.subscription:type_name -> stream.app.v1.PlanSubscription
+	17, // 31: stream.app.v1.AdminUserDetail.referral:type_name -> stream.app.v1.AdminUserReferralInfo
+	25, // 32: stream.app.v1.AdminVideo.created_at:type_name -> google.protobuf.Timestamp
+	25, // 33: stream.app.v1.AdminVideo.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 34: stream.app.v1.AdminPayment.created_at:type_name -> google.protobuf.Timestamp
+	25, // 35: stream.app.v1.AdminPayment.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 36: stream.app.v1.AdminAdTemplate.created_at:type_name -> google.protobuf.Timestamp
+	25, // 37: stream.app.v1.AdminAdTemplate.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 38: stream.app.v1.AdminJob.created_at:type_name -> google.protobuf.Timestamp
+	25, // 39: stream.app.v1.AdminJob.updated_at:type_name -> google.protobuf.Timestamp
+	25, // 40: stream.app.v1.AdminAgent.last_heartbeat:type_name -> google.protobuf.Timestamp
+	25, // 41: stream.app.v1.AdminAgent.created_at:type_name -> google.protobuf.Timestamp
+	25, // 42: stream.app.v1.AdminAgent.updated_at:type_name -> google.protobuf.Timestamp
+	43, // [43:43] is the sub-list for method output_type
+	43, // [43:43] is the sub-list for method input_type
+	43, // [43:43] is the sub-list for extension type_name
+	43, // [43:43] is the sub-list for extension extendee
+	0,  // [0:43] is the sub-list for field type_name
 }
 
 func init() { file_app_v1_common_proto_init() }
@@ -3157,23 +3815,27 @@ func file_app_v1_common_proto_init() {
 	file_app_v1_common_proto_msgTypes[5].OneofWrappers = []any{}
 	file_app_v1_common_proto_msgTypes[6].OneofWrappers = []any{}
 	file_app_v1_common_proto_msgTypes[7].OneofWrappers = []any{}
+	file_app_v1_common_proto_msgTypes[8].OneofWrappers = []any{}
 	file_app_v1_common_proto_msgTypes[9].OneofWrappers = []any{}
-	file_app_v1_common_proto_msgTypes[10].OneofWrappers = []any{}
 	file_app_v1_common_proto_msgTypes[11].OneofWrappers = []any{}
+	file_app_v1_common_proto_msgTypes[12].OneofWrappers = []any{}
 	file_app_v1_common_proto_msgTypes[13].OneofWrappers = []any{}
-	file_app_v1_common_proto_msgTypes[14].OneofWrappers = []any{}
 	file_app_v1_common_proto_msgTypes[15].OneofWrappers = []any{}
 	file_app_v1_common_proto_msgTypes[16].OneofWrappers = []any{}
 	file_app_v1_common_proto_msgTypes[17].OneofWrappers = []any{}
 	file_app_v1_common_proto_msgTypes[18].OneofWrappers = []any{}
 	file_app_v1_common_proto_msgTypes[19].OneofWrappers = []any{}
+	file_app_v1_common_proto_msgTypes[20].OneofWrappers = []any{}
+	file_app_v1_common_proto_msgTypes[21].OneofWrappers = []any{}
+	file_app_v1_common_proto_msgTypes[22].OneofWrappers = []any{}
+	file_app_v1_common_proto_msgTypes[23].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_app_v1_common_proto_rawDesc), len(file_app_v1_common_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   21,
+			NumMessages:   25,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/internal/gen/proto/app/v1/payments.pb.go b/internal/gen/proto/app/v1/payments.pb.go
index 1a1bcda..47f0d23 100644
--- a/internal/gen/proto/app/v1/payments.pb.go
+++ b/internal/gen/proto/app/v1/payments.pb.go
@@ -167,6 +167,8 @@ func (x *CreatePaymentResponse) GetMessage() string {
 
 type ListPaymentHistoryRequest struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
+	Page          int32                  `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"`
+	Limit         int32                  `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -201,9 +203,28 @@ func (*ListPaymentHistoryRequest) Descriptor() ([]byte, []int) {
 	return file_app_v1_payments_proto_rawDescGZIP(), []int{2}
 }
 
+func (x *ListPaymentHistoryRequest) GetPage() int32 {
+	if x != nil {
+		return x.Page
+	}
+	return 0
+}
+
+func (x *ListPaymentHistoryRequest) GetLimit() int32 {
+	if x != nil {
+		return x.Limit
+	}
+	return 0
+}
+
 type ListPaymentHistoryResponse struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Payments      []*PaymentHistoryItem  `protobuf:"bytes,1,rep,name=payments,proto3" json:"payments,omitempty"`
+	Total         int64                  `protobuf:"varint,2,opt,name=total,proto3" json:"total,omitempty"`
+	Page          int32                  `protobuf:"varint,3,opt,name=page,proto3" json:"page,omitempty"`
+	Limit         int32                  `protobuf:"varint,4,opt,name=limit,proto3" json:"limit,omitempty"`
+	HasPrev       bool                   `protobuf:"varint,5,opt,name=has_prev,json=hasPrev,proto3" json:"has_prev,omitempty"`
+	HasNext       bool                   `protobuf:"varint,6,opt,name=has_next,json=hasNext,proto3" json:"has_next,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -245,6 +266,41 @@ func (x *ListPaymentHistoryResponse) GetPayments() []*PaymentHistoryItem {
 	return nil
 }
 
+func (x *ListPaymentHistoryResponse) GetTotal() int64 {
+	if x != nil {
+		return x.Total
+	}
+	return 0
+}
+
+func (x *ListPaymentHistoryResponse) GetPage() int32 {
+	if x != nil {
+		return x.Page
+	}
+	return 0
+}
+
+func (x *ListPaymentHistoryResponse) GetLimit() int32 {
+	if x != nil {
+		return x.Limit
+	}
+	return 0
+}
+
+func (x *ListPaymentHistoryResponse) GetHasPrev() bool {
+	if x != nil {
+		return x.HasPrev
+	}
+	return false
+}
+
+func (x *ListPaymentHistoryResponse) GetHasNext() bool {
+	if x != nil {
+		return x.HasNext
+	}
+	return false
+}
+
 type TopupWalletRequest struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Amount        float64                `protobuf:"fixed64,1,opt,name=amount,proto3" json:"amount,omitempty"`
@@ -471,10 +527,17 @@ const file_app_v1_payments_proto_rawDesc = "" +
 	"\x0ewallet_balance\x18\x03 \x01(\x01R\rwalletBalance\x12\x1d\n" +
 	"\n" +
 	"invoice_id\x18\x04 \x01(\tR\tinvoiceId\x12\x18\n" +
-	"\amessage\x18\x05 \x01(\tR\amessage\"\x1b\n" +
-	"\x19ListPaymentHistoryRequest\"[\n" +
+	"\amessage\x18\x05 \x01(\tR\amessage\"E\n" +
+	"\x19ListPaymentHistoryRequest\x12\x12\n" +
+	"\x04page\x18\x01 \x01(\x05R\x04page\x12\x14\n" +
+	"\x05limit\x18\x02 \x01(\x05R\x05limit\"\xd1\x01\n" +
 	"\x1aListPaymentHistoryResponse\x12=\n" +
-	"\bpayments\x18\x01 \x03(\v2!.stream.app.v1.PaymentHistoryItemR\bpayments\",\n" +
+	"\bpayments\x18\x01 \x03(\v2!.stream.app.v1.PaymentHistoryItemR\bpayments\x12\x14\n" +
+	"\x05total\x18\x02 \x01(\x03R\x05total\x12\x12\n" +
+	"\x04page\x18\x03 \x01(\x05R\x04page\x12\x14\n" +
+	"\x05limit\x18\x04 \x01(\x05R\x05limit\x12\x19\n" +
+	"\bhas_prev\x18\x05 \x01(\bR\ahasPrev\x12\x19\n" +
+	"\bhas_next\x18\x06 \x01(\bR\ahasNext\",\n" +
 	"\x12TopupWalletRequest\x12\x16\n" +
 	"\x06amount\x18\x01 \x01(\x01R\x06amount\"\xac\x01\n" +
 	"\x13TopupWalletResponse\x12O\n" +
diff --git a/internal/middleware/authenticator.go b/internal/middleware/authenticator.go
index b253f11..e992136 100644
--- a/internal/middleware/authenticator.go
+++ b/internal/middleware/authenticator.go
@@ -62,7 +62,7 @@ func (a *Authenticator) Authenticate(ctx context.Context) (*AuthResult, error) {
 		return nil, status.Error(codes.Unauthenticated, "Unauthorized")
 	}
 
-	user, err = a.syncSubscriptionState(ctx, user)
+	user, err = a.applyPostAuthSubscriptionState(ctx, user)
 	if err != nil {
 		a.logger.Error("Failed to sync subscription state", "error", err, "user_id", actor.UserID)
 		return nil, status.Error(codes.Internal, "Failed to load user subscription state")
@@ -79,7 +79,7 @@ func (a *Authenticator) Authenticate(ctx context.Context) (*AuthResult, error) {
 }
 
 func (a *Authenticator) RequireActor(ctx context.Context) (*Actor, error) {
-	md, err := a.requireTrustedMetadata(ctx)
+	md, err := a.RequireTrustedMetadata(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -98,11 +98,11 @@ func (a *Authenticator) RequireActor(ctx context.Context) (*Actor, error) {
 }
 
 func (a *Authenticator) RequireInternalCall(ctx context.Context) error {
-	_, err := a.requireTrustedMetadata(ctx)
+	_, err := a.RequireTrustedMetadata(ctx)
 	return err
 }
 
-func (a *Authenticator) requireTrustedMetadata(ctx context.Context) (metadata.MD, error) {
+func (a *Authenticator) RequireTrustedMetadata(ctx context.Context) (metadata.MD, error) {
 	md, ok := metadata.FromIncomingContext(ctx)
 	if !ok {
 		return nil, status.Error(codes.Unauthenticated, "Missing actor metadata")
@@ -124,74 +124,25 @@ func firstMetadataValue(md metadata.MD, key string) string {
 	return values[0]
 }
 
-func (a *Authenticator) syncSubscriptionState(ctx context.Context, user *model.User) (*model.User, error) {
-	subscription, err := model.GetLatestPlanSubscription(ctx, a.db, user.ID)
+func (a *Authenticator) applyPostAuthSubscriptionState(ctx context.Context, user *model.User) (*model.User, error) {
+	subscription, err := a.loadLatestSubscriptionForPostAuth(ctx, user)
 	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return user, nil
-		}
 		return nil, err
 	}
+	if subscription == nil {
+		return user, nil
+	}
 
 	now := time.Now().UTC()
 	if err := a.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		var lockedSubscription model.PlanSubscription
-		if err := tx.WithContext(ctx).
-			Clauses(clause.Locking{Strength: "UPDATE"}).
-			Where("id = ?", subscription.ID).
-			First(&lockedSubscription).Error; err != nil {
+		lockedSubscription, err := a.lockSubscriptionForPostAuth(ctx, tx, subscription.ID)
+		if err != nil {
 			return err
 		}
-
 		if lockedSubscription.ExpiresAt.After(now) {
-			if user.PlanID == nil || strings.TrimSpace(*user.PlanID) != lockedSubscription.PlanID {
-				if err := tx.WithContext(ctx).
-					Model(&model.User{}).
-					Where("id = ?", user.ID).
-					Update("plan_id", lockedSubscription.PlanID).Error; err != nil {
-					return err
-				}
-				user.PlanID = &lockedSubscription.PlanID
-			}
-
-			reminderDays, reminderField := reminderFieldForSubscription(&lockedSubscription, now)
-			if reminderField != "" {
-				sentAt := now
-				notification := &model.Notification{
-					ID:          uuidString(),
-					UserID:      user.ID,
-					Type:        "billing.subscription_expiring",
-					Title:       "Plan expiring soon",
-					Message:     reminderMessage(reminderDays),
-					ActionURL:   model.StringPtr("/settings/billing"),
-					ActionLabel: model.StringPtr("Renew plan"),
-					Metadata:    model.StringPtr(mustMarshalAuthJSON(map[string]interface{}{"plan_id": lockedSubscription.PlanID, "expires_at": lockedSubscription.ExpiresAt.UTC().Format(time.RFC3339), "reminder_days": reminderDays})),
-				}
-				if err := tx.WithContext(ctx).Create(notification).Error; err != nil {
-					return err
-				}
-				if err := tx.WithContext(ctx).
-					Model(&model.PlanSubscription{}).
-					Where("id = ?", lockedSubscription.ID).
-					Update(reminderField, sentAt).Error; err != nil {
-					return err
-				}
-			}
-
-			return nil
+			return a.applyActiveSubscriptionPostAuth(ctx, tx, user, lockedSubscription, now)
 		}
-
-		if user.PlanID != nil && strings.TrimSpace(*user.PlanID) != "" {
-			if err := tx.WithContext(ctx).
-				Model(&model.User{}).
-				Where("id = ?", user.ID).
-				Update("plan_id", nil).Error; err != nil {
-				return err
-			}
-			user.PlanID = nil
-		}
-
-		return nil
+		return a.clearExpiredPlanPostAuth(ctx, tx, user)
 	}); err != nil {
 		return nil, err
 	}
@@ -199,6 +150,86 @@ func (a *Authenticator) syncSubscriptionState(ctx context.Context, user *model.U
 	return user, nil
 }
 
+func (a *Authenticator) loadLatestSubscriptionForPostAuth(ctx context.Context, user *model.User) (*model.PlanSubscription, error) {
+	subscription, err := model.GetLatestPlanSubscription(ctx, a.db, user.ID)
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return subscription, nil
+}
+
+func (a *Authenticator) lockSubscriptionForPostAuth(ctx context.Context, tx *gorm.DB, subscriptionID string) (*model.PlanSubscription, error) {
+	var lockedSubscription model.PlanSubscription
+	if err := tx.WithContext(ctx).
+		Clauses(clause.Locking{Strength: "UPDATE"}).
+		Where("id = ?", subscriptionID).
+		First(&lockedSubscription).Error; err != nil {
+		return nil, err
+	}
+	return &lockedSubscription, nil
+}
+
+func (a *Authenticator) applyActiveSubscriptionPostAuth(ctx context.Context, tx *gorm.DB, user *model.User, subscription *model.PlanSubscription, now time.Time) error {
+	if user.PlanID == nil || strings.TrimSpace(*user.PlanID) != subscription.PlanID {
+		if err := tx.WithContext(ctx).
+			Model(&model.User{}).
+			Where("id = ?", user.ID).
+			Update("plan_id", subscription.PlanID).Error; err != nil {
+			return err
+		}
+		user.PlanID = &subscription.PlanID
+	}
+
+	return a.maybeCreateSubscriptionReminderPostAuth(ctx, tx, user, subscription, now)
+}
+
+func (a *Authenticator) maybeCreateSubscriptionReminderPostAuth(ctx context.Context, tx *gorm.DB, user *model.User, subscription *model.PlanSubscription, now time.Time) error {
+	reminderDays, reminderField := reminderFieldForSubscription(subscription, now)
+	if reminderField == "" {
+		return nil
+	}
+
+	sentAt := now
+	notification := &model.Notification{
+		ID:          uuidString(),
+		UserID:      user.ID,
+		Type:        "billing.subscription_expiring",
+		Title:       "Plan expiring soon",
+		Message:     reminderMessage(reminderDays),
+		ActionURL:   model.StringPtr("/settings/billing"),
+		ActionLabel: model.StringPtr("Renew plan"),
+		Metadata: model.StringPtr(mustMarshalAuthJSON(map[string]any{
+			"plan_id":       subscription.PlanID,
+			"expires_at":    subscription.ExpiresAt.UTC().Format(time.RFC3339),
+			"reminder_days": reminderDays,
+		})),
+	}
+	if err := tx.WithContext(ctx).Create(notification).Error; err != nil {
+		return err
+	}
+	return tx.WithContext(ctx).
+		Model(&model.PlanSubscription{}).
+		Where("id = ?", subscription.ID).
+		Update(reminderField, sentAt).Error
+}
+
+func (a *Authenticator) clearExpiredPlanPostAuth(ctx context.Context, tx *gorm.DB, user *model.User) error {
+	if user.PlanID == nil || strings.TrimSpace(*user.PlanID) == "" {
+		return nil
+	}
+	if err := tx.WithContext(ctx).
+		Model(&model.User{}).
+		Where("id = ?", user.ID).
+		Update("plan_id", nil).Error; err != nil {
+		return err
+	}
+	user.PlanID = nil
+	return nil
+}
+
 func reminderFieldForSubscription(subscription *model.PlanSubscription, now time.Time) (int, string) {
 	if subscription == nil || !subscription.ExpiresAt.After(now) {
 		return 0, ""
@@ -234,7 +265,7 @@ func reminderMessage(days int) string {
 	}
 }
 
-func mustMarshalAuthJSON(value interface{}) string {
+func mustMarshalAuthJSON(value any) string {
 	encoded, err := json.Marshal(value)
 	if err != nil {
 		return "{}"
diff --git a/internal/middleware/authenticator_test.go b/internal/middleware/authenticator_test.go
new file mode 100644
index 0000000..c8a7d09
--- /dev/null
+++ b/internal/middleware/authenticator_test.go
@@ -0,0 +1,318 @@
+package middleware
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/status"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
+	_ "modernc.org/sqlite"
+	"stream.api/internal/database/model"
+	"stream.api/internal/database/query"
+)
+
+type testLogger struct{}
+
+func (testLogger) Info(string, ...any)  {}
+func (testLogger) Error(string, ...any) {}
+func (testLogger) Debug(string, ...any) {}
+func (testLogger) Warn(string, ...any)  {}
+
+func newAuthenticatorTestDB(t *testing.T) *gorm.DB {
+	t.Helper()
+
+	dsn := fmt.Sprintf("file:%s?mode=memory&cache=shared", uuid.NewString())
+	db, err := gorm.Open(sqlite.Dialector{DriverName: "sqlite", DSN: dsn}, &gorm.Config{})
+	if err != nil {
+		t.Fatalf("open sqlite db: %v", err)
+	}
+	for _, stmt := range []string{
+		`CREATE TABLE user (
+			id TEXT PRIMARY KEY,
+			email TEXT NOT NULL,
+			password TEXT,
+			username TEXT,
+			avatar TEXT,
+			role TEXT NOT NULL,
+			google_id TEXT,
+			storage_used INTEGER NOT NULL DEFAULT 0,
+			plan_id TEXT,
+			referred_by_user_id TEXT,
+			referral_eligible BOOLEAN NOT NULL DEFAULT 1,
+			referral_reward_bps INTEGER,
+			referral_reward_granted_at DATETIME,
+			referral_reward_payment_id TEXT,
+			referral_reward_amount REAL,
+			created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+			updated_at DATETIME,
+			version INTEGER NOT NULL DEFAULT 1,
+			telegram_id TEXT
+		)`,
+		`CREATE TABLE plan_subscriptions (
+			id TEXT PRIMARY KEY,
+			user_id TEXT NOT NULL,
+			payment_id TEXT NOT NULL,
+			plan_id TEXT NOT NULL,
+			term_months INTEGER NOT NULL,
+			payment_method TEXT NOT NULL,
+			wallet_amount REAL NOT NULL,
+			topup_amount REAL NOT NULL,
+			started_at DATETIME NOT NULL,
+			expires_at DATETIME NOT NULL,
+			reminder_7d_sent_at DATETIME,
+			reminder_3d_sent_at DATETIME,
+			reminder_1d_sent_at DATETIME,
+			created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+			updated_at DATETIME,
+			version INTEGER NOT NULL DEFAULT 1
+		)`,
+		`CREATE TABLE notifications (
+			id TEXT PRIMARY KEY,
+			user_id TEXT NOT NULL,
+			type TEXT NOT NULL,
+			title TEXT NOT NULL,
+			message TEXT NOT NULL,
+			metadata TEXT,
+			action_url TEXT,
+			action_label TEXT,
+			is_read BOOLEAN NOT NULL DEFAULT 0,
+			created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+			updated_at DATETIME,
+			version INTEGER NOT NULL DEFAULT 1
+		)`,
+	} {
+		if err := db.Exec(stmt).Error; err != nil {
+			t.Fatalf("create sqlite schema: %v", err)
+		}
+	}
+	query.SetDefault(db)
+	return db
+}
+
+func newTrustedContext(userID, role string) context.Context {
+	return metadata.NewIncomingContext(context.Background(), metadata.Pairs(
+		ActorMarkerMetadataKey, "trusted-marker",
+		ActorIDMetadataKey, userID,
+		ActorRoleMetadataKey, role,
+		ActorEmailMetadataKey, "actor@example.com",
+	))
+}
+
+func TestRequireActor(t *testing.T) {
+
+	auth := NewAuthenticator(newAuthenticatorTestDB(t), testLogger{}, "trusted-marker")
+
+	t.Run("thiếu metadata", func(t *testing.T) {
+		_, err := auth.RequireActor(context.Background())
+		if status.Code(err) != codes.Unauthenticated {
+			t.Fatalf("code = %v, want %v", status.Code(err), codes.Unauthenticated)
+		}
+	})
+
+	t.Run("trusted marker sai", func(t *testing.T) {
+		ctx := metadata.NewIncomingContext(context.Background(), metadata.Pairs(ActorMarkerMetadataKey, "wrong", ActorIDMetadataKey, "u1", ActorRoleMetadataKey, "USER"))
+		_, err := auth.RequireActor(ctx)
+		if status.Code(err) != codes.Unauthenticated {
+			t.Fatalf("code = %v, want %v", status.Code(err), codes.Unauthenticated)
+		}
+	})
+
+	t.Run("thiếu actor id hoặc role", func(t *testing.T) {
+		ctx := metadata.NewIncomingContext(context.Background(), metadata.Pairs(ActorMarkerMetadataKey, "trusted-marker", ActorIDMetadataKey, "u1"))
+		_, err := auth.RequireActor(ctx)
+		if status.Code(err) != codes.Unauthenticated {
+			t.Fatalf("code = %v, want %v", status.Code(err), codes.Unauthenticated)
+		}
+	})
+
+	t.Run("actor hợp lệ", func(t *testing.T) {
+		actor, err := auth.RequireActor(newTrustedContext("u1", "ADMIN"))
+		if err != nil {
+			t.Fatalf("RequireActor() error = %v", err)
+		}
+		if actor.UserID != "u1" || actor.Role != "ADMIN" || actor.Email != "actor@example.com" {
+			t.Fatalf("actor = %#v", actor)
+		}
+	})
+}
+
+func TestAuthenticate(t *testing.T) {
+
+	t.Run("user không tồn tại", func(t *testing.T) {
+		db := newAuthenticatorTestDB(t)
+		auth := NewAuthenticator(db, testLogger{}, "trusted-marker")
+		_, err := auth.Authenticate(newTrustedContext(uuid.NewString(), "USER"))
+		if status.Code(err) != codes.Unauthenticated {
+			t.Fatalf("code = %v, want %v", status.Code(err), codes.Unauthenticated)
+		}
+	})
+
+	t.Run("user bị block", func(t *testing.T) {
+		db := newAuthenticatorTestDB(t)
+		blocked := model.User{ID: uuid.NewString(), Email: "blocked@example.com", Role: stringPtr("block")}
+		if err := db.Create(&blocked).Error; err != nil {
+			t.Fatalf("create blocked user: %v", err)
+		}
+		auth := NewAuthenticator(db, testLogger{}, "trusted-marker")
+		_, err := auth.Authenticate(newTrustedContext(blocked.ID, "USER"))
+		if status.Code(err) != codes.PermissionDenied {
+			t.Fatalf("code = %v, want %v", status.Code(err), codes.PermissionDenied)
+		}
+	})
+
+	t.Run("subscription active sync user.plan_id", func(t *testing.T) {
+		db := newAuthenticatorTestDB(t)
+		planID := uuid.NewString()
+		user := model.User{ID: uuid.NewString(), Email: "active@example.com", Role: stringPtr("USER")}
+		if err := db.Create(&user).Error; err != nil {
+			t.Fatalf("create user: %v", err)
+		}
+		subscription := model.PlanSubscription{
+			ID:            uuid.NewString(),
+			UserID:        user.ID,
+			PaymentID:     uuid.NewString(),
+			PlanID:        planID,
+			TermMonths:    1,
+			PaymentMethod: "wallet",
+			WalletAmount:  10,
+			TopupAmount:   0,
+			StartedAt:     time.Now().UTC().Add(-24 * time.Hour),
+			ExpiresAt:     time.Now().UTC().Add(10 * 24 * time.Hour),
+		}
+		if err := db.Create(&subscription).Error; err != nil {
+			t.Fatalf("create subscription: %v", err)
+		}
+		auth := NewAuthenticator(db, testLogger{}, "trusted-marker")
+
+		result, err := auth.Authenticate(newTrustedContext(user.ID, "USER"))
+		if err != nil {
+			t.Fatalf("Authenticate() error = %v", err)
+		}
+		if result.User.PlanID == nil || *result.User.PlanID != planID {
+			t.Fatalf("plan_id = %v, want %s", result.User.PlanID, planID)
+		}
+	})
+
+	t.Run("subscription expired clear user.plan_id", func(t *testing.T) {
+		db := newAuthenticatorTestDB(t)
+		planID := uuid.NewString()
+		user := model.User{ID: uuid.NewString(), Email: "expired@example.com", Role: stringPtr("USER"), PlanID: &planID}
+		if err := db.Create(&user).Error; err != nil {
+			t.Fatalf("create user: %v", err)
+		}
+		subscription := model.PlanSubscription{
+			ID:            uuid.NewString(),
+			UserID:        user.ID,
+			PaymentID:     uuid.NewString(),
+			PlanID:        planID,
+			TermMonths:    1,
+			PaymentMethod: "wallet",
+			WalletAmount:  10,
+			TopupAmount:   0,
+			StartedAt:     time.Now().UTC().Add(-10 * 24 * time.Hour),
+			ExpiresAt:     time.Now().UTC().Add(-1 * time.Hour),
+		}
+		if err := db.Create(&subscription).Error; err != nil {
+			t.Fatalf("create subscription: %v", err)
+		}
+		auth := NewAuthenticator(db, testLogger{}, "trusted-marker")
+
+		result, err := auth.Authenticate(newTrustedContext(user.ID, "USER"))
+		if err != nil {
+			t.Fatalf("Authenticate() error = %v", err)
+		}
+		if result.User.PlanID != nil {
+			t.Fatalf("plan_id = %v, want nil", result.User.PlanID)
+		}
+	})
+
+	t.Run("reminder chỉ tạo một lần theo threshold của latest subscription", func(t *testing.T) {
+		tests := []struct {
+			name      string
+			expiresIn time.Duration
+			wantDays  float64
+			wantField string
+		}{
+			{name: "7 ngày", expiresIn: 6 * 24 * time.Hour, wantDays: 7, wantField: "reminder_7d_sent_at"},
+			{name: "3 ngày", expiresIn: 2 * 24 * time.Hour, wantDays: 3, wantField: "reminder_3d_sent_at"},
+			{name: "1 ngày", expiresIn: 12 * time.Hour, wantDays: 1, wantField: "reminder_1d_sent_at"},
+		}
+
+		for _, tt := range tests {
+			t.Run(tt.name, func(t *testing.T) {
+				db := newAuthenticatorTestDB(t)
+				user := model.User{ID: uuid.NewString(), Email: "reminder@example.com", Role: stringPtr("USER")}
+				if err := db.Create(&user).Error; err != nil {
+					t.Fatalf("create user: %v", err)
+				}
+
+				now := time.Now().UTC()
+				subscription := model.PlanSubscription{
+					ID:            uuid.NewString(),
+					UserID:        user.ID,
+					PaymentID:     uuid.NewString(),
+					PlanID:        uuid.NewString(),
+					TermMonths:    1,
+					PaymentMethod: "wallet",
+					WalletAmount:  10,
+					ExpiresAt:     now.Add(tt.expiresIn),
+					StartedAt:     now.Add(-24 * time.Hour),
+				}
+				if err := db.Create(&subscription).Error; err != nil {
+					t.Fatalf("create subscription: %v", err)
+				}
+
+				auth := NewAuthenticator(db, testLogger{}, "trusted-marker")
+				for range 2 {
+					if _, err := auth.Authenticate(newTrustedContext(user.ID, "USER")); err != nil {
+						t.Fatalf("Authenticate() error = %v", err)
+					}
+				}
+
+				var notifications []model.Notification
+				if err := db.Order("created_at ASC, id ASC").Find(&notifications, "user_id = ?", user.ID).Error; err != nil {
+					t.Fatalf("list notifications: %v", err)
+				}
+				if len(notifications) != 1 {
+					t.Fatalf("notification count = %d, want 1", len(notifications))
+				}
+
+				var payload map[string]any
+				if err := json.Unmarshal([]byte(*notifications[0].Metadata), &payload); err != nil {
+					t.Fatalf("unmarshal notification metadata: %v", err)
+				}
+				if payload["reminder_days"] != tt.wantDays {
+					t.Fatalf("metadata reminder_days = %v, want %v", payload["reminder_days"], tt.wantDays)
+				}
+
+				var latest model.PlanSubscription
+				if err := db.First(&latest, "id = ?", subscription.ID).Error; err != nil {
+					t.Fatalf("load subscription: %v", err)
+				}
+				switch tt.wantField {
+				case "reminder_7d_sent_at":
+					if latest.Reminder7DSentAt == nil {
+						t.Fatal("expected reminder_7d_sent_at to be set")
+					}
+				case "reminder_3d_sent_at":
+					if latest.Reminder3DSentAt == nil {
+						t.Fatal("expected reminder_3d_sent_at to be set")
+					}
+				case "reminder_1d_sent_at":
+					if latest.Reminder1DSentAt == nil {
+						t.Fatal("expected reminder_1d_sent_at to be set")
+					}
+				}
+			})
+		}
+	})
+}
+
+func stringPtr(v string) *string { return &v }
diff --git a/internal/api/preferences/service.go b/internal/rpc/app/preferences_helpers.go
similarity index 62%
rename from internal/api/preferences/service.go
rename to internal/rpc/app/preferences_helpers.go
index 6c31dd8..8bd835f 100644
--- a/internal/api/preferences/service.go
+++ b/internal/rpc/app/preferences_helpers.go
@@ -1,4 +1,4 @@
-package preferences
+package app
 
 import (
 	"context"
@@ -9,27 +9,20 @@ import (
 	"stream.api/pkg/logger"
 )
 
-type UpdateInput struct {
+type updatePreferencesInput struct {
 	EmailNotifications     *bool
 	PushNotifications      *bool
 	MarketingNotifications *bool
 	TelegramNotifications  *bool
-	Autoplay               *bool
-	Loop                   *bool
-	Muted                  *bool
-	ShowControls           *bool
-	Pip                    *bool
-	Airplay                *bool
-	Chromecast             *bool
 	Language               *string
 	Locale                 *string
 }
 
-func LoadUserPreferences(ctx context.Context, db *gorm.DB, userID string) (*model.UserPreference, error) {
+func loadUserPreferences(ctx context.Context, db *gorm.DB, userID string) (*model.UserPreference, error) {
 	return model.FindOrCreateUserPreference(ctx, db, userID)
 }
 
-func UpdateUserPreferences(ctx context.Context, db *gorm.DB, l logger.Logger, userID string, req UpdateInput) (*model.UserPreference, error) {
+func updateUserPreferences(ctx context.Context, db *gorm.DB, l logger.Logger, userID string, req updatePreferencesInput) (*model.UserPreference, error) {
 	pref, err := model.FindOrCreateUserPreference(ctx, db, userID)
 	if err != nil {
 		l.Error("Failed to load preferences", "error", err)
@@ -48,27 +41,6 @@ func UpdateUserPreferences(ctx context.Context, db *gorm.DB, l logger.Logger, us
 	if req.TelegramNotifications != nil {
 		pref.TelegramNotifications = *req.TelegramNotifications
 	}
-	if req.Autoplay != nil {
-		pref.Autoplay = *req.Autoplay
-	}
-	if req.Loop != nil {
-		pref.Loop = *req.Loop
-	}
-	if req.Muted != nil {
-		pref.Muted = *req.Muted
-	}
-	if req.ShowControls != nil {
-		pref.ShowControls = model.BoolPtr(*req.ShowControls)
-	}
-	if req.Pip != nil {
-		pref.Pip = model.BoolPtr(*req.Pip)
-	}
-	if req.Airplay != nil {
-		pref.Airplay = model.BoolPtr(*req.Airplay)
-	}
-	if req.Chromecast != nil {
-		pref.Chromecast = model.BoolPtr(*req.Chromecast)
-	}
 	if req.Language != nil {
 		pref.Language = model.StringPtr(strings.TrimSpace(*req.Language))
 	}
diff --git a/internal/api/auth/service.go b/internal/rpc/app/profile_helpers.go
similarity index 82%
rename from internal/api/auth/service.go
rename to internal/rpc/app/profile_helpers.go
index 9e65db6..0f79341 100644
--- a/internal/api/auth/service.go
+++ b/internal/rpc/app/profile_helpers.go
@@ -1,4 +1,4 @@
-package auth
+package app
 
 import (
 	"context"
@@ -12,18 +12,18 @@ import (
 )
 
 var (
-	ErrEmailRequired         = errors.New("Email is required")
-	ErrEmailAlreadyRegistered = errors.New("Email already registered")
+	errEmailRequired          = errors.New("Email is required")
+	errEmailAlreadyRegistered = errors.New("Email already registered")
 )
 
-type UpdateProfileInput struct {
+type updateProfileInput struct {
 	Username *string
 	Email    *string
 	Language *string
 	Locale   *string
 }
 
-func UpdateUserProfile(ctx context.Context, db *gorm.DB, l logger.Logger, userID string, req UpdateProfileInput) (*model.User, error) {
+func updateUserProfile(ctx context.Context, db *gorm.DB, l logger.Logger, userID string, req updateProfileInput) (*model.User, error) {
 	updates := map[string]any{}
 	if req.Username != nil {
 		username := strings.TrimSpace(*req.Username)
@@ -32,7 +32,7 @@ func UpdateUserProfile(ctx context.Context, db *gorm.DB, l logger.Logger, userID
 	if req.Email != nil {
 		email := strings.TrimSpace(*req.Email)
 		if email == "" {
-			return nil, ErrEmailRequired
+			return nil, errEmailRequired
 		}
 		updates["email"] = email
 	}
@@ -40,7 +40,7 @@ func UpdateUserProfile(ctx context.Context, db *gorm.DB, l logger.Logger, userID
 	if len(updates) > 0 {
 		if err := db.WithContext(ctx).Model(&model.User{}).Where("id = ?", userID).Updates(updates).Error; err != nil {
 			if errors.Is(err, gorm.ErrDuplicatedKey) {
-				return nil, ErrEmailAlreadyRegistered
+				return nil, errEmailAlreadyRegistered
 			}
 			l.Error("Failed to update user", "error", err)
 			return nil, err
diff --git a/internal/rpc/app/register.go b/internal/rpc/app/register.go
index 3f15370..298126b 100644
--- a/internal/rpc/app/register.go
+++ b/internal/rpc/app/register.go
@@ -13,6 +13,7 @@ func Register(server grpc.ServiceRegistrar, services *Services) {
 	appv1.RegisterNotificationsServiceServer(server, services.NotificationsServiceServer)
 	appv1.RegisterDomainsServiceServer(server, services.DomainsServiceServer)
 	appv1.RegisterAdTemplatesServiceServer(server, services.AdTemplatesServiceServer)
+	appv1.RegisterPlayerConfigsServiceServer(server, services.PlayerConfigsServiceServer)
 	appv1.RegisterPlansServiceServer(server, services.PlansServiceServer)
 	appv1.RegisterPaymentsServiceServer(server, services.PaymentsServiceServer)
 	appv1.RegisterVideosServiceServer(server, services.VideosServiceServer)
diff --git a/internal/rpc/app/service_account.go b/internal/rpc/app/service_account.go
index 5d8bfe0..42465ce 100644
--- a/internal/rpc/app/service_account.go
+++ b/internal/rpc/app/service_account.go
@@ -6,11 +6,10 @@ import (
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 	"gorm.io/gorm"
-	authapi "stream.api/internal/api/auth"
-	preferencesapi "stream.api/internal/api/preferences"
-	usageapi "stream.api/internal/api/usage"
 	"stream.api/internal/database/model"
+	"stream.api/internal/database/query"
 	appv1 "stream.api/internal/gen/proto/app/v1"
 )
 
@@ -19,11 +18,27 @@ func (s *appServices) GetMe(ctx context.Context, _ *appv1.GetMeRequest) (*appv1.
 	if err != nil {
 		return nil, err
 	}
-	payload, err := authapi.BuildUserPayload(ctx, s.db, result.User)
+	payload, err := buildUserPayload(ctx, s.db, result.User)
 	if err != nil {
 		return nil, status.Error(codes.Internal, "Failed to build user payload")
 	}
-	return &appv1.GetMeResponse{User: toProtoUserPayload(payload)}, nil
+	return &appv1.GetMeResponse{User: toProtoUser(payload)}, nil
+}
+func (s *appServices) GetUserById(ctx context.Context, req *wrapperspb.StringValue) (*appv1.User, error) {
+	_, err := s.authenticator.RequireTrustedMetadata(ctx)
+	if err != nil {
+		return nil, err
+	}
+	u := query.User
+	user, err := u.WithContext(ctx).Where(u.ID.Eq(req.Value)).First()
+	if err != nil {
+		return nil, status.Error(codes.Unauthenticated, "Unauthorized")
+	}
+	payload, err := buildUserPayload(ctx, s.db, user)
+	if err != nil {
+		return nil, status.Error(codes.Internal, "Failed to build user payload")
+	}
+	return toProtoUser(payload), nil
 }
 func (s *appServices) UpdateMe(ctx context.Context, req *appv1.UpdateMeRequest) (*appv1.UpdateMeResponse, error) {
 	result, err := s.authenticate(ctx)
@@ -31,7 +46,7 @@ func (s *appServices) UpdateMe(ctx context.Context, req *appv1.UpdateMeRequest)
 		return nil, err
 	}
 
-	updatedUser, err := authapi.UpdateUserProfile(ctx, s.db, s.logger, result.UserID, authapi.UpdateProfileInput{
+	updatedUser, err := updateUserProfile(ctx, s.db, s.logger, result.UserID, updateProfileInput{
 		Username: req.Username,
 		Email:    req.Email,
 		Language: req.Language,
@@ -39,14 +54,14 @@ func (s *appServices) UpdateMe(ctx context.Context, req *appv1.UpdateMeRequest)
 	})
 	if err != nil {
 		switch {
-		case errors.Is(err, authapi.ErrEmailRequired), errors.Is(err, authapi.ErrEmailAlreadyRegistered):
+		case errors.Is(err, errEmailRequired), errors.Is(err, errEmailAlreadyRegistered):
 			return nil, status.Error(codes.InvalidArgument, err.Error())
 		default:
 			return nil, status.Error(codes.Internal, "Failed to update profile")
 		}
 	}
 
-	payload, err := authapi.BuildUserPayload(ctx, s.db, updatedUser)
+	payload, err := buildUserPayload(ctx, s.db, updatedUser)
 	if err != nil {
 		return nil, status.Error(codes.Internal, "Failed to build user payload")
 	}
@@ -69,9 +84,6 @@ func (s *appServices) DeleteMe(ctx context.Context, _ *appv1.DeleteMeRequest) (*
 		if err := tx.Where("user_id = ?", userID).Delete(&model.AdTemplate{}).Error; err != nil {
 			return err
 		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.VideoAdConfig{}).Error; err != nil {
-			return err
-		}
 		if err := tx.Where("user_id = ?", userID).Delete(&model.WalletTransaction{}).Error; err != nil {
 			return err
 		}
@@ -115,9 +127,6 @@ func (s *appServices) ClearMyData(ctx context.Context, _ *appv1.ClearMyDataReque
 		if err := tx.Where("user_id = ?", userID).Delete(&model.AdTemplate{}).Error; err != nil {
 			return err
 		}
-		if err := tx.Where("user_id = ?", userID).Delete(&model.VideoAdConfig{}).Error; err != nil {
-			return err
-		}
 		if err := tx.Where("user_id = ?", userID).Delete(&model.Video{}).Error; err != nil {
 			return err
 		}
@@ -137,7 +146,7 @@ func (s *appServices) GetPreferences(ctx context.Context, _ *appv1.GetPreference
 	if err != nil {
 		return nil, err
 	}
-	pref, err := preferencesapi.LoadUserPreferences(ctx, s.db, result.UserID)
+	pref, err := loadUserPreferences(ctx, s.db, result.UserID)
 	if err != nil {
 		return nil, status.Error(codes.Internal, "Failed to load preferences")
 	}
@@ -148,18 +157,11 @@ func (s *appServices) UpdatePreferences(ctx context.Context, req *appv1.UpdatePr
 	if err != nil {
 		return nil, err
 	}
-	pref, err := preferencesapi.UpdateUserPreferences(ctx, s.db, s.logger, result.UserID, preferencesapi.UpdateInput{
+	pref, err := updateUserPreferences(ctx, s.db, s.logger, result.UserID, updatePreferencesInput{
 		EmailNotifications:     req.EmailNotifications,
 		PushNotifications:      req.PushNotifications,
 		MarketingNotifications: req.MarketingNotifications,
 		TelegramNotifications:  req.TelegramNotifications,
-		Autoplay:               req.Autoplay,
-		Loop:                   req.Loop,
-		Muted:                  req.Muted,
-		ShowControls:           req.ShowControls,
-		Pip:                    req.Pip,
-		Airplay:                req.Airplay,
-		Chromecast:             req.Chromecast,
 		Language:               req.Language,
 		Locale:                 req.Locale,
 	})
@@ -173,7 +175,7 @@ func (s *appServices) GetUsage(ctx context.Context, _ *appv1.GetUsageRequest) (*
 	if err != nil {
 		return nil, err
 	}
-	payload, err := usageapi.LoadUsage(ctx, s.db, s.logger, result.User)
+	payload, err := loadUsage(ctx, s.db, s.logger, result.User)
 	if err != nil {
 		return nil, status.Error(codes.Internal, "Failed to load usage")
 	}
diff --git a/internal/rpc/app/service_admin_finance_catalog.go b/internal/rpc/app/service_admin_finance_catalog.go
index fe8cabd..7af2bf6 100644
--- a/internal/rpc/app/service_admin_finance_catalog.go
+++ b/internal/rpc/app/service_admin_finance_catalog.go
@@ -3,10 +3,7 @@ package app
 import (
 	"context"
 	"errors"
-	"fmt"
-	"net/http"
 	"strings"
-	"time"
 
 	"github.com/google/uuid"
 	"google.golang.org/grpc/codes"
@@ -99,173 +96,21 @@ func (s *appServices) CreateAdminPayment(ctx context.Context, req *appv1.CreateA
 		return nil, status.Error(codes.InvalidArgument, "Payment method must be wallet or topup")
 	}
 
-	var user model.User
-	if err := s.db.WithContext(ctx).Where("id = ?", userID).First(&user).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, status.Error(codes.InvalidArgument, "User not found")
-		}
-		return nil, status.Error(codes.Internal, "Failed to create payment")
+	user, err := s.loadPaymentUserForAdmin(ctx, userID)
+	if err != nil {
+		return nil, err
+	}
+	planRecord, err := s.loadPaymentPlanForAdmin(ctx, planID)
+	if err != nil {
+		return nil, err
 	}
 
-	var planRecord model.Plan
-	if err := s.db.WithContext(ctx).Where("id = ?", planID).First(&planRecord).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, status.Error(codes.InvalidArgument, "Plan not found")
-		}
-		return nil, status.Error(codes.Internal, "Failed to create payment")
-	}
-	if planRecord.IsActive == nil || !*planRecord.IsActive {
-		return nil, status.Error(codes.InvalidArgument, "Plan is not active")
-	}
-
-	totalAmount := planRecord.Price * float64(req.GetTermMonths())
-	statusValue := "SUCCESS"
-	provider := "INTERNAL"
-	currency := normalizeCurrency(nil)
-	transactionID := buildTransactionID("sub")
-	now := time.Now().UTC()
-
-	paymentRecord := &model.Payment{
-		ID:            uuid.New().String(),
+	resultValue, err := s.executePaymentFlow(ctx, paymentExecutionInput{
 		UserID:        user.ID,
-		PlanID:        &planRecord.ID,
-		Amount:        totalAmount,
-		Currency:      &currency,
-		Status:        &statusValue,
-		Provider:      &provider,
-		TransactionID: &transactionID,
-	}
-	invoiceID := buildInvoiceID(paymentRecord.ID)
-	var subscription *model.PlanSubscription
-	var walletBalance float64
-
-	err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if _, err := lockUserForUpdate(ctx, tx, user.ID); err != nil {
-			return err
-		}
-
-		currentSubscription, err := model.GetLatestPlanSubscription(ctx, tx, user.ID)
-		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-			return err
-		}
-
-		baseExpiry := now
-		if currentSubscription != nil && currentSubscription.ExpiresAt.After(baseExpiry) {
-			baseExpiry = currentSubscription.ExpiresAt.UTC()
-		}
-		newExpiry := baseExpiry.AddDate(0, int(req.GetTermMonths()), 0)
-
-		currentWalletBalance, err := model.GetWalletBalance(ctx, tx, user.ID)
-		if err != nil {
-			return err
-		}
-		shortfall := maxFloat(totalAmount-currentWalletBalance, 0)
-		if paymentMethod == paymentMethodWallet && shortfall > 0 {
-			return statusErrorWithBody(ctx, codes.InvalidArgument, http.StatusBadRequest, "Insufficient wallet balance", map[string]interface{}{
-				"payment_method": paymentMethod,
-				"wallet_balance": currentWalletBalance,
-				"total_amount":   totalAmount,
-				"shortfall":      shortfall,
-			})
-		}
-
-		topupAmount := 0.0
-		if paymentMethod == paymentMethodTopup {
-			if req.TopupAmount == nil {
-				return statusErrorWithBody(ctx, codes.InvalidArgument, http.StatusBadRequest, "Top-up amount is required when payment method is topup", map[string]interface{}{
-					"payment_method": paymentMethod,
-					"wallet_balance": currentWalletBalance,
-					"total_amount":   totalAmount,
-					"shortfall":      shortfall,
-				})
-			}
-			topupAmount = maxFloat(req.GetTopupAmount(), 0)
-			if topupAmount <= 0 {
-				return statusErrorWithBody(ctx, codes.InvalidArgument, http.StatusBadRequest, "Top-up amount must be greater than 0", map[string]interface{}{
-					"payment_method": paymentMethod,
-					"wallet_balance": currentWalletBalance,
-					"total_amount":   totalAmount,
-					"shortfall":      shortfall,
-				})
-			}
-			if topupAmount < shortfall {
-				return statusErrorWithBody(ctx, codes.InvalidArgument, http.StatusBadRequest, "Top-up amount must be greater than or equal to the required shortfall", map[string]interface{}{
-					"payment_method": paymentMethod,
-					"wallet_balance": currentWalletBalance,
-					"total_amount":   totalAmount,
-					"shortfall":      shortfall,
-					"topup_amount":   topupAmount,
-				})
-			}
-		}
-
-		if err := tx.Create(paymentRecord).Error; err != nil {
-			return err
-		}
-
-		walletUsedAmount := totalAmount
-		if paymentMethod == paymentMethodTopup {
-			topupTransaction := &model.WalletTransaction{
-				ID:         uuid.New().String(),
-				UserID:     user.ID,
-				Type:       walletTransactionTypeTopup,
-				Amount:     maxFloat(req.GetTopupAmount(), 0),
-				Currency:   model.StringPtr(currency),
-				Note:       model.StringPtr(fmt.Sprintf("Wallet top-up for %s (%d months)", planRecord.Name, req.GetTermMonths())),
-				PaymentID:  &paymentRecord.ID,
-				PlanID:     &planRecord.ID,
-				TermMonths: int32Ptr(req.GetTermMonths()),
-			}
-			if err := tx.Create(topupTransaction).Error; err != nil {
-				return err
-			}
-		}
-
-		debitTransaction := &model.WalletTransaction{
-			ID:         uuid.New().String(),
-			UserID:     user.ID,
-			Type:       walletTransactionTypeSubscriptionDebit,
-			Amount:     -totalAmount,
-			Currency:   model.StringPtr(currency),
-			Note:       model.StringPtr(fmt.Sprintf("Subscription payment for %s (%d months)", planRecord.Name, req.GetTermMonths())),
-			PaymentID:  &paymentRecord.ID,
-			PlanID:     &planRecord.ID,
-			TermMonths: int32Ptr(req.GetTermMonths()),
-		}
-		if err := tx.Create(debitTransaction).Error; err != nil {
-			return err
-		}
-
-		subscription = &model.PlanSubscription{
-			ID:            uuid.New().String(),
-			UserID:        user.ID,
-			PaymentID:     paymentRecord.ID,
-			PlanID:        planRecord.ID,
-			TermMonths:    req.GetTermMonths(),
-			PaymentMethod: paymentMethod,
-			WalletAmount:  walletUsedAmount,
-			TopupAmount:   maxFloat(req.GetTopupAmount(), 0),
-			StartedAt:     now,
-			ExpiresAt:     newExpiry,
-		}
-		if err := tx.Create(subscription).Error; err != nil {
-			return err
-		}
-
-		if err := tx.Model(&model.User{}).Where("id = ?", user.ID).Update("plan_id", planRecord.ID).Error; err != nil {
-			return err
-		}
-
-		notification := buildSubscriptionNotification(user.ID, paymentRecord.ID, invoiceID, &planRecord, subscription)
-		if err := tx.Create(notification).Error; err != nil {
-			return err
-		}
-
-		walletBalance, err = model.GetWalletBalance(ctx, tx, user.ID)
-		if err != nil {
-			return err
-		}
-		return nil
+		Plan:          planRecord,
+		TermMonths:    req.GetTermMonths(),
+		PaymentMethod: paymentMethod,
+		TopupAmount:   req.TopupAmount,
 	})
 	if err != nil {
 		if _, ok := status.FromError(err); ok {
@@ -274,15 +119,15 @@ func (s *appServices) CreateAdminPayment(ctx context.Context, req *appv1.CreateA
 		return nil, status.Error(codes.Internal, "Failed to create payment")
 	}
 
-	payload, err := s.buildAdminPayment(ctx, paymentRecord)
+	payload, err := s.buildAdminPayment(ctx, resultValue.Payment)
 	if err != nil {
 		return nil, status.Error(codes.Internal, "Failed to create payment")
 	}
 	return &appv1.CreateAdminPaymentResponse{
 		Payment:       payload,
-		Subscription:  toProtoPlanSubscription(subscription),
-		WalletBalance: walletBalance,
-		InvoiceId:     invoiceID,
+		Subscription:  toProtoPlanSubscription(resultValue.Subscription),
+		WalletBalance: resultValue.WalletBalance,
+		InvoiceId:     resultValue.InvoiceID,
 	}, nil
 }
 func (s *appServices) UpdateAdminPayment(ctx context.Context, req *appv1.UpdateAdminPaymentRequest) (*appv1.UpdateAdminPaymentResponse, error) {
@@ -554,7 +399,7 @@ func (s *appServices) CreateAdminAdTemplate(ctx context.Context, req *appv1.Crea
 		Name:        strings.TrimSpace(req.GetName()),
 		Description: nullableTrimmedStringPtr(req.Description),
 		VastTagURL:  strings.TrimSpace(req.GetVastTagUrl()),
-		AdFormat:    model.StringPtr(normalizeAdminAdFormatValue(req.GetAdFormat())),
+		AdFormat:    model.StringPtr(normalizeAdFormat(req.GetAdFormat())),
 		Duration:    duration,
 		IsActive:    model.BoolPtr(req.GetIsActive()),
 		IsDefault:   req.GetIsDefault(),
@@ -614,7 +459,7 @@ func (s *appServices) UpdateAdminAdTemplate(ctx context.Context, req *appv1.Upda
 	item.Name = strings.TrimSpace(req.GetName())
 	item.Description = nullableTrimmedStringPtr(req.Description)
 	item.VastTagURL = strings.TrimSpace(req.GetVastTagUrl())
-	item.AdFormat = model.StringPtr(normalizeAdminAdFormatValue(req.GetAdFormat()))
+	item.AdFormat = model.StringPtr(normalizeAdFormat(req.GetAdFormat()))
 	item.Duration = duration
 	item.IsActive = model.BoolPtr(req.GetIsActive())
 	item.IsDefault = req.GetIsDefault()
@@ -650,7 +495,7 @@ func (s *appServices) DeleteAdminAdTemplate(ctx context.Context, req *appv1.Dele
 	}
 
 	err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Where("ad_template_id = ?", id).Delete(&model.VideoAdConfig{}).Error; err != nil {
+		if err := tx.Model(&model.Video{}).Where("ad_id = ?", id).Update("ad_id", nil).Error; err != nil {
 			return err
 		}
 		res := tx.Where("id = ?", id).Delete(&model.AdTemplate{})
@@ -670,3 +515,221 @@ func (s *appServices) DeleteAdminAdTemplate(ctx context.Context, req *appv1.Dele
 	}
 	return &appv1.MessageResponse{Message: "Ad template deleted"}, nil
 }
+
+func (s *appServices) ListAdminPlayerConfigs(ctx context.Context, req *appv1.ListAdminPlayerConfigsRequest) (*appv1.ListAdminPlayerConfigsResponse, error) {
+	if _, err := s.requireAdmin(ctx); err != nil {
+		return nil, err
+	}
+
+	page, limit, offset := adminPageLimitOffset(req.GetPage(), req.GetLimit())
+	limitInt := int(limit)
+	search := strings.TrimSpace(protoStringValue(req.Search))
+	userID := strings.TrimSpace(protoStringValue(req.UserId))
+
+	db := s.db.WithContext(ctx).Model(&model.PlayerConfig{})
+	if search != "" {
+		like := "%" + search + "%"
+		db = db.Where("name ILIKE ?", like)
+	}
+	if userID != "" {
+		db = db.Where("user_id = ?", userID)
+	}
+
+	var total int64
+	if err := db.Count(&total).Error; err != nil {
+		return nil, status.Error(codes.Internal, "Failed to list player configs")
+	}
+
+	var configs []model.PlayerConfig
+	if err := db.Order("created_at DESC").Offset(offset).Limit(limitInt).Find(&configs).Error; err != nil {
+		return nil, status.Error(codes.Internal, "Failed to list player configs")
+	}
+
+	items := make([]*appv1.AdminPlayerConfig, 0, len(configs))
+	for i := range configs {
+		payload, err := s.buildAdminPlayerConfig(ctx, &configs[i])
+		if err != nil {
+			return nil, status.Error(codes.Internal, "Failed to list player configs")
+		}
+		items = append(items, payload)
+	}
+
+	return &appv1.ListAdminPlayerConfigsResponse{
+		Configs: items,
+		Total:   total,
+		Page:    page,
+		Limit:   limit,
+	}, nil
+}
+
+func (s *appServices) GetAdminPlayerConfig(ctx context.Context, req *appv1.GetAdminPlayerConfigRequest) (*appv1.GetAdminPlayerConfigResponse, error) {
+	if _, err := s.requireAdmin(ctx); err != nil {
+		return nil, err
+	}
+
+	id := strings.TrimSpace(req.GetId())
+	if id == "" {
+		return nil, status.Error(codes.NotFound, "Player config not found")
+	}
+
+	var item model.PlayerConfig
+	if err := s.db.WithContext(ctx).Where("id = ?", id).First(&item).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, status.Error(codes.NotFound, "Player config not found")
+		}
+		return nil, status.Error(codes.Internal, "Failed to load player config")
+	}
+
+	payload, err := s.buildAdminPlayerConfig(ctx, &item)
+	if err != nil {
+		return nil, status.Error(codes.Internal, "Failed to load player config")
+	}
+	return &appv1.GetAdminPlayerConfigResponse{Config: payload}, nil
+}
+
+func (s *appServices) CreateAdminPlayerConfig(ctx context.Context, req *appv1.CreateAdminPlayerConfigRequest) (*appv1.CreateAdminPlayerConfigResponse, error) {
+	if _, err := s.requireAdmin(ctx); err != nil {
+		return nil, err
+	}
+
+	if msg := validateAdminPlayerConfigInput(req.GetUserId(), req.GetName()); msg != "" {
+		return nil, status.Error(codes.InvalidArgument, msg)
+	}
+
+	var user model.User
+	if err := s.db.WithContext(ctx).Where("id = ?", strings.TrimSpace(req.GetUserId())).First(&user).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, status.Error(codes.InvalidArgument, "User not found")
+		}
+		return nil, status.Error(codes.Internal, "Failed to save player config")
+	}
+
+	item := &model.PlayerConfig{
+		ID:            uuid.New().String(),
+		UserID:        user.ID,
+		Name:          strings.TrimSpace(req.GetName()),
+		Description:   nullableTrimmedStringPtr(req.Description),
+		Autoplay:      req.GetAutoplay(),
+		Loop:          req.GetLoop(),
+		Muted:         req.GetMuted(),
+		ShowControls:  model.BoolPtr(req.GetShowControls()),
+		Pip:           model.BoolPtr(req.GetPip()),
+		Airplay:       model.BoolPtr(req.GetAirplay()),
+		Chromecast:    model.BoolPtr(req.GetChromecast()),
+		IsActive:      model.BoolPtr(req.GetIsActive()),
+		IsDefault:     req.GetIsDefault(),
+		EncrytionM3u8: model.BoolPtr(req.EncrytionM3U8 == nil || *req.EncrytionM3U8),
+		LogoURL:       nullableTrimmedStringPtr(req.LogoUrl),
+	}
+	if !boolValue(item.IsActive) {
+		item.IsDefault = false
+	}
+
+	if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		if item.IsDefault {
+			if err := s.unsetAdminDefaultPlayerConfigs(ctx, tx, item.UserID, ""); err != nil {
+				return err
+			}
+		}
+		return tx.Create(item).Error
+	}); err != nil {
+		return nil, status.Error(codes.Internal, "Failed to save player config")
+	}
+
+	payload, err := s.buildAdminPlayerConfig(ctx, item)
+	if err != nil {
+		return nil, status.Error(codes.Internal, "Failed to save player config")
+	}
+	return &appv1.CreateAdminPlayerConfigResponse{Config: payload}, nil
+}
+
+func (s *appServices) UpdateAdminPlayerConfig(ctx context.Context, req *appv1.UpdateAdminPlayerConfigRequest) (*appv1.UpdateAdminPlayerConfigResponse, error) {
+	if _, err := s.requireAdmin(ctx); err != nil {
+		return nil, err
+	}
+
+	id := strings.TrimSpace(req.GetId())
+	if id == "" {
+		return nil, status.Error(codes.NotFound, "Player config not found")
+	}
+
+	if msg := validateAdminPlayerConfigInput(req.GetUserId(), req.GetName()); msg != "" {
+		return nil, status.Error(codes.InvalidArgument, msg)
+	}
+
+	var user model.User
+	if err := s.db.WithContext(ctx).Where("id = ?", strings.TrimSpace(req.GetUserId())).First(&user).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, status.Error(codes.InvalidArgument, "User not found")
+		}
+		return nil, status.Error(codes.Internal, "Failed to save player config")
+	}
+
+	var item model.PlayerConfig
+	if err := s.db.WithContext(ctx).Where("id = ?", id).First(&item).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, status.Error(codes.NotFound, "Player config not found")
+		}
+		return nil, status.Error(codes.Internal, "Failed to save player config")
+	}
+
+	item.UserID = user.ID
+	item.Name = strings.TrimSpace(req.GetName())
+	item.Description = nullableTrimmedStringPtr(req.Description)
+	item.Autoplay = req.GetAutoplay()
+	item.Loop = req.GetLoop()
+	item.Muted = req.GetMuted()
+	item.ShowControls = model.BoolPtr(req.GetShowControls())
+	item.Pip = model.BoolPtr(req.GetPip())
+	item.Airplay = model.BoolPtr(req.GetAirplay())
+	item.Chromecast = model.BoolPtr(req.GetChromecast())
+	item.IsActive = model.BoolPtr(req.GetIsActive())
+	item.IsDefault = req.GetIsDefault()
+	if req.EncrytionM3U8 != nil {
+		item.EncrytionM3u8 = model.BoolPtr(*req.EncrytionM3U8)
+	}
+	if req.LogoUrl != nil {
+		item.LogoURL = nullableTrimmedStringPtr(req.LogoUrl)
+	}
+	if !boolValue(item.IsActive) {
+		item.IsDefault = false
+	}
+
+	if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		if item.IsDefault {
+			if err := s.unsetAdminDefaultPlayerConfigs(ctx, tx, item.UserID, item.ID); err != nil {
+				return err
+			}
+		}
+		return tx.Save(&item).Error
+	}); err != nil {
+		return nil, status.Error(codes.Internal, "Failed to save player config")
+	}
+
+	payload, err := s.buildAdminPlayerConfig(ctx, &item)
+	if err != nil {
+		return nil, status.Error(codes.Internal, "Failed to save player config")
+	}
+	return &appv1.UpdateAdminPlayerConfigResponse{Config: payload}, nil
+}
+
+func (s *appServices) DeleteAdminPlayerConfig(ctx context.Context, req *appv1.DeleteAdminPlayerConfigRequest) (*appv1.MessageResponse, error) {
+	if _, err := s.requireAdmin(ctx); err != nil {
+		return nil, err
+	}
+
+	id := strings.TrimSpace(req.GetId())
+	if id == "" {
+		return nil, status.Error(codes.NotFound, "Player config not found")
+	}
+
+	res := s.db.WithContext(ctx).Where("id = ?", id).Delete(&model.PlayerConfig{})
+	if res.Error != nil {
+		return nil, status.Error(codes.Internal, "Failed to delete player config")
+	}
+	if res.RowsAffected == 0 {
+		return nil, status.Error(codes.NotFound, "Player config not found")
+	}
+
+	return &appv1.MessageResponse{Message: "Player config deleted"}, nil
+}
diff --git a/internal/rpc/app/service_admin_finance_catalog_test.go b/internal/rpc/app/service_admin_finance_catalog_test.go
new file mode 100644
index 0000000..9110cee
--- /dev/null
+++ b/internal/rpc/app/service_admin_finance_catalog_test.go
@@ -0,0 +1,78 @@
+package app
+
+import (
+	"testing"
+
+	"github.com/google/uuid"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/metadata"
+	"stream.api/internal/database/model"
+	appv1 "stream.api/internal/gen/proto/app/v1"
+)
+
+func TestCreateAdminPayment(t *testing.T) {
+
+	t.Run("happy path admin", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		admin := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "admin@example.com", Role: ptrString("ADMIN")})
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "user@example.com", Role: ptrString("USER")})
+		plan := seedTestPlan(t, db, model.Plan{ID: uuid.NewString(), Name: "Team", Price: 30, Cycle: "monthly", StorageLimit: 200, UploadLimit: 20, QualityLimit: "1440p", IsActive: ptrBool(true)})
+		seedWalletTransaction(t, db, model.WalletTransaction{ID: uuid.NewString(), UserID: user.ID, Type: walletTransactionTypeTopup, Amount: 5, Currency: ptrString("USD")})
+
+		conn, cleanup := newTestGRPCServer(t, services)
+		defer cleanup()
+
+		client := newAdminClient(conn)
+		resp, err := client.CreateAdminPayment(testActorOutgoingContext(admin.ID, "ADMIN"), &appv1.CreateAdminPaymentRequest{
+			UserId:        user.ID,
+			PlanId:        plan.ID,
+			TermMonths:    1,
+			PaymentMethod: paymentMethodTopup,
+			TopupAmount:   ptrFloat64(25),
+		})
+		if err != nil {
+			t.Fatalf("CreateAdminPayment() error = %v", err)
+		}
+		if resp.Payment == nil || resp.Subscription == nil {
+			t.Fatalf("CreateAdminPayment() response incomplete: %#v", resp)
+		}
+		if resp.Payment.UserId != user.ID {
+			t.Fatalf("payment user_id = %q, want %q", resp.Payment.UserId, user.ID)
+		}
+		if resp.InvoiceId != buildInvoiceID(resp.Payment.Id) {
+			t.Fatalf("invoice id = %q, want %q", resp.InvoiceId, buildInvoiceID(resp.Payment.Id))
+		}
+		if resp.Payment.GetWalletAmount() != 30 {
+			t.Fatalf("payment wallet_amount = %v, want 30", resp.Payment.GetWalletAmount())
+		}
+		if resp.Payment.GetTopupAmount() != 25 {
+			t.Fatalf("payment topup_amount = %v, want 25", resp.Payment.GetTopupAmount())
+		}
+	})
+
+	t.Run("wallet thiếu tiền giữ trailer", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		admin := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "admin@example.com", Role: ptrString("ADMIN")})
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "user@example.com", Role: ptrString("USER")})
+		plan := seedTestPlan(t, db, model.Plan{ID: uuid.NewString(), Name: "Team", Price: 30, Cycle: "monthly", StorageLimit: 200, UploadLimit: 20, QualityLimit: "1440p", IsActive: ptrBool(true)})
+
+		conn, cleanup := newTestGRPCServer(t, services)
+		defer cleanup()
+
+		client := newAdminClient(conn)
+		var trailer metadata.MD
+		_, err := client.CreateAdminPayment(testActorOutgoingContext(admin.ID, "ADMIN"), &appv1.CreateAdminPaymentRequest{
+			UserId:        user.ID,
+			PlanId:        plan.ID,
+			TermMonths:    1,
+			PaymentMethod: paymentMethodWallet,
+		}, grpc.Trailer(&trailer))
+		assertGRPCCode(t, err, codes.InvalidArgument)
+		if body := firstTestMetadataValue(trailer, "x-error-body"); body == "" {
+			t.Fatal("expected x-error-body trailer")
+		}
+	})
+}
diff --git a/internal/rpc/app/service_admin_jobs_agents.go b/internal/rpc/app/service_admin_jobs_agents.go
index 7b4b34d..c8f2a0a 100644
--- a/internal/rpc/app/service_admin_jobs_agents.go
+++ b/internal/rpc/app/service_admin_jobs_agents.go
@@ -10,36 +10,38 @@ import (
 	"google.golang.org/grpc/status"
 	"gorm.io/gorm"
 	appv1 "stream.api/internal/gen/proto/app/v1"
-	"stream.api/internal/video/runtime/services"
+	"stream.api/internal/video"
 )
 
 func (s *appServices) ListAdminJobs(ctx context.Context, req *appv1.ListAdminJobsRequest) (*appv1.ListAdminJobsResponse, error) {
 	if _, err := s.requireAdmin(ctx); err != nil {
 		return nil, err
 	}
-	if s.jobService == nil {
+	if s.videoService == nil {
 		return nil, status.Error(codes.Unavailable, "Job service is unavailable")
 	}
 
+	agentID := strings.TrimSpace(req.GetAgentId())
 	offset := int(req.GetOffset())
 	limit := int(req.GetLimit())
-	if offset < 0 {
-		offset = 0
-	}
-	if limit <= 0 || limit > 100 {
-		limit = 20
-	}
+	pageSize := int(req.GetPageSize())
+	useCursorPagination := req.Cursor != nil || pageSize > 0
 
 	var (
-		result *services.PaginatedJobs
+		result *video.PaginatedJobs
 		err    error
 	)
-	if agentID := strings.TrimSpace(req.GetAgentId()); agentID != "" {
-		result, err = s.jobService.ListJobsByAgent(ctx, agentID, offset, limit)
+	if useCursorPagination {
+		result, err = s.videoService.ListJobsByCursor(ctx, agentID, req.GetCursor(), pageSize)
+	} else if agentID != "" {
+		result, err = s.videoService.ListJobsByAgent(ctx, agentID, offset, limit)
 	} else {
-		result, err = s.jobService.ListJobs(ctx, offset, limit)
+		result, err = s.videoService.ListJobs(ctx, offset, limit)
 	}
 	if err != nil {
+		if errors.Is(err, video.ErrInvalidJobCursor) {
+			return nil, status.Error(codes.InvalidArgument, "Invalid job cursor")
+		}
 		return nil, status.Error(codes.Internal, "Failed to list jobs")
 	}
 
@@ -48,19 +50,24 @@ func (s *appServices) ListAdminJobs(ctx context.Context, req *appv1.ListAdminJob
 		jobs = append(jobs, buildAdminJob(job))
 	}
 
-	return &appv1.ListAdminJobsResponse{
-		Jobs:    jobs,
-		Total:   result.Total,
-		Offset:  int32(result.Offset),
-		Limit:   int32(result.Limit),
-		HasMore: result.HasMore,
-	}, nil
+	response := &appv1.ListAdminJobsResponse{
+		Jobs:     jobs,
+		Total:    result.Total,
+		Offset:   int32(result.Offset),
+		Limit:    int32(result.Limit),
+		HasMore:  result.HasMore,
+		PageSize: int32(result.PageSize),
+	}
+	if strings.TrimSpace(result.NextCursor) != "" {
+		response.NextCursor = &result.NextCursor
+	}
+	return response, nil
 }
 func (s *appServices) GetAdminJob(ctx context.Context, req *appv1.GetAdminJobRequest) (*appv1.GetAdminJobResponse, error) {
 	if _, err := s.requireAdmin(ctx); err != nil {
 		return nil, err
 	}
-	if s.jobService == nil {
+	if s.videoService == nil {
 		return nil, status.Error(codes.Unavailable, "Job service is unavailable")
 	}
 
@@ -68,7 +75,7 @@ func (s *appServices) GetAdminJob(ctx context.Context, req *appv1.GetAdminJobReq
 	if id == "" {
 		return nil, status.Error(codes.NotFound, "Job not found")
 	}
-	job, err := s.jobService.GetJob(ctx, id)
+	job, err := s.videoService.GetJob(ctx, id)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, status.Error(codes.NotFound, "Job not found")
@@ -88,7 +95,7 @@ func (s *appServices) CreateAdminJob(ctx context.Context, req *appv1.CreateAdmin
 	if _, err := s.requireAdmin(ctx); err != nil {
 		return nil, err
 	}
-	if s.jobService == nil {
+	if s.videoService == nil {
 		return nil, status.Error(codes.Unavailable, "Job service is unavailable")
 	}
 
@@ -113,7 +120,11 @@ func (s *appServices) CreateAdminJob(ctx context.Context, req *appv1.CreateAdmin
 		return nil, status.Error(codes.Internal, "Failed to create job payload")
 	}
 
-	job, err := s.jobService.CreateJob(ctx, strings.TrimSpace(req.GetUserId()), name, payload, int(req.GetPriority()), req.GetTimeLimit())
+	videoID := ""
+	if req.VideoId != nil {
+		videoID = strings.TrimSpace(req.GetVideoId())
+	}
+	job, err := s.videoService.CreateJob(ctx, strings.TrimSpace(req.GetUserId()), videoID, name, payload, int(req.GetPriority()), req.GetTimeLimit())
 	if err != nil {
 		return nil, status.Error(codes.Internal, "Failed to create job")
 	}
@@ -123,7 +134,7 @@ func (s *appServices) CancelAdminJob(ctx context.Context, req *appv1.CancelAdmin
 	if _, err := s.requireAdmin(ctx); err != nil {
 		return nil, err
 	}
-	if s.jobService == nil {
+	if s.videoService == nil {
 		return nil, status.Error(codes.Unavailable, "Job service is unavailable")
 	}
 
@@ -131,7 +142,7 @@ func (s *appServices) CancelAdminJob(ctx context.Context, req *appv1.CancelAdmin
 	if id == "" {
 		return nil, status.Error(codes.NotFound, "Job not found")
 	}
-	if err := s.jobService.CancelJob(ctx, id); err != nil {
+	if err := s.videoService.CancelJob(ctx, id); err != nil {
 		if strings.Contains(strings.ToLower(err.Error()), "not found") {
 			return nil, status.Error(codes.NotFound, "Job not found")
 		}
@@ -143,7 +154,7 @@ func (s *appServices) RetryAdminJob(ctx context.Context, req *appv1.RetryAdminJo
 	if _, err := s.requireAdmin(ctx); err != nil {
 		return nil, err
 	}
-	if s.jobService == nil {
+	if s.videoService == nil {
 		return nil, status.Error(codes.Unavailable, "Job service is unavailable")
 	}
 
@@ -151,7 +162,7 @@ func (s *appServices) RetryAdminJob(ctx context.Context, req *appv1.RetryAdminJo
 	if id == "" {
 		return nil, status.Error(codes.NotFound, "Job not found")
 	}
-	job, err := s.jobService.RetryJob(ctx, id)
+	job, err := s.videoService.RetryJob(ctx, id)
 	if err != nil {
 		if strings.Contains(strings.ToLower(err.Error()), "not found") {
 			return nil, status.Error(codes.NotFound, "Job not found")
diff --git a/internal/rpc/app/service_admin_jobs_agents_test.go b/internal/rpc/app/service_admin_jobs_agents_test.go
new file mode 100644
index 0000000..c7daf65
--- /dev/null
+++ b/internal/rpc/app/service_admin_jobs_agents_test.go
@@ -0,0 +1,195 @@
+package app
+
+import (
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"google.golang.org/grpc/codes"
+	"gorm.io/gorm"
+	"stream.api/internal/database/model"
+	appv1 "stream.api/internal/gen/proto/app/v1"
+	"stream.api/internal/video"
+	runtimeservices "stream.api/internal/video/runtime/services"
+)
+
+func TestListAdminJobsCursorPagination(t *testing.T) {
+	db := newTestDB(t)
+	ensureTestJobsTable(t, db)
+
+	services := newTestAppServices(t, db)
+	services.videoService = video.NewService(db, runtimeservices.NewJobService(nil, nil))
+	admin := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "admin@example.com", Role: ptrString("ADMIN")})
+
+	baseTime := time.Date(2026, 3, 22, 10, 0, 0, 0, time.UTC)
+	seedTestJob(t, db, model.Job{ID: "job-300", CreatedAt: ptrTime(baseTime.Add(time.Minute)), UpdatedAt: ptrTime(baseTime.Add(time.Minute))})
+	seedTestJob(t, db, model.Job{ID: "job-200", CreatedAt: ptrTime(baseTime), UpdatedAt: ptrTime(baseTime)})
+	seedTestJob(t, db, model.Job{ID: "job-100", CreatedAt: ptrTime(baseTime), UpdatedAt: ptrTime(baseTime)})
+
+	conn, cleanup := newTestGRPCServer(t, services)
+	defer cleanup()
+
+	client := newAdminClient(conn)
+	resp, err := client.ListAdminJobs(testActorOutgoingContext(admin.ID, "ADMIN"), &appv1.ListAdminJobsRequest{PageSize: 2})
+	if err != nil {
+		t.Fatalf("ListAdminJobs(first page) error = %v", err)
+	}
+	assertAdminJobIDs(t, resp.GetJobs(), []string{"job-300", "job-200"})
+	if !resp.GetHasMore() {
+		t.Fatal("ListAdminJobs(first page) has_more = false, want true")
+	}
+	if resp.GetNextCursor() == "" {
+		t.Fatal("ListAdminJobs(first page) next_cursor is empty")
+	}
+	if resp.GetPageSize() != 2 {
+		t.Fatalf("ListAdminJobs(first page) page_size = %d, want 2", resp.GetPageSize())
+	}
+
+	nextCursor := resp.GetNextCursor()
+	resp, err = client.ListAdminJobs(testActorOutgoingContext(admin.ID, "ADMIN"), &appv1.ListAdminJobsRequest{
+		Cursor:   ptrString(nextCursor),
+		PageSize: 2,
+	})
+	if err != nil {
+		t.Fatalf("ListAdminJobs(second page) error = %v", err)
+	}
+	assertAdminJobIDs(t, resp.GetJobs(), []string{"job-100"})
+	if resp.GetHasMore() {
+		t.Fatal("ListAdminJobs(second page) has_more = true, want false")
+	}
+	if resp.GetNextCursor() != "" {
+		t.Fatalf("ListAdminJobs(second page) next_cursor = %q, want empty", resp.GetNextCursor())
+	}
+}
+
+func TestListAdminJobsInvalidCursor(t *testing.T) {
+	db := newTestDB(t)
+	ensureTestJobsTable(t, db)
+
+	services := newTestAppServices(t, db)
+	services.videoService = video.NewService(db, runtimeservices.NewJobService(nil, nil))
+	admin := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "admin@example.com", Role: ptrString("ADMIN")})
+
+	conn, cleanup := newTestGRPCServer(t, services)
+	defer cleanup()
+
+	client := newAdminClient(conn)
+	_, err := client.ListAdminJobs(testActorOutgoingContext(admin.ID, "ADMIN"), &appv1.ListAdminJobsRequest{
+		Cursor:   ptrString("not-a-valid-cursor"),
+		PageSize: 1,
+	})
+	assertGRPCCode(t, err, codes.InvalidArgument)
+}
+
+func TestListAdminJobsCursorRejectsAgentMismatch(t *testing.T) {
+	db := newTestDB(t)
+	ensureTestJobsTable(t, db)
+
+	services := newTestAppServices(t, db)
+	services.videoService = video.NewService(db, runtimeservices.NewJobService(nil, nil))
+	admin := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "admin@example.com", Role: ptrString("ADMIN")})
+
+	baseTime := time.Date(2026, 3, 22, 11, 0, 0, 0, time.UTC)
+	agentOne := int64(101)
+	agentTwo := int64(202)
+	seedTestJob(t, db, model.Job{ID: "job-b", AgentID: &agentOne, CreatedAt: ptrTime(baseTime.Add(time.Minute)), UpdatedAt: ptrTime(baseTime.Add(time.Minute))})
+	seedTestJob(t, db, model.Job{ID: "job-a", AgentID: &agentOne, CreatedAt: ptrTime(baseTime), UpdatedAt: ptrTime(baseTime)})
+	seedTestJob(t, db, model.Job{ID: "job-x", AgentID: &agentTwo, CreatedAt: ptrTime(baseTime.Add(2 * time.Minute)), UpdatedAt: ptrTime(baseTime.Add(2 * time.Minute))})
+
+	conn, cleanup := newTestGRPCServer(t, services)
+	defer cleanup()
+
+	client := newAdminClient(conn)
+	resp, err := client.ListAdminJobs(testActorOutgoingContext(admin.ID, "ADMIN"), &appv1.ListAdminJobsRequest{
+		AgentId:  ptrString("101"),
+		PageSize: 1,
+	})
+	if err != nil {
+		t.Fatalf("ListAdminJobs(filtered first page) error = %v", err)
+	}
+	if resp.GetNextCursor() == "" {
+		t.Fatal("ListAdminJobs(filtered first page) next_cursor is empty")
+	}
+
+	_, err = client.ListAdminJobs(testActorOutgoingContext(admin.ID, "ADMIN"), &appv1.ListAdminJobsRequest{
+		AgentId:  ptrString("202"),
+		Cursor:   ptrString(resp.GetNextCursor()),
+		PageSize: 1,
+	})
+	assertGRPCCode(t, err, codes.InvalidArgument)
+}
+
+func ensureTestJobsTable(t *testing.T, db *gorm.DB) {
+	t.Helper()
+	stmt := `CREATE TABLE jobs (
+		id TEXT PRIMARY KEY,
+		status TEXT,
+		priority INTEGER,
+		input_url TEXT,
+		output_url TEXT,
+		total_duration INTEGER,
+		current_time INTEGER,
+		progress REAL,
+		agent_id INTEGER,
+		logs TEXT,
+		config TEXT,
+		cancelled BOOLEAN NOT NULL DEFAULT 0,
+		retry_count INTEGER NOT NULL DEFAULT 0,
+		max_retries INTEGER NOT NULL DEFAULT 3,
+		created_at DATETIME NOT NULL,
+		updated_at DATETIME,
+		version INTEGER NOT NULL DEFAULT 1
+	)`
+	if err := db.Exec(stmt).Error; err != nil {
+		t.Fatalf("create jobs table: %v", err)
+	}
+}
+
+func seedTestJob(t *testing.T, db *gorm.DB, job model.Job) model.Job {
+	t.Helper()
+	if job.Status == nil {
+		job.Status = ptrString("pending")
+	}
+	if job.Priority == nil {
+		job.Priority = ptrInt64(0)
+	}
+	if job.Config == nil {
+		job.Config = ptrString(`{"name":"` + job.ID + `"}`)
+	}
+	if job.Cancelled == nil {
+		job.Cancelled = ptrBool(false)
+	}
+	if job.RetryCount == nil {
+		job.RetryCount = ptrInt64(0)
+	}
+	if job.MaxRetries == nil {
+		job.MaxRetries = ptrInt64(3)
+	}
+	if job.CreatedAt == nil {
+		job.CreatedAt = ptrTime(time.Now().UTC())
+	}
+	if job.UpdatedAt == nil {
+		job.UpdatedAt = ptrTime(job.CreatedAt.UTC())
+	}
+	if job.Version == nil {
+		job.Version = ptrInt64(1)
+	}
+	if err := db.Create(&job).Error; err != nil {
+		t.Fatalf("create job %s: %v", job.ID, err)
+	}
+	return job
+}
+
+func assertAdminJobIDs(t *testing.T, jobs []*appv1.AdminJob, want []string) {
+	t.Helper()
+	if len(jobs) != len(want) {
+		t.Fatalf("job count = %d, want %d", len(jobs), len(want))
+	}
+	for i, job := range jobs {
+		if job.GetId() != want[i] {
+			t.Fatalf("job[%d].id = %q, want %q", i, job.GetId(), want[i])
+		}
+	}
+}
+
+func ptrTime(v time.Time) *time.Time { return &v }
diff --git a/internal/rpc/app/service_admin_users_videos.go b/internal/rpc/app/service_admin_users_videos.go
index 608642e..9df3fc2 100644
--- a/internal/rpc/app/service_admin_users_videos.go
+++ b/internal/rpc/app/service_admin_users_videos.go
@@ -13,6 +13,7 @@ import (
 	"gorm.io/gorm"
 	"stream.api/internal/database/model"
 	appv1 "stream.api/internal/gen/proto/app/v1"
+	"stream.api/internal/video"
 )
 
 func (s *appServices) GetAdminDashboard(ctx context.Context, _ *appv1.GetAdminDashboardRequest) (*appv1.GetAdminDashboardResponse, error) {
@@ -95,20 +96,19 @@ func (s *appServices) GetAdminUser(ctx context.Context, req *appv1.GetAdminUserR
 		return nil, status.Error(codes.Internal, "Failed to get user")
 	}
 
-	payload, err := s.buildAdminUser(ctx, &user)
-	if err != nil {
-		return nil, status.Error(codes.Internal, "Failed to get user")
-	}
-
-	var subscription model.PlanSubscription
-	var subscriptionPayload *appv1.PlanSubscription
-	if err := s.db.WithContext(ctx).Where("user_id = ?", id).Order("created_at DESC").First(&subscription).Error; err == nil {
-		subscriptionPayload = toProtoPlanSubscription(&subscription)
+	var subscription *model.PlanSubscription
+	var subscriptionRecord model.PlanSubscription
+	if err := s.db.WithContext(ctx).Where("user_id = ?", id).Order("created_at DESC").First(&subscriptionRecord).Error; err == nil {
+		subscription = &subscriptionRecord
 	} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, status.Error(codes.Internal, "Failed to get user")
 	}
 
-	return &appv1.GetAdminUserResponse{User: &appv1.AdminUserDetail{User: payload, Subscription: subscriptionPayload}}, nil
+	detail, err := s.buildAdminUserDetail(ctx, &user, subscription)
+	if err != nil {
+		return nil, status.Error(codes.Internal, "Failed to get user")
+	}
+	return &appv1.GetAdminUserResponse{User: detail}, nil
 }
 func (s *appServices) CreateAdminUser(ctx context.Context, req *appv1.CreateAdminUserRequest) (*appv1.CreateAdminUserResponse, error) {
 	if _, err := s.requireAdmin(ctx); err != nil {
@@ -243,6 +243,89 @@ func (s *appServices) UpdateAdminUser(ctx context.Context, req *appv1.UpdateAdmi
 	}
 	return &appv1.UpdateAdminUserResponse{User: payload}, nil
 }
+func (s *appServices) UpdateAdminUserReferralSettings(ctx context.Context, req *appv1.UpdateAdminUserReferralSettingsRequest) (*appv1.UpdateAdminUserReferralSettingsResponse, error) {
+	if _, err := s.requireAdmin(ctx); err != nil {
+		return nil, err
+	}
+
+	id := strings.TrimSpace(req.GetId())
+	if id == "" {
+		return nil, status.Error(codes.NotFound, "User not found")
+	}
+	if req.ClearReferrer != nil && req.GetClearReferrer() && req.RefUsername != nil && strings.TrimSpace(req.GetRefUsername()) != "" {
+		return nil, status.Error(codes.InvalidArgument, "Cannot set and clear referrer at the same time")
+	}
+	if req.ClearReferralRewardBps != nil && req.GetClearReferralRewardBps() && req.ReferralRewardBps != nil {
+		return nil, status.Error(codes.InvalidArgument, "Cannot set and clear referral reward override at the same time")
+	}
+	if req.ReferralRewardBps != nil {
+		bps := req.GetReferralRewardBps()
+		if bps < 0 || bps > 10000 {
+			return nil, status.Error(codes.InvalidArgument, "Referral reward bps must be between 0 and 10000")
+		}
+	}
+
+	var user model.User
+	if err := s.db.WithContext(ctx).Where("id = ?", id).First(&user).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, status.Error(codes.NotFound, "User not found")
+		}
+		return nil, status.Error(codes.Internal, "Failed to update referral settings")
+	}
+
+	updates := map[string]any{}
+	if req.RefUsername != nil || (req.ClearReferrer != nil && req.GetClearReferrer()) {
+		if referralRewardProcessed(&user) {
+			return nil, status.Error(codes.InvalidArgument, "Cannot change referrer after reward has been granted")
+		}
+		if req.ClearReferrer != nil && req.GetClearReferrer() {
+			updates["referred_by_user_id"] = nil
+		} else if req.RefUsername != nil {
+			referrer, err := s.loadReferralUserByUsernameStrict(ctx, req.GetRefUsername())
+			if err != nil {
+				return nil, err
+			}
+			if referrer.ID == user.ID {
+				return nil, status.Error(codes.InvalidArgument, "User cannot refer themselves")
+			}
+			updates["referred_by_user_id"] = referrer.ID
+		}
+	}
+	if req.ReferralEligible != nil {
+		updates["referral_eligible"] = req.GetReferralEligible()
+	}
+	if req.ClearReferralRewardBps != nil && req.GetClearReferralRewardBps() {
+		updates["referral_reward_bps"] = nil
+	} else if req.ReferralRewardBps != nil {
+		updates["referral_reward_bps"] = req.GetReferralRewardBps()
+	}
+
+	if len(updates) > 0 {
+		result := s.db.WithContext(ctx).Model(&model.User{}).Where("id = ?", id).Updates(updates)
+		if result.Error != nil {
+			return nil, status.Error(codes.Internal, "Failed to update referral settings")
+		}
+		if result.RowsAffected == 0 {
+			return nil, status.Error(codes.NotFound, "User not found")
+		}
+	}
+
+	if err := s.db.WithContext(ctx).Where("id = ?", id).First(&user).Error; err != nil {
+		return nil, status.Error(codes.Internal, "Failed to update referral settings")
+	}
+	var subscription *model.PlanSubscription
+	var subscriptionRecord model.PlanSubscription
+	if err := s.db.WithContext(ctx).Where("user_id = ?", id).Order("created_at DESC").First(&subscriptionRecord).Error; err == nil {
+		subscription = &subscriptionRecord
+	} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, status.Error(codes.Internal, "Failed to update referral settings")
+	}
+	payload, err := s.buildAdminUserDetail(ctx, &user, subscription)
+	if err != nil {
+		return nil, status.Error(codes.Internal, "Failed to update referral settings")
+	}
+	return &appv1.UpdateAdminUserReferralSettingsResponse{User: payload}, nil
+}
 func (s *appServices) UpdateAdminUserRole(ctx context.Context, req *appv1.UpdateAdminUserRoleRequest) (*appv1.UpdateAdminUserRoleResponse, error) {
 	adminResult, err := s.requireAdmin(ctx)
 	if err != nil {
@@ -299,7 +382,6 @@ func (s *appServices) DeleteAdminUser(ctx context.Context, req *appv1.DeleteAdmi
 			model interface{}
 			where string
 		}{
-			{&model.VideoAdConfig{}, "user_id = ?"},
 			{&model.AdTemplate{}, "user_id = ?"},
 			{&model.Notification{}, "user_id = ?"},
 			{&model.Domain{}, "user_id = ?"},
@@ -395,6 +477,9 @@ func (s *appServices) CreateAdminVideo(ctx context.Context, req *appv1.CreateAdm
 	if _, err := s.requireAdmin(ctx); err != nil {
 		return nil, err
 	}
+	if s.videoService == nil {
+		return nil, status.Error(codes.Unavailable, "Job service is unavailable")
+	}
 
 	userID := strings.TrimSpace(req.GetUserId())
 	title := strings.TrimSpace(req.GetTitle())
@@ -406,49 +491,30 @@ func (s *appServices) CreateAdminVideo(ctx context.Context, req *appv1.CreateAdm
 		return nil, status.Error(codes.InvalidArgument, "Size must be greater than or equal to 0")
 	}
 
-	var user model.User
-	if err := s.db.WithContext(ctx).Where("id = ?", userID).First(&user).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, status.Error(codes.InvalidArgument, "User not found")
-		}
-		return nil, status.Error(codes.Internal, "Failed to create video")
-	}
-
-	statusValue := normalizeVideoStatusValue(req.GetStatus())
-	processingStatus := strings.ToUpper(statusValue)
-	storageType := detectStorageType(videoURL)
-	video := &model.Video{
-		ID:               uuid.New().String(),
-		UserID:           user.ID,
-		Name:             title,
-		Title:            title,
-		Description:      nullableTrimmedString(req.Description),
-		URL:              videoURL,
-		Size:             req.GetSize(),
-		Duration:         req.GetDuration(),
-		Format:           strings.TrimSpace(req.GetFormat()),
-		Status:           model.StringPtr(statusValue),
-		ProcessingStatus: model.StringPtr(processingStatus),
-		StorageType:      model.StringPtr(storageType),
-	}
-
-	err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Create(video).Error; err != nil {
-			return err
-		}
-		if err := tx.Model(&model.User{}).Where("id = ?", user.ID).UpdateColumn("storage_used", gorm.Expr("storage_used + ?", video.Size)).Error; err != nil {
-			return err
-		}
-		return s.saveAdminVideoAdConfig(ctx, tx, video.ID, user.ID, nullableTrimmedString(req.AdTemplateId))
+	created, err := s.videoService.CreateVideo(ctx, video.CreateVideoInput{
+		UserID:       userID,
+		Title:        title,
+		Description:  req.Description,
+		URL:          videoURL,
+		Size:         req.GetSize(),
+		Duration:     req.GetDuration(),
+		Format:       strings.TrimSpace(req.GetFormat()),
+		AdTemplateID: nullableTrimmedString(req.AdTemplateId),
 	})
 	if err != nil {
-		if strings.Contains(err.Error(), "Ad template not found") {
+		switch {
+		case errors.Is(err, video.ErrUserNotFound):
+			return nil, status.Error(codes.InvalidArgument, "User not found")
+		case errors.Is(err, video.ErrAdTemplateNotFound):
 			return nil, status.Error(codes.InvalidArgument, "Ad template not found")
+		case errors.Is(err, video.ErrJobServiceUnavailable):
+			return nil, status.Error(codes.Unavailable, "Job service is unavailable")
+		default:
+			return nil, status.Error(codes.Internal, "Failed to create video")
 		}
-		return nil, status.Error(codes.Internal, "Failed to create video")
 	}
 
-	payload, err := s.buildAdminVideo(ctx, video)
+	payload, err := s.buildAdminVideo(ctx, created.Video)
 	if err != nil {
 		return nil, status.Error(codes.Internal, "Failed to create video")
 	}
@@ -524,12 +590,7 @@ func (s *appServices) UpdateAdminVideo(ctx context.Context, req *appv1.UpdateAdm
 				return err
 			}
 		}
-		if oldUserID != user.ID {
-			if err := tx.Model(&model.VideoAdConfig{}).Where("video_id = ?", video.ID).Update("user_id", user.ID).Error; err != nil {
-				return err
-			}
-		}
-		return s.saveAdminVideoAdConfig(ctx, tx, video.ID, user.ID, nullableTrimmedString(req.AdTemplateId))
+		return s.saveAdminVideoAdConfig(ctx, tx, &video, user.ID, nullableTrimmedString(req.AdTemplateId))
 	})
 	if err != nil {
 		if strings.Contains(err.Error(), "Ad template not found") {
@@ -563,9 +624,6 @@ func (s *appServices) DeleteAdminVideo(ctx context.Context, req *appv1.DeleteAdm
 	}
 
 	err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Where("video_id = ?", video.ID).Delete(&model.VideoAdConfig{}).Error; err != nil {
-			return err
-		}
 		if err := tx.Where("id = ?", video.ID).Delete(&model.Video{}).Error; err != nil {
 			return err
 		}
diff --git a/internal/rpc/app/service_auth.go b/internal/rpc/app/service_auth.go
index 1bd9cf8..95442f3 100644
--- a/internal/rpc/app/service_auth.go
+++ b/internal/rpc/app/service_auth.go
@@ -14,7 +14,6 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"gorm.io/gorm"
-	authapi "stream.api/internal/api/auth"
 	"stream.api/internal/database/model"
 	"stream.api/internal/database/query"
 	appv1 "stream.api/internal/gen/proto/app/v1"
@@ -43,7 +42,7 @@ func (s *appServices) Login(ctx context.Context, req *appv1.LoginRequest) (*appv
 		return nil, err
 	}
 
-	payload, err := authapi.BuildUserPayload(ctx, s.db, user)
+	payload, err := buildUserPayload(ctx, s.db, user)
 	if err != nil {
 		return nil, status.Error(codes.Internal, "Failed to build user payload")
 	}
@@ -53,6 +52,7 @@ func (s *appServices) Register(ctx context.Context, req *appv1.RegisterRequest)
 	email := strings.TrimSpace(req.GetEmail())
 	username := strings.TrimSpace(req.GetUsername())
 	password := req.GetPassword()
+	refUsername := strings.TrimSpace(req.GetRefUsername())
 	if email == "" || username == "" || password == "" {
 		return nil, status.Error(codes.InvalidArgument, "Username, email and password are required")
 	}
@@ -72,21 +72,29 @@ func (s *appServices) Register(ctx context.Context, req *appv1.RegisterRequest)
 		return nil, status.Error(codes.Internal, "Failed to register")
 	}
 
+	referrerID, err := s.resolveSignupReferrerID(ctx, refUsername, username)
+	if err != nil {
+		s.logger.Error("Failed to resolve signup referrer", "error", err)
+		return nil, status.Error(codes.Internal, "Failed to register")
+	}
+
 	role := "USER"
 	passwordHash := string(hashedPassword)
 	newUser := &model.User{
-		ID:       uuid.New().String(),
-		Email:    email,
-		Password: &passwordHash,
-		Username: &username,
-		Role:     &role,
+		ID:               uuid.New().String(),
+		Email:            email,
+		Password:         &passwordHash,
+		Username:         &username,
+		Role:             &role,
+		ReferredByUserID: referrerID,
+		ReferralEligible: model.BoolPtr(true),
 	}
 	if err := u.WithContext(ctx).Create(newUser); err != nil {
 		s.logger.Error("Failed to create user", "error", err)
 		return nil, status.Error(codes.Internal, "Failed to register")
 	}
 
-	payload, err := authapi.BuildUserPayload(ctx, s.db, newUser)
+	payload, err := buildUserPayload(ctx, s.db, newUser)
 	if err != nil {
 		return nil, status.Error(codes.Internal, "Failed to build user payload")
 	}
@@ -216,7 +224,7 @@ func (s *appServices) CompleteGoogleLogin(ctx context.Context, req *appv1.Comple
 	}
 
 	client := s.googleOauth.Client(ctx, tokenResp)
-	resp, err := client.Get("https://www.googleapis.com/oauth2/v2/userinfo")
+	resp, err := client.Get(s.googleUserInfoURL)
 	if err != nil {
 		s.logger.Error("Failed to fetch Google user info", "error", err)
 		return nil, status.Error(codes.Unauthenticated, "userinfo_failed")
@@ -240,6 +248,7 @@ func (s *appServices) CompleteGoogleLogin(ctx context.Context, req *appv1.Comple
 	}
 
 	email := strings.TrimSpace(strings.ToLower(googleUser.Email))
+	refUsername := strings.TrimSpace(req.GetRefUsername())
 	if email == "" {
 		return nil, status.Error(codes.InvalidArgument, "missing_email")
 	}
@@ -251,14 +260,21 @@ func (s *appServices) CompleteGoogleLogin(ctx context.Context, req *appv1.Comple
 			s.logger.Error("Failed to load Google user", "error", err)
 			return nil, status.Error(codes.Internal, "load_user_failed")
 		}
+		referrerID, resolveErr := s.resolveSignupReferrerID(ctx, refUsername, googleUser.Name)
+		if resolveErr != nil {
+			s.logger.Error("Failed to resolve Google signup referrer", "error", resolveErr)
+			return nil, status.Error(codes.Internal, "create_user_failed")
+		}
 		role := "USER"
 		user = &model.User{
-			ID:       uuid.New().String(),
-			Email:    email,
-			Username: stringPointerOrNil(googleUser.Name),
-			GoogleID: stringPointerOrNil(googleUser.ID),
-			Avatar:   stringPointerOrNil(googleUser.Picture),
-			Role:     &role,
+			ID:               uuid.New().String(),
+			Email:            email,
+			Username:         stringPointerOrNil(googleUser.Name),
+			GoogleID:         stringPointerOrNil(googleUser.ID),
+			Avatar:           stringPointerOrNil(googleUser.Picture),
+			Role:             &role,
+			ReferredByUserID: referrerID,
+			ReferralEligible: model.BoolPtr(true),
 		}
 		if err := u.WithContext(ctx).Create(user); err != nil {
 			s.logger.Error("Failed to create Google user", "error", err)
@@ -292,7 +308,7 @@ func (s *appServices) CompleteGoogleLogin(ctx context.Context, req *appv1.Comple
 		return nil, status.Error(codes.Internal, "session_failed")
 	}
 
-	payload, err := authapi.BuildUserPayload(ctx, s.db, user)
+	payload, err := buildUserPayload(ctx, s.db, user)
 	if err != nil {
 		return nil, status.Error(codes.Internal, "Failed to build user payload")
 	}
diff --git a/internal/rpc/app/service_core.go b/internal/rpc/app/service_core.go
index 7002500..d98ee81 100644
--- a/internal/rpc/app/service_core.go
+++ b/internal/rpc/app/service_core.go
@@ -7,10 +7,10 @@ import (
 	"golang.org/x/oauth2/google"
 	"gorm.io/gorm"
 	"stream.api/internal/config"
+	"stream.api/internal/database/model"
 	appv1 "stream.api/internal/gen/proto/app/v1"
 	"stream.api/internal/middleware"
-	videogrpc "stream.api/internal/video/runtime/grpc"
-	"stream.api/internal/video/runtime/services"
+	"stream.api/internal/video"
 	"stream.api/pkg/cache"
 	"stream.api/pkg/logger"
 	"stream.api/pkg/storage"
@@ -18,14 +18,22 @@ import (
 )
 
 const adTemplateUpgradeRequiredMessage = "Upgrade required to manage Ads & VAST"
+const defaultGoogleUserInfoURL = "https://www.googleapis.com/oauth2/v2/userinfo"
+
+const (
+	playerConfigFreePlanLimitMessage          = "Free plan supports only 1 player config"
+	playerConfigFreePlanReconciliationMessage = "Delete extra player configs to continue managing player configs on the free plan"
+)
 
 const (
 	walletTransactionTypeTopup             = "topup"
 	walletTransactionTypeSubscriptionDebit = "subscription_debit"
+	walletTransactionTypeReferralReward    = "referral_reward"
 	paymentMethodWallet                    = "wallet"
 	paymentMethodTopup                     = "topup"
 	paymentKindSubscription                = "subscription"
 	paymentKindWalletTopup                 = "wallet_topup"
+	defaultReferralRewardBps               = int32(500)
 )
 
 var allowedTermMonths = map[int32]struct{}{
@@ -43,6 +51,7 @@ type Services struct {
 	NotificationsServiceServer
 	DomainsServiceServer
 	AdTemplatesServiceServer
+	PlayerConfigsServiceServer
 	PlansServiceServer
 	PaymentsServiceServer
 	VideosServiceServer
@@ -57,6 +66,7 @@ type appServices struct {
 	appv1.UnimplementedNotificationsServiceServer
 	appv1.UnimplementedDomainsServiceServer
 	appv1.UnimplementedAdTemplatesServiceServer
+	appv1.UnimplementedPlayerConfigsServiceServer
 	appv1.UnimplementedPlansServiceServer
 	appv1.UnimplementedPaymentsServiceServer
 	appv1.UnimplementedVideosServiceServer
@@ -68,23 +78,12 @@ type appServices struct {
 	tokenProvider   token.Provider
 	cache           cache.Cache
 	storageProvider storage.Provider
-	jobService      *services.JobService
-	agentRuntime    *videogrpc.Server
-	googleOauth     *oauth2.Config
-	googleStateTTL  time.Duration
-}
-
-type paymentRow struct {
-	ID            string     `gorm:"column:id"`
-	Amount        float64    `gorm:"column:amount"`
-	Currency      *string    `gorm:"column:currency"`
-	Status        *string    `gorm:"column:status"`
-	PlanID        *string    `gorm:"column:plan_id"`
-	PlanName      *string    `gorm:"column:plan_name"`
-	TermMonths    *int32     `gorm:"column:term_months"`
-	PaymentMethod *string    `gorm:"column:payment_method"`
-	ExpiresAt     *time.Time `gorm:"column:expires_at"`
-	CreatedAt     *time.Time `gorm:"column:created_at"`
+	videoService    *video.Service
+	agentRuntime      video.AgentRuntime
+	googleOauth       *oauth2.Config
+	googleStateTTL    time.Duration
+	googleUserInfoURL string
+	frontendBaseURL   string
 }
 
 type paymentInvoiceDetails struct {
@@ -96,13 +95,33 @@ type paymentInvoiceDetails struct {
 	TopupAmount   float64
 }
 
-type apiErrorBody struct {
-	Code    int         `json:"code"`
-	Message string      `json:"message"`
-	Data    interface{} `json:"data,omitempty"`
+type paymentExecutionInput struct {
+	UserID        string
+	Plan          *model.Plan
+	TermMonths    int32
+	PaymentMethod string
+	TopupAmount   *float64
 }
 
-func NewServices(c cache.Cache, t token.Provider, db *gorm.DB, l logger.Logger, cfg *config.Config, jobService *services.JobService, agentRuntime *videogrpc.Server) *Services {
+type paymentExecutionResult struct {
+	Payment       *model.Payment
+	Subscription  *model.PlanSubscription
+	WalletBalance float64
+	InvoiceID     string
+}
+
+type referralRewardResult struct {
+	Granted bool
+	Amount  float64
+}
+
+type apiErrorBody struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Data    any    `json:"data,omitempty"`
+}
+
+func NewServices(c cache.Cache, t token.Provider, db *gorm.DB, l logger.Logger, cfg *config.Config, videoService *video.Service, agentRuntime video.AgentRuntime) *Services {
 	var storageProvider storage.Provider
 	if cfg != nil {
 		provider, err := storage.NewS3Provider(cfg)
@@ -131,17 +150,24 @@ func NewServices(c cache.Cache, t token.Provider, db *gorm.DB, l logger.Logger,
 		}
 	}
 
+	frontendBaseURL := ""
+	if cfg != nil {
+		frontendBaseURL = cfg.Frontend.BaseURL
+	}
+
 	service := &appServices{
-		db:              db,
-		logger:          l,
-		authenticator:   middleware.NewAuthenticator(db, l, cfg.Internal.Marker),
-		tokenProvider:   t,
-		cache:           c,
-		storageProvider: storageProvider,
-		jobService:      jobService,
-		agentRuntime:    agentRuntime,
-		googleOauth:     googleOauth,
-		googleStateTTL:  googleStateTTL,
+		db:                db,
+		logger:            l,
+		authenticator:     middleware.NewAuthenticator(db, l, cfg.Internal.Marker),
+		tokenProvider:     t,
+		cache:             c,
+		storageProvider:   storageProvider,
+		videoService:      videoService,
+		agentRuntime:      agentRuntime,
+		googleOauth:       googleOauth,
+		googleStateTTL:    googleStateTTL,
+		googleUserInfoURL: defaultGoogleUserInfoURL,
+		frontendBaseURL:   frontendBaseURL,
 	}
 	return &Services{
 		AuthServiceServer:          service,
@@ -151,6 +177,7 @@ func NewServices(c cache.Cache, t token.Provider, db *gorm.DB, l logger.Logger,
 		NotificationsServiceServer: service,
 		DomainsServiceServer:       service,
 		AdTemplatesServiceServer:   service,
+		PlayerConfigsServiceServer: service,
 		PlansServiceServer:         service,
 		PaymentsServiceServer:      service,
 		VideosServiceServer:        service,
@@ -186,6 +213,10 @@ type AdTemplatesServiceServer interface {
 	appv1.AdTemplatesServiceServer
 }
 
+type PlayerConfigsServiceServer interface {
+	appv1.PlayerConfigsServiceServer
+}
+
 type PlansServiceServer interface {
 	appv1.PlansServiceServer
 }
diff --git a/internal/rpc/app/service_helpers.go b/internal/rpc/app/service_helpers.go
index 0962275..90667f8 100644
--- a/internal/rpc/app/service_helpers.go
+++ b/internal/rpc/app/service_helpers.go
@@ -20,8 +20,6 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
-	authapi "stream.api/internal/api/auth"
-	paymentapi "stream.api/internal/api/payment"
 	"stream.api/internal/database/model"
 	appv1 "stream.api/internal/gen/proto/app/v1"
 	"stream.api/internal/middleware"
@@ -78,6 +76,7 @@ func buildAdminJob(job *domain.Job) *appv1.AdminJob {
 		MaxRetries:    int32(job.MaxRetries),
 		CreatedAt:     timestamppb.New(job.CreatedAt),
 		UpdatedAt:     timestamppb.New(job.UpdatedAt),
+		VideoId:       stringPointerOrNil(job.VideoID),
 	}
 }
 func buildAdminAgent(agent *services.AgentWithStats) *appv1.AdminAgent {
@@ -131,43 +130,150 @@ func (s *appServices) ensurePlanExists(ctx context.Context, planID *string) erro
 	}
 	return nil
 }
-func (s *appServices) saveAdminVideoAdConfig(ctx context.Context, tx *gorm.DB, videoID, userID string, adTemplateID *string) error {
-	if adTemplateID == nil {
+func referralUserEligible(user *model.User) bool {
+	if user == nil || user.ReferralEligible == nil {
+		return true
+	}
+	return *user.ReferralEligible
+}
+
+func effectiveReferralRewardBps(value *int32) int32 {
+	if value == nil {
+		return defaultReferralRewardBps
+	}
+	if *value < 0 {
+		return 0
+	}
+	if *value > 10000 {
+		return 10000
+	}
+	return *value
+}
+
+func referralRewardBpsToPercent(value int32) float64 {
+	return float64(value) / 100
+}
+
+func referralRewardProcessed(user *model.User) bool {
+	if user == nil {
+		return false
+	}
+	if user.ReferralRewardGrantedAt != nil {
+		return true
+	}
+	if user.ReferralRewardPaymentID != nil && strings.TrimSpace(*user.ReferralRewardPaymentID) != "" {
+		return true
+	}
+	return false
+}
+
+func sameTrimmedStringFold(left *string, right string) bool {
+	if left == nil {
+		return false
+	}
+	return strings.EqualFold(strings.TrimSpace(*left), strings.TrimSpace(right))
+}
+
+func (s *appServices) buildReferralShareLink(username *string) *string {
+	trimmed := strings.TrimSpace(stringValue(username))
+	if trimmed == "" {
 		return nil
 	}
+	path := "/ref/" + url.PathEscape(trimmed)
+	base := strings.TrimRight(strings.TrimSpace(s.frontendBaseURL), "/")
+	if base == "" {
+		return &path
+	}
+	link := base + path
+	return &link
+}
+
+func (s *appServices) loadReferralUsersByUsername(ctx context.Context, username string) ([]model.User, error) {
+	trimmed := strings.TrimSpace(username)
+	if trimmed == "" {
+		return nil, nil
+	}
+	var users []model.User
+	if err := s.db.WithContext(ctx).
+		Where("LOWER(username) = LOWER(?)", trimmed).
+		Order("created_at ASC, id ASC").
+		Limit(2).
+		Find(&users).Error; err != nil {
+		return nil, err
+	}
+	return users, nil
+}
+
+func (s *appServices) resolveReferralUserByUsername(ctx context.Context, username string) (*model.User, error) {
+	users, err := s.loadReferralUsersByUsername(ctx, username)
+	if err != nil {
+		return nil, err
+	}
+	if len(users) != 1 {
+		return nil, nil
+	}
+	return &users[0], nil
+}
+
+func (s *appServices) loadReferralUserByUsernameStrict(ctx context.Context, username string) (*model.User, error) {
+	trimmed := strings.TrimSpace(username)
+	if trimmed == "" {
+		return nil, status.Error(codes.InvalidArgument, "Referral username is required")
+	}
+	users, err := s.loadReferralUsersByUsername(ctx, trimmed)
+	if err != nil {
+		return nil, status.Error(codes.Internal, "Failed to resolve referral user")
+	}
+	if len(users) == 0 {
+		return nil, status.Error(codes.InvalidArgument, "Referral user not found")
+	}
+	if len(users) > 1 {
+		return nil, status.Error(codes.InvalidArgument, "Referral username is ambiguous")
+	}
+	return &users[0], nil
+}
+
+func (s *appServices) resolveSignupReferrerID(ctx context.Context, refUsername string, newUsername string) (*string, error) {
+	trimmedRefUsername := strings.TrimSpace(refUsername)
+	if trimmedRefUsername == "" || strings.EqualFold(trimmedRefUsername, strings.TrimSpace(newUsername)) {
+		return nil, nil
+	}
+	referrer, err := s.resolveReferralUserByUsername(ctx, trimmedRefUsername)
+	if err != nil {
+		return nil, err
+	}
+	if referrer == nil {
+		return nil, nil
+	}
+	return &referrer.ID, nil
+}
+func (s *appServices) saveAdminVideoAdConfig(ctx context.Context, tx *gorm.DB, video *model.Video, userID string, adTemplateID *string) error {
+	if video == nil || adTemplateID == nil {
+		return nil
+	}
+
 	trimmed := strings.TrimSpace(*adTemplateID)
 	if trimmed == "" {
-		return tx.Where("video_id = ? AND user_id = ?", videoID, userID).Delete(&model.VideoAdConfig{}).Error
+		if err := tx.WithContext(ctx).Model(&model.Video{}).Where("id = ?", video.ID).Update("ad_id", nil).Error; err != nil {
+			return err
+		}
+		video.AdID = nil
+		return nil
 	}
 
 	var template model.AdTemplate
-	if err := tx.WithContext(ctx).Where("id = ? AND user_id = ?", trimmed, userID).First(&template).Error; err != nil {
+	if err := tx.WithContext(ctx).Select("id").Where("id = ? AND user_id = ?", trimmed, userID).First(&template).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return errors.New("Ad template not found")
 		}
 		return err
 	}
 
-	var existing model.VideoAdConfig
-	if err := tx.WithContext(ctx).Where("video_id = ? AND user_id = ?", videoID, userID).First(&existing).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return tx.Create(&model.VideoAdConfig{
-				VideoID:      videoID,
-				UserID:       userID,
-				AdTemplateID: template.ID,
-				VastTagURL:   template.VastTagURL,
-				AdFormat:     template.AdFormat,
-				Duration:     template.Duration,
-			}).Error
-		}
+	if err := tx.WithContext(ctx).Model(&model.Video{}).Where("id = ?", video.ID).Update("ad_id", template.ID).Error; err != nil {
 		return err
 	}
-
-	existing.AdTemplateID = template.ID
-	existing.VastTagURL = template.VastTagURL
-	existing.AdFormat = template.AdFormat
-	existing.Duration = template.Duration
-	return tx.Save(&existing).Error
+	video.AdID = &template.ID
+	return nil
 }
 func (s *appServices) buildAdminUser(ctx context.Context, user *model.User) (*appv1.AdminUser, error) {
 	if user == nil {
@@ -187,8 +293,8 @@ func (s *appServices) buildAdminUser(ctx context.Context, user *model.User) (*ap
 		WalletBalance: 0,
 	}
 
-	var videoCount int64
-	if err := s.db.WithContext(ctx).Model(&model.Video{}).Where("user_id = ?", user.ID).Count(&videoCount).Error; err != nil {
+	videoCount, err := s.loadAdminUserVideoCount(ctx, user.ID)
+	if err != nil {
 		return nil, err
 	}
 	payload.VideoCount = videoCount
@@ -199,17 +305,65 @@ func (s *appServices) buildAdminUser(ctx context.Context, user *model.User) (*ap
 	}
 	payload.WalletBalance = walletBalance
 
-	if user.PlanID != nil && strings.TrimSpace(*user.PlanID) != "" {
-		var plan model.Plan
-		if err := s.db.WithContext(ctx).Select("id, name").Where("id = ?", *user.PlanID).First(&plan).Error; err == nil {
-			payload.PlanName = nullableTrimmedString(&plan.Name)
-		} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, err
-		}
+	planName, err := s.loadAdminPlanName(ctx, user.PlanID)
+	if err != nil {
+		return nil, err
 	}
+	payload.PlanName = planName
 
 	return payload, nil
 }
+
+func (s *appServices) buildAdminUserDetail(ctx context.Context, user *model.User, subscription *model.PlanSubscription) (*appv1.AdminUserDetail, error) {
+	payload, err := s.buildAdminUser(ctx, user)
+	if err != nil {
+		return nil, err
+	}
+	referral, err := s.buildAdminUserReferralInfo(ctx, user)
+	if err != nil {
+		return nil, err
+	}
+	return &appv1.AdminUserDetail{
+		User:         payload,
+		Subscription: toProtoPlanSubscription(subscription),
+		Referral:     referral,
+	}, nil
+}
+
+func (s *appServices) buildAdminUserReferralInfo(ctx context.Context, user *model.User) (*appv1.AdminUserReferralInfo, error) {
+	if user == nil {
+		return nil, nil
+	}
+
+	var referrer *appv1.ReferralUserSummary
+	if user.ReferredByUserID != nil && strings.TrimSpace(*user.ReferredByUserID) != "" {
+		loadedReferrer, err := s.loadReferralUserSummary(ctx, strings.TrimSpace(*user.ReferredByUserID))
+		if err != nil {
+			return nil, err
+		}
+		referrer = loadedReferrer
+	}
+
+	bps := effectiveReferralRewardBps(user.ReferralRewardBps)
+	referral := &appv1.AdminUserReferralInfo{
+		Referrer:             referrer,
+		ReferralEligible:     referralUserEligible(user),
+		EffectiveRewardPercent: referralRewardBpsToPercent(bps),
+		RewardOverridePercent: func() *float64 {
+			if user.ReferralRewardBps == nil {
+				return nil
+			}
+			value := referralRewardBpsToPercent(*user.ReferralRewardBps)
+			return &value
+		}(),
+		ShareLink:        s.buildReferralShareLink(user.Username),
+		RewardGranted:    referralRewardProcessed(user),
+		RewardGrantedAt:  timeToProto(user.ReferralRewardGrantedAt),
+		RewardPaymentId:  nullableTrimmedString(user.ReferralRewardPaymentID),
+		RewardAmount:     user.ReferralRewardAmount,
+	}
+	return referral, nil
+}
 func (s *appServices) buildAdminVideo(ctx context.Context, video *model.Video) (*appv1.AdminVideo, error) {
 	if video == nil {
 		return nil, nil
@@ -219,40 +373,39 @@ func (s *appServices) buildAdminVideo(ctx context.Context, video *model.Video) (
 	if statusValue == "" {
 		statusValue = "ready"
 	}
+	jobID, err := s.loadLatestVideoJobID(ctx, video.ID)
+	if err != nil {
+		return nil, err
+	}
 
 	payload := &appv1.AdminVideo{
-		Id:          video.ID,
-		UserId:      video.UserID,
-		Title:       video.Title,
-		Description: nullableTrimmedString(video.Description),
-		Url:         video.URL,
-		Status:      strings.ToLower(statusValue),
-		Size:        video.Size,
-		Duration:    video.Duration,
-		Format:      video.Format,
-		CreatedAt:   timeToProto(video.CreatedAt),
-		UpdatedAt:   timestamppb.New(video.UpdatedAt.UTC()),
+		Id:               video.ID,
+		UserId:           video.UserID,
+		Title:            video.Title,
+		Description:      nullableTrimmedString(video.Description),
+		Url:              video.URL,
+		Status:           strings.ToLower(statusValue),
+		Size:             video.Size,
+		Duration:         video.Duration,
+		Format:           video.Format,
+		CreatedAt:        timeToProto(video.CreatedAt),
+		UpdatedAt:        timestamppb.New(video.UpdatedAt.UTC()),
+		ProcessingStatus: nullableTrimmedString(video.ProcessingStatus),
+		JobId:            jobID,
 	}
 
-	var user model.User
-	if err := s.db.WithContext(ctx).Select("id, email").Where("id = ?", video.UserID).First(&user).Error; err == nil {
-		payload.OwnerEmail = nullableTrimmedString(&user.Email)
-	} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+	ownerEmail, err := s.loadAdminUserEmail(ctx, video.UserID)
+	if err != nil {
 		return nil, err
 	}
+	payload.OwnerEmail = ownerEmail
 
-	var adConfig model.VideoAdConfig
-	if err := s.db.WithContext(ctx).Where("video_id = ?", video.ID).First(&adConfig).Error; err == nil {
-		payload.AdTemplateId = nullableTrimmedString(&adConfig.AdTemplateID)
-		var template model.AdTemplate
-		if err := s.db.WithContext(ctx).Select("id, name").Where("id = ?", adConfig.AdTemplateID).First(&template).Error; err == nil {
-			payload.AdTemplateName = nullableTrimmedString(&template.Name)
-		} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, err
-		}
-	} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+	adTemplateID, adTemplateName, err := s.loadAdminVideoAdTemplateDetails(ctx, video)
+	if err != nil {
 		return nil, err
 	}
+	payload.AdTemplateId = adTemplateID
+	payload.AdTemplateName = adTemplateName
 
 	return payload, nil
 }
@@ -261,17 +414,12 @@ func (s *appServices) buildAdminPayment(ctx context.Context, payment *model.Paym
 		return nil, nil
 	}
 
-	currency := normalizeCurrency(payment.Currency)
-	if strings.TrimSpace(currency) == "" {
-		currency = "USD"
-	}
-
 	payload := &appv1.AdminPayment{
 		Id:            payment.ID,
 		UserId:        payment.UserID,
 		PlanId:        nullableTrimmedString(payment.PlanID),
 		Amount:        payment.Amount,
-		Currency:      currency,
+		Currency:      normalizeCurrency(payment.Currency),
 		Status:        normalizePaymentStatus(payment.Status),
 		Provider:      strings.ToUpper(stringValue(payment.Provider)),
 		TransactionId: nullableTrimmedString(payment.TransactionID),
@@ -280,37 +428,143 @@ func (s *appServices) buildAdminPayment(ctx context.Context, payment *model.Paym
 		UpdatedAt:     timestamppb.New(payment.UpdatedAt.UTC()),
 	}
 
-	var user model.User
-	if err := s.db.WithContext(ctx).Select("id, email").Where("id = ?", payment.UserID).First(&user).Error; err == nil {
-		payload.UserEmail = nullableTrimmedString(&user.Email)
-	} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+	userEmail, err := s.loadAdminUserEmail(ctx, payment.UserID)
+	if err != nil {
 		return nil, err
 	}
+	payload.UserEmail = userEmail
 
-	if payment.PlanID != nil && strings.TrimSpace(*payment.PlanID) != "" {
-		var plan model.Plan
-		if err := s.db.WithContext(ctx).Select("id, name").Where("id = ?", *payment.PlanID).First(&plan).Error; err == nil {
-			payload.PlanName = nullableTrimmedString(&plan.Name)
-		} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, err
-		}
-	}
-
-	var subscription model.PlanSubscription
-	if err := s.db.WithContext(ctx).Where("payment_id = ?", payment.ID).Order("created_at DESC").First(&subscription).Error; err == nil {
-		payload.TermMonths = &subscription.TermMonths
-		payload.PaymentMethod = nullableTrimmedString(&subscription.PaymentMethod)
-		expiresAt := subscription.ExpiresAt.UTC().Format(time.RFC3339)
-		payload.ExpiresAt = nullableTrimmedString(&expiresAt)
-		payload.WalletAmount = &subscription.WalletAmount
-		payload.TopupAmount = &subscription.TopupAmount
-	} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+	planName, err := s.loadAdminPlanName(ctx, payment.PlanID)
+	if err != nil {
 		return nil, err
 	}
+	payload.PlanName = planName
+
+	termMonths, paymentMethod, expiresAt, walletAmount, topupAmount, err := s.loadAdminPaymentSubscriptionDetails(ctx, payment.ID)
+	if err != nil {
+		return nil, err
+	}
+	payload.TermMonths = termMonths
+	payload.PaymentMethod = paymentMethod
+	payload.ExpiresAt = expiresAt
+	payload.WalletAmount = walletAmount
+	payload.TopupAmount = topupAmount
 
 	return payload, nil
 }
-func (s *appServices) loadPlanUsageCounts(ctx context.Context, planID string) (int64, int64, int64, error) {
+func (s *appServices) loadAdminUserVideoCount(ctx context.Context, userID string) (int64, error) {
+	var videoCount int64
+	if err := s.db.WithContext(ctx).Model(&model.Video{}).Where("user_id = ?", userID).Count(&videoCount).Error; err != nil {
+		return 0, err
+	}
+	return videoCount, nil
+}
+
+func (s *appServices) loadAdminUserEmail(ctx context.Context, userID string) (*string, error) {
+	var user model.User
+	if err := s.db.WithContext(ctx).Select("id, email").Where("id = ?", userID).First(&user).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return nullableTrimmedString(&user.Email), nil
+}
+
+func (s *appServices) loadReferralUserSummary(ctx context.Context, userID string) (*appv1.ReferralUserSummary, error) {
+	if strings.TrimSpace(userID) == "" {
+		return nil, nil
+	}
+	var user model.User
+	if err := s.db.WithContext(ctx).Select("id, email, username").Where("id = ?", userID).First(&user).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return &appv1.ReferralUserSummary{
+		Id:       user.ID,
+		Email:    user.Email,
+		Username: nullableTrimmedString(user.Username),
+	}, nil
+}
+
+func (s *appServices) loadAdminPlanName(ctx context.Context, planID *string) (*string, error) {
+	if planID == nil || strings.TrimSpace(*planID) == "" {
+		return nil, nil
+	}
+	var plan model.Plan
+	if err := s.db.WithContext(ctx).Select("id, name").Where("id = ?", *planID).First(&plan).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return nullableTrimmedString(&plan.Name), nil
+}
+
+func (s *appServices) loadAdminVideoAdTemplateDetails(ctx context.Context, video *model.Video) (*string, *string, error) {
+	if video == nil {
+		return nil, nil, nil
+	}
+	adTemplateID := nullableTrimmedString(video.AdID)
+	if adTemplateID == nil {
+		return nil, nil, nil
+	}
+	adTemplateName, err := s.loadAdminAdTemplateName(ctx, *adTemplateID)
+	if err != nil {
+		return nil, nil, err
+	}
+	return adTemplateID, adTemplateName, nil
+}
+
+func (s *appServices) loadAdminAdTemplateName(ctx context.Context, adTemplateID string) (*string, error) {
+	var template model.AdTemplate
+	if err := s.db.WithContext(ctx).Select("id, name").Where("id = ?", adTemplateID).First(&template).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return nullableTrimmedString(&template.Name), nil
+}
+
+func (s *appServices) loadLatestVideoJobID(ctx context.Context, videoID string) (*string, error) {
+	videoID = strings.TrimSpace(videoID)
+	if videoID == "" {
+		return nil, nil
+	}
+
+	var job model.Job
+	if err := s.db.WithContext(ctx).
+		Where("config::jsonb ->> 'video_id' = ?", videoID).
+		Order("created_at DESC").
+		First(&job).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return stringPointerOrNil(job.ID), nil
+}
+
+func (s *appServices) loadAdminPaymentSubscriptionDetails(ctx context.Context, paymentID string) (*int32, *string, *string, *float64, *float64, error) {
+	var subscription model.PlanSubscription
+	if err := s.db.WithContext(ctx).Where("payment_id = ?", paymentID).Order("created_at DESC").First(&subscription).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil, nil, nil, nil, nil
+		}
+		return nil, nil, nil, nil, nil, err
+	}
+	termMonths := subscription.TermMonths
+	paymentMethod := nullableTrimmedString(&subscription.PaymentMethod)
+	expiresAt := subscription.ExpiresAt.UTC().Format(time.RFC3339)
+	walletAmount := subscription.WalletAmount
+	topupAmount := subscription.TopupAmount
+	return &termMonths, paymentMethod, nullableTrimmedString(&expiresAt), &walletAmount, &topupAmount, nil
+}
+
+func (s *appServices) loadAdminPlanUsageCounts(ctx context.Context, planID string) (int64, int64, int64, error) {
 	var userCount int64
 	if err := s.db.WithContext(ctx).Model(&model.User{}).Where("plan_id = ?", planID).Count(&userCount).Error; err != nil {
 		return 0, 0, 0, err
@@ -346,14 +600,6 @@ func validateAdminPlanInput(name, cycle string, price float64, storageLimit int6
 	}
 	return ""
 }
-func normalizeAdminAdFormatValue(value string) string {
-	switch strings.TrimSpace(strings.ToLower(value)) {
-	case "mid-roll", "post-roll":
-		return strings.TrimSpace(strings.ToLower(value))
-	default:
-		return "pre-roll"
-	}
-}
 func validateAdminAdTemplateInput(userID, name, vastTagURL, adFormat string, duration *int64) string {
 	if strings.TrimSpace(userID) == "" {
 		return "User ID is required"
@@ -361,12 +607,21 @@ func validateAdminAdTemplateInput(userID, name, vastTagURL, adFormat string, dur
 	if strings.TrimSpace(name) == "" || strings.TrimSpace(vastTagURL) == "" {
 		return "Name and VAST URL are required"
 	}
-	format := normalizeAdminAdFormatValue(adFormat)
+	format := normalizeAdFormat(adFormat)
 	if format == "mid-roll" && (duration == nil || *duration <= 0) {
 		return "Duration is required for mid-roll templates"
 	}
 	return ""
 }
+func validateAdminPlayerConfigInput(userID, name string) string {
+	if strings.TrimSpace(userID) == "" {
+		return "User ID is required"
+	}
+	if strings.TrimSpace(name) == "" {
+		return "Name is required"
+	}
+	return ""
+}
 func (s *appServices) unsetAdminDefaultTemplates(ctx context.Context, tx *gorm.DB, userID, excludeID string) error {
 	query := tx.WithContext(ctx).Model(&model.AdTemplate{}).Where("user_id = ?", userID)
 	if excludeID != "" {
@@ -374,12 +629,19 @@ func (s *appServices) unsetAdminDefaultTemplates(ctx context.Context, tx *gorm.D
 	}
 	return query.Update("is_default", false).Error
 }
+func (s *appServices) unsetAdminDefaultPlayerConfigs(ctx context.Context, tx *gorm.DB, userID, excludeID string) error {
+	query := tx.WithContext(ctx).Model(&model.PlayerConfig{}).Where("user_id = ?", userID)
+	if excludeID != "" {
+		query = query.Where("id <> ?", excludeID)
+	}
+	return query.Update("is_default", false).Error
+}
 func (s *appServices) buildAdminPlan(ctx context.Context, plan *model.Plan) (*appv1.AdminPlan, error) {
 	if plan == nil {
 		return nil, nil
 	}
 
-	userCount, paymentCount, subscriptionCount, err := s.loadPlanUsageCounts(ctx, plan.ID)
+	userCount, paymentCount, subscriptionCount, err := s.loadAdminPlanUsageCounts(ctx, plan.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -421,19 +683,51 @@ func (s *appServices) buildAdminAdTemplate(ctx context.Context, item *model.AdTe
 		UpdatedAt:   timeToProto(item.UpdatedAt),
 	}
 
-	var user model.User
-	if err := s.db.WithContext(ctx).Select("id, email").Where("id = ?", item.UserID).First(&user).Error; err == nil {
-		payload.OwnerEmail = nullableTrimmedString(&user.Email)
-	} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+	ownerEmail, err := s.loadAdminUserEmail(ctx, item.UserID)
+	if err != nil {
 		return nil, err
 	}
+	payload.OwnerEmail = ownerEmail
+
+	return payload, nil
+}
+func (s *appServices) buildAdminPlayerConfig(ctx context.Context, item *model.PlayerConfig) (*appv1.AdminPlayerConfig, error) {
+	if item == nil {
+		return nil, nil
+	}
+
+	payload := &appv1.AdminPlayerConfig{
+		Id:            item.ID,
+		UserId:        item.UserID,
+		Name:          item.Name,
+		Description:   nullableTrimmedString(item.Description),
+		Autoplay:      item.Autoplay,
+		Loop:          item.Loop,
+		Muted:         item.Muted,
+		ShowControls:  boolValue(item.ShowControls),
+		Pip:           boolValue(item.Pip),
+		Airplay:       boolValue(item.Airplay),
+		Chromecast:    boolValue(item.Chromecast),
+		IsActive:      boolValue(item.IsActive),
+		IsDefault:     item.IsDefault,
+		CreatedAt:     timeToProto(item.CreatedAt),
+		UpdatedAt:     timeToProto(&item.UpdatedAt),
+		EncrytionM3U8: boolValue(item.EncrytionM3u8),
+		LogoUrl:       nullableTrimmedString(item.LogoURL),
+	}
+
+	ownerEmail, err := s.loadAdminUserEmail(ctx, item.UserID)
+	if err != nil {
+		return nil, err
+	}
+	payload.OwnerEmail = ownerEmail
 
 	return payload, nil
 }
 func (s *appServices) authenticate(ctx context.Context) (*middleware.AuthResult, error) {
 	return s.authenticator.Authenticate(ctx)
 }
-func statusErrorWithBody(ctx context.Context, grpcCode codes.Code, httpCode int, message string, data interface{}) error {
+func statusErrorWithBody(ctx context.Context, grpcCode codes.Code, httpCode int, message string, data any) error {
 	body := apiErrorBody{
 		Code:    httpCode,
 		Message: message,
@@ -445,6 +739,225 @@ func statusErrorWithBody(ctx context.Context, grpcCode codes.Code, httpCode int,
 	}
 	return status.Error(grpcCode, message)
 }
+
+func (s *appServices) loadPaymentPlanForUser(ctx context.Context, planID string) (*model.Plan, error) {
+	var planRecord model.Plan
+	if err := s.db.WithContext(ctx).Where("id = ?", planID).First(&planRecord).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, status.Error(codes.NotFound, "Plan not found")
+		}
+		s.logger.Error("Failed to load plan", "error", err)
+		return nil, status.Error(codes.Internal, "Failed to create payment")
+	}
+	if planRecord.IsActive == nil || !*planRecord.IsActive {
+		return nil, status.Error(codes.InvalidArgument, "Plan is not active")
+	}
+	return &planRecord, nil
+}
+
+func (s *appServices) loadPaymentPlanForAdmin(ctx context.Context, planID string) (*model.Plan, error) {
+	var planRecord model.Plan
+	if err := s.db.WithContext(ctx).Where("id = ?", planID).First(&planRecord).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, status.Error(codes.InvalidArgument, "Plan not found")
+		}
+		return nil, status.Error(codes.Internal, "Failed to create payment")
+	}
+	if planRecord.IsActive == nil || !*planRecord.IsActive {
+		return nil, status.Error(codes.InvalidArgument, "Plan is not active")
+	}
+	return &planRecord, nil
+}
+
+func (s *appServices) loadPaymentUserForAdmin(ctx context.Context, userID string) (*model.User, error) {
+	var user model.User
+	if err := s.db.WithContext(ctx).Where("id = ?", userID).First(&user).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, status.Error(codes.InvalidArgument, "User not found")
+		}
+		return nil, status.Error(codes.Internal, "Failed to create payment")
+	}
+	return &user, nil
+}
+
+func (s *appServices) executePaymentFlow(ctx context.Context, input paymentExecutionInput) (*paymentExecutionResult, error) {
+	totalAmount := input.Plan.Price * float64(input.TermMonths)
+	if totalAmount < 0 {
+		return nil, status.Error(codes.InvalidArgument, "Amount must be greater than or equal to 0")
+	}
+
+	statusValue := "SUCCESS"
+	provider := "INTERNAL"
+	currency := normalizeCurrency(nil)
+	transactionID := buildTransactionID("sub")
+	now := time.Now().UTC()
+	paymentRecord := &model.Payment{
+		ID:            uuid.New().String(),
+		UserID:        input.UserID,
+		PlanID:        &input.Plan.ID,
+		Amount:        totalAmount,
+		Currency:      &currency,
+		Status:        &statusValue,
+		Provider:      &provider,
+		TransactionID: &transactionID,
+	}
+	invoiceID := buildInvoiceID(paymentRecord.ID)
+
+	result := &paymentExecutionResult{
+		Payment:   paymentRecord,
+		InvoiceID: invoiceID,
+	}
+
+	err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		if _, err := lockUserForUpdate(ctx, tx, input.UserID); err != nil {
+			return err
+		}
+
+		newExpiry, err := loadPaymentExpiry(ctx, tx, input.UserID, input.TermMonths, now)
+		if err != nil {
+			return err
+		}
+		currentWalletBalance, err := model.GetWalletBalance(ctx, tx, input.UserID)
+		if err != nil {
+			return err
+		}
+		validatedTopupAmount, err := validatePaymentFunding(ctx, input, totalAmount, currentWalletBalance)
+		if err != nil {
+			return err
+		}
+		if err := tx.Create(paymentRecord).Error; err != nil {
+			return err
+		}
+		if err := createPaymentWalletTransactions(tx, input, paymentRecord, totalAmount, validatedTopupAmount, currency); err != nil {
+			return err
+		}
+		subscription := buildPaymentSubscription(input, paymentRecord, totalAmount, validatedTopupAmount, now, newExpiry)
+		if err := tx.Create(subscription).Error; err != nil {
+			return err
+		}
+		if err := tx.Model(&model.User{}).Where("id = ?", input.UserID).Update("plan_id", input.Plan.ID).Error; err != nil {
+			return err
+		}
+		notification := buildSubscriptionNotification(input.UserID, paymentRecord.ID, invoiceID, input.Plan, subscription)
+		if err := tx.Create(notification).Error; err != nil {
+			return err
+		}
+		if _, err := s.maybeGrantReferralReward(ctx, tx, input, paymentRecord, subscription); err != nil {
+			return err
+		}
+		walletBalance, err := model.GetWalletBalance(ctx, tx, input.UserID)
+		if err != nil {
+			return err
+		}
+		result.Subscription = subscription
+		result.WalletBalance = walletBalance
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+func loadPaymentExpiry(ctx context.Context, tx *gorm.DB, userID string, termMonths int32, now time.Time) (time.Time, error) {
+	currentSubscription, err := model.GetLatestPlanSubscription(ctx, tx, userID)
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return time.Time{}, err
+	}
+	baseExpiry := now
+	if currentSubscription != nil && currentSubscription.ExpiresAt.After(baseExpiry) {
+		baseExpiry = currentSubscription.ExpiresAt.UTC()
+	}
+	return baseExpiry.AddDate(0, int(termMonths), 0), nil
+}
+
+func validatePaymentFunding(ctx context.Context, input paymentExecutionInput, totalAmount, currentWalletBalance float64) (float64, error) {
+	shortfall := maxFloat(totalAmount-currentWalletBalance, 0)
+	if input.PaymentMethod == paymentMethodWallet && shortfall > 0 {
+		return 0, statusErrorWithBody(ctx, codes.InvalidArgument, http.StatusBadRequest, "Insufficient wallet balance", map[string]any{
+			"payment_method": input.PaymentMethod,
+			"wallet_balance": currentWalletBalance,
+			"total_amount":   totalAmount,
+			"shortfall":      shortfall,
+		})
+	}
+	if input.PaymentMethod != paymentMethodTopup {
+		return 0, nil
+	}
+	if input.TopupAmount == nil {
+		return 0, statusErrorWithBody(ctx, codes.InvalidArgument, http.StatusBadRequest, "Top-up amount is required when payment method is topup", map[string]any{
+			"payment_method": input.PaymentMethod,
+			"wallet_balance": currentWalletBalance,
+			"total_amount":   totalAmount,
+			"shortfall":      shortfall,
+		})
+	}
+	topupAmount := maxFloat(*input.TopupAmount, 0)
+	if topupAmount <= 0 {
+		return 0, statusErrorWithBody(ctx, codes.InvalidArgument, http.StatusBadRequest, "Top-up amount must be greater than 0", map[string]any{
+			"payment_method": input.PaymentMethod,
+			"wallet_balance": currentWalletBalance,
+			"total_amount":   totalAmount,
+			"shortfall":      shortfall,
+		})
+	}
+	if topupAmount < shortfall {
+		return 0, statusErrorWithBody(ctx, codes.InvalidArgument, http.StatusBadRequest, "Top-up amount must be greater than or equal to the required shortfall", map[string]any{
+			"payment_method": input.PaymentMethod,
+			"wallet_balance": currentWalletBalance,
+			"total_amount":   totalAmount,
+			"shortfall":      shortfall,
+			"topup_amount":   topupAmount,
+		})
+	}
+	return topupAmount, nil
+}
+
+func createPaymentWalletTransactions(tx *gorm.DB, input paymentExecutionInput, paymentRecord *model.Payment, totalAmount, topupAmount float64, currency string) error {
+	if input.PaymentMethod == paymentMethodTopup {
+		topupTransaction := &model.WalletTransaction{
+			ID:         uuid.New().String(),
+			UserID:     input.UserID,
+			Type:       walletTransactionTypeTopup,
+			Amount:     topupAmount,
+			Currency:   model.StringPtr(currency),
+			Note:       model.StringPtr(fmt.Sprintf("Wallet top-up for %s (%d months)", input.Plan.Name, input.TermMonths)),
+			PaymentID:  &paymentRecord.ID,
+			PlanID:     &input.Plan.ID,
+			TermMonths: int32Ptr(input.TermMonths),
+		}
+		if err := tx.Create(topupTransaction).Error; err != nil {
+			return err
+		}
+	}
+	debitTransaction := &model.WalletTransaction{
+		ID:         uuid.New().String(),
+		UserID:     input.UserID,
+		Type:       walletTransactionTypeSubscriptionDebit,
+		Amount:     -totalAmount,
+		Currency:   model.StringPtr(currency),
+		Note:       model.StringPtr(fmt.Sprintf("Subscription payment for %s (%d months)", input.Plan.Name, input.TermMonths)),
+		PaymentID:  &paymentRecord.ID,
+		PlanID:     &input.Plan.ID,
+		TermMonths: int32Ptr(input.TermMonths),
+	}
+	return tx.Create(debitTransaction).Error
+}
+
+func buildPaymentSubscription(input paymentExecutionInput, paymentRecord *model.Payment, totalAmount, topupAmount float64, now, newExpiry time.Time) *model.PlanSubscription {
+	return &model.PlanSubscription{
+		ID:            uuid.New().String(),
+		UserID:        input.UserID,
+		PaymentID:     paymentRecord.ID,
+		PlanID:        input.Plan.ID,
+		TermMonths:    input.TermMonths,
+		PaymentMethod: input.PaymentMethod,
+		WalletAmount:  totalAmount,
+		TopupAmount:   topupAmount,
+		StartedAt:     now,
+		ExpiresAt:     newExpiry,
+	}
+}
 func (s *appServices) issueSessionCookies(ctx context.Context, user *model.User) error {
 	if user == nil {
 		return status.Error(codes.Unauthenticated, "Unauthorized")
@@ -469,18 +982,6 @@ func (s *appServices) issueSessionCookies(ctx context.Context, user *model.User)
 
 	return nil
 }
-func cookieValueFromHeader(cookieHeader string, name string) string {
-	cookieHeader = strings.TrimSpace(cookieHeader)
-	if cookieHeader == "" {
-		return ""
-	}
-	request := &http.Request{Header: http.Header{"Cookie": []string{cookieHeader}}}
-	cookie, err := request.Cookie(name)
-	if err != nil {
-		return ""
-	}
-	return cookie.Value
-}
 func buildTokenCookie(name string, value string, maxAge int) string {
 	return (&http.Cookie{
 		Name:     name,
@@ -490,9 +991,6 @@ func buildTokenCookie(name string, value string, maxAge int) string {
 		HttpOnly: true,
 	}).String()
 }
-func clearCookieHeader(name string) string {
-	return (&http.Cookie{Name: name, Value: "", Path: "/", MaxAge: -1, HttpOnly: true}).String()
-}
 func messageResponse(message string) *appv1.MessageResponse {
 	return &appv1.MessageResponse{Message: message}
 }
@@ -505,6 +1003,31 @@ func ensurePaidPlan(user *model.User) error {
 	}
 	return nil
 }
+func playerConfigActionAllowed(user *model.User, configCount int64, action string) error {
+	if user == nil {
+		return status.Error(codes.Unauthenticated, "Unauthorized")
+	}
+	if user.PlanID != nil && strings.TrimSpace(*user.PlanID) != "" {
+		return nil
+	}
+
+	switch action {
+	case "create":
+		if configCount > 0 {
+			return status.Error(codes.FailedPrecondition, playerConfigFreePlanLimitMessage)
+		}
+		return nil
+	case "delete":
+		return nil
+	case "update", "set-default", "toggle-active":
+		if configCount > 1 {
+			return status.Error(codes.FailedPrecondition, playerConfigFreePlanReconciliationMessage)
+		}
+		return nil
+	default:
+		return nil
+	}
+}
 func safeRole(role *string) string {
 	if role == nil || strings.TrimSpace(*role) == "" {
 		return "USER"
@@ -528,7 +1051,7 @@ func stringPointerOrNil(value string) *string {
 	}
 	return &trimmed
 }
-func toProtoVideo(item *model.Video) *appv1.Video {
+func toProtoVideo(item *model.Video, jobID ...string) *appv1.Video {
 	if item == nil {
 		return nil
 	}
@@ -536,6 +1059,10 @@ func toProtoVideo(item *model.Video) *appv1.Video {
 	if statusValue == "" {
 		statusValue = "ready"
 	}
+	var linkedJobID *string
+	if len(jobID) > 0 {
+		linkedJobID = stringPointerOrNil(jobID[0])
+	}
 	return &appv1.Video{
 		Id:               item.ID,
 		UserId:           item.UserID,
@@ -551,8 +1078,24 @@ func toProtoVideo(item *model.Video) *appv1.Video {
 		StorageType:      item.StorageType,
 		CreatedAt:        timeToProto(item.CreatedAt),
 		UpdatedAt:        timestamppb.New(item.UpdatedAt.UTC()),
+		JobId:            linkedJobID,
 	}
 }
+
+func (s *appServices) buildVideo(ctx context.Context, video *model.Video) (*appv1.Video, error) {
+	if video == nil {
+		return nil, nil
+	}
+	jobID, err := s.loadLatestVideoJobID(ctx, video.ID)
+	if err != nil {
+		return nil, err
+	}
+	if jobID != nil {
+		return toProtoVideo(video, *jobID), nil
+	}
+	return toProtoVideo(video), nil
+}
+
 func normalizeVideoStatusValue(value string) string {
 	switch strings.ToLower(strings.TrimSpace(value)) {
 	case "processing", "pending":
@@ -591,7 +1134,7 @@ func extractObjectKey(rawURL string) string {
 	}
 	return strings.TrimPrefix(parsed.Path, "/")
 }
-func toProtoUserPayload(user *authapi.UserPayload) *appv1.User {
+func protoUserFromPayload(user *userPayload) *appv1.User {
 	if user == nil {
 		return nil
 	}
@@ -616,30 +1159,8 @@ func toProtoUserPayload(user *authapi.UserPayload) *appv1.User {
 		UpdatedAt:         timestamppb.New(user.UpdatedAt),
 	}
 }
-func toProtoUser(user *authapi.UserPayload) *appv1.User {
-	if user == nil {
-		return nil
-	}
-	return &appv1.User{
-		Id:                user.ID,
-		Email:             user.Email,
-		Username:          user.Username,
-		Avatar:            user.Avatar,
-		Role:              user.Role,
-		GoogleId:          user.GoogleID,
-		StorageUsed:       user.StorageUsed,
-		PlanId:            user.PlanID,
-		PlanStartedAt:     timeToProto(user.PlanStartedAt),
-		PlanExpiresAt:     timeToProto(user.PlanExpiresAt),
-		PlanTermMonths:    user.PlanTermMonths,
-		PlanPaymentMethod: user.PlanPaymentMethod,
-		PlanExpiringSoon:  user.PlanExpiringSoon,
-		WalletBalance:     user.WalletBalance,
-		Language:          user.Language,
-		Locale:            user.Locale,
-		CreatedAt:         timeToProto(user.CreatedAt),
-		UpdatedAt:         timestamppb.New(user.UpdatedAt),
-	}
+func toProtoUser(user *userPayload) *appv1.User {
+	return protoUserFromPayload(user)
 }
 func toProtoPreferences(pref *model.UserPreference) *appv1.Preferences {
 	if pref == nil {
@@ -650,13 +1171,6 @@ func toProtoPreferences(pref *model.UserPreference) *appv1.Preferences {
 		PushNotifications:      boolValue(pref.PushNotifications),
 		MarketingNotifications: pref.MarketingNotifications,
 		TelegramNotifications:  pref.TelegramNotifications,
-		Autoplay:               pref.Autoplay,
-		Loop:                   pref.Loop,
-		Muted:                  pref.Muted,
-		ShowControls:           boolValue(pref.ShowControls),
-		Pip:                    boolValue(pref.Pip),
-		Airplay:                boolValue(pref.Airplay),
-		Chromecast:             boolValue(pref.Chromecast),
 		Language:               model.StringValue(pref.Language),
 		Locale:                 model.StringValue(pref.Locale),
 	}
@@ -701,6 +1215,54 @@ func toProtoAdTemplate(item *model.AdTemplate) *appv1.AdTemplate {
 		UpdatedAt:   timeToProto(item.UpdatedAt),
 	}
 }
+func toProtoPlayerConfig(item *model.PlayerConfig) *appv1.PlayerConfig {
+	if item == nil {
+		return nil
+	}
+	return &appv1.PlayerConfig{
+		Id:            item.ID,
+		Name:          item.Name,
+		Description:   item.Description,
+		Autoplay:      item.Autoplay,
+		Loop:          item.Loop,
+		Muted:         item.Muted,
+		ShowControls:  boolValue(item.ShowControls),
+		Pip:           boolValue(item.Pip),
+		Airplay:       boolValue(item.Airplay),
+		Chromecast:    boolValue(item.Chromecast),
+		IsActive:      boolValue(item.IsActive),
+		IsDefault:     item.IsDefault,
+		CreatedAt:     timeToProto(item.CreatedAt),
+		UpdatedAt:     timeToProto(&item.UpdatedAt),
+		EncrytionM3U8: boolValue(item.EncrytionM3u8),
+		LogoUrl:       nullableTrimmedString(item.LogoURL),
+	}
+}
+func toProtoAdminPlayerConfig(item *model.PlayerConfig, ownerEmail *string) *appv1.AdminPlayerConfig {
+	if item == nil {
+		return nil
+	}
+	return &appv1.AdminPlayerConfig{
+		Id:            item.ID,
+		UserId:        item.UserID,
+		Name:          item.Name,
+		Description:   item.Description,
+		Autoplay:      item.Autoplay,
+		Loop:          item.Loop,
+		Muted:         item.Muted,
+		ShowControls:  boolValue(item.ShowControls),
+		Pip:           boolValue(item.Pip),
+		Airplay:       boolValue(item.Airplay),
+		Chromecast:    boolValue(item.Chromecast),
+		IsActive:      boolValue(item.IsActive),
+		IsDefault:     item.IsDefault,
+		OwnerEmail:    ownerEmail,
+		CreatedAt:     timeToProto(item.CreatedAt),
+		UpdatedAt:     timeToProto(&item.UpdatedAt),
+		EncrytionM3U8: boolValue(item.EncrytionM3u8),
+		LogoUrl:       nullableTrimmedString(item.LogoURL),
+	}
+}
 func toProtoPlan(item *model.Plan) *appv1.Plan {
 	if item == nil {
 		return nil
@@ -773,25 +1335,6 @@ func toProtoWalletTransaction(item *model.WalletTransaction) *appv1.WalletTransa
 		UpdatedAt:  timeToProto(item.UpdatedAt),
 	}
 }
-func toProtoPaymentHistoryItem(item *paymentapi.PaymentHistoryItem) *appv1.PaymentHistoryItem {
-	if item == nil {
-		return nil
-	}
-	return &appv1.PaymentHistoryItem{
-		Id:            item.ID,
-		Amount:        item.Amount,
-		Currency:      item.Currency,
-		Status:        item.Status,
-		PlanId:        item.PlanID,
-		PlanName:      item.PlanName,
-		InvoiceId:     item.InvoiceID,
-		Kind:          item.Kind,
-		TermMonths:    item.TermMonths,
-		PaymentMethod: item.PaymentMethod,
-		ExpiresAt:     timeToProto(item.ExpiresAt),
-		CreatedAt:     timeToProto(item.CreatedAt),
-	}
-}
 func timeToProto(value *time.Time) *timestamppb.Timestamp {
 	if value == nil {
 		return nil
@@ -824,15 +1367,6 @@ func int64PtrToInt32Ptr(value *int64) *int32 {
 func int32Ptr(value int32) *int32 {
 	return &value
 }
-func nullableInt64(value *int64) int64 {
-	if value == nil {
-		return 0
-	}
-	return *value
-}
-func nullableInt64Ptr(value int64) *int64 {
-	return &value
-}
 func protoStringValue(value *string) string {
 	if value == nil {
 		return ""
@@ -897,6 +1431,9 @@ func normalizeAdFormat(value string) string {
 func adTemplateIsActive(value *bool) bool {
 	return value == nil || *value
 }
+func playerConfigIsActive(value *bool) bool {
+	return value == nil || *value
+}
 func unsetDefaultTemplates(tx *gorm.DB, userID, excludeID string) error {
 	query := tx.Model(&model.AdTemplate{}).Where("user_id = ?", userID)
 	if excludeID != "" {
@@ -904,6 +1441,13 @@ func unsetDefaultTemplates(tx *gorm.DB, userID, excludeID string) error {
 	}
 	return query.Update("is_default", false).Error
 }
+func unsetDefaultPlayerConfigs(tx *gorm.DB, userID, excludeID string) error {
+	query := tx.Model(&model.PlayerConfig{}).Where("user_id = ?", userID)
+	if excludeID != "" {
+		query = query.Where("id <> ?", excludeID)
+	}
+	return query.Update("is_default", false).Error
+}
 func normalizePaymentStatus(status *string) string {
 	value := strings.ToLower(strings.TrimSpace(stringValue(status)))
 	switch value {
@@ -1053,7 +1597,7 @@ func buildSubscriptionNotification(userID, paymentID, invoiceID string, planReco
 		Type:    "billing.subscription",
 		Title:   "Subscription activated",
 		Message: fmt.Sprintf("Your subscription to %s is active until %s.", planRecord.Name, subscription.ExpiresAt.UTC().Format("2006-01-02")),
-		Metadata: model.StringPtr(mustMarshalJSON(map[string]interface{}{
+		Metadata: model.StringPtr(mustMarshalJSON(map[string]any{
 			"payment_id":      paymentID,
 			"invoice_id":      invoiceID,
 			"plan_id":         planRecord.ID,
@@ -1065,11 +1609,127 @@ func buildSubscriptionNotification(userID, paymentID, invoiceID string, planReco
 		})),
 	}
 }
+
+func buildReferralRewardNotification(userID string, rewardAmount float64, referee *model.User, paymentRecord *model.Payment) *model.Notification {
+	refereeLabel := strings.TrimSpace(referee.Email)
+	if username := strings.TrimSpace(stringValue(referee.Username)); username != "" {
+		refereeLabel = "@" + username
+	}
+	return &model.Notification{
+		ID:      uuid.New().String(),
+		UserID:  userID,
+		Type:    "billing.referral_reward",
+		Title:   "Referral reward granted",
+		Message: fmt.Sprintf("You received %.2f USD from %s's first subscription.", rewardAmount, refereeLabel),
+		Metadata: model.StringPtr(mustMarshalJSON(map[string]any{
+			"payment_id": paymentRecord.ID,
+			"referee_id": referee.ID,
+			"amount":     rewardAmount,
+		})),
+	}
+}
+
+func (s *appServices) maybeGrantReferralReward(ctx context.Context, tx *gorm.DB, input paymentExecutionInput, paymentRecord *model.Payment, subscription *model.PlanSubscription) (*referralRewardResult, error) {
+	if paymentRecord == nil || subscription == nil || input.Plan == nil {
+		return &referralRewardResult{}, nil
+	}
+	if subscription.PaymentMethod != paymentMethodWallet && subscription.PaymentMethod != paymentMethodTopup {
+		return &referralRewardResult{}, nil
+	}
+
+	referee, err := lockUserForUpdate(ctx, tx, input.UserID)
+	if err != nil {
+		return nil, err
+	}
+	if referee.ReferredByUserID == nil || strings.TrimSpace(*referee.ReferredByUserID) == "" {
+		return &referralRewardResult{}, nil
+	}
+	if referralRewardProcessed(referee) {
+		return &referralRewardResult{}, nil
+	}
+
+	var subscriptionCount int64
+	if err := tx.WithContext(ctx).
+		Model(&model.PlanSubscription{}).
+		Where("user_id = ?", referee.ID).
+		Count(&subscriptionCount).Error; err != nil {
+		return nil, err
+	}
+	if subscriptionCount != 1 {
+		return &referralRewardResult{}, nil
+	}
+
+	referrer, err := lockUserForUpdate(ctx, tx, strings.TrimSpace(*referee.ReferredByUserID))
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return &referralRewardResult{}, nil
+		}
+		return nil, err
+	}
+	if referrer.ID == referee.ID || !referralUserEligible(referrer) {
+		return &referralRewardResult{}, nil
+	}
+
+	bps := effectiveReferralRewardBps(referrer.ReferralRewardBps)
+	if bps <= 0 {
+		return &referralRewardResult{}, nil
+	}
+	baseAmount := input.Plan.Price * float64(input.TermMonths)
+	if baseAmount <= 0 {
+		return &referralRewardResult{}, nil
+	}
+	rewardAmount := baseAmount * float64(bps) / 10000
+	if rewardAmount <= 0 {
+		return &referralRewardResult{}, nil
+	}
+
+	currency := normalizeCurrency(paymentRecord.Currency)
+	rewardTransaction := &model.WalletTransaction{
+		ID:        uuid.New().String(),
+		UserID:    referrer.ID,
+		Type:      walletTransactionTypeReferralReward,
+		Amount:    rewardAmount,
+		Currency:  model.StringPtr(currency),
+		Note:      model.StringPtr(fmt.Sprintf("Referral reward for %s first subscription", referee.Email)),
+		PaymentID: &paymentRecord.ID,
+		PlanID:    &input.Plan.ID,
+	}
+	if err := tx.Create(rewardTransaction).Error; err != nil {
+		return nil, err
+	}
+	if err := tx.Create(buildReferralRewardNotification(referrer.ID, rewardAmount, referee, paymentRecord)).Error; err != nil {
+		return nil, err
+	}
+
+	now := time.Now().UTC()
+	updates := map[string]any{
+		"referral_reward_granted_at": now,
+		"referral_reward_payment_id": paymentRecord.ID,
+		"referral_reward_amount":     rewardAmount,
+	}
+	if err := tx.WithContext(ctx).Model(&model.User{}).Where("id = ?", referee.ID).Updates(updates).Error; err != nil {
+		return nil, err
+	}
+	referee.ReferralRewardGrantedAt = &now
+	referee.ReferralRewardPaymentID = &paymentRecord.ID
+	referee.ReferralRewardAmount = &rewardAmount
+	return &referralRewardResult{Granted: true, Amount: rewardAmount}, nil
+}
 func isAllowedTermMonths(value int32) bool {
 	_, ok := allowedTermMonths[value]
 	return ok
 }
 func lockUserForUpdate(ctx context.Context, tx *gorm.DB, userID string) (*model.User, error) {
+	if tx.Dialector.Name() == "sqlite" {
+		res := tx.WithContext(ctx).Exec("UPDATE user SET id = id WHERE id = ?", userID)
+		if res.Error != nil {
+			return nil, res.Error
+		}
+		if res.RowsAffected == 0 {
+			return nil, gorm.ErrRecordNotFound
+		}
+	}
+
 	var user model.User
 	if err := tx.WithContext(ctx).
 		Clauses(clause.Locking{Strength: "UPDATE"}).
@@ -1091,7 +1751,7 @@ func formatOptionalTimestamp(value *time.Time) string {
 	}
 	return value.UTC().Format(time.RFC3339)
 }
-func mustMarshalJSON(value interface{}) string {
+func mustMarshalJSON(value any) string {
 	encoded, err := json.Marshal(value)
 	if err != nil {
 		return "{}"
diff --git a/internal/rpc/app/service_helpers_payment_flow_test.go b/internal/rpc/app/service_helpers_payment_flow_test.go
new file mode 100644
index 0000000..74d1569
--- /dev/null
+++ b/internal/rpc/app/service_helpers_payment_flow_test.go
@@ -0,0 +1,238 @@
+package app
+
+import (
+	"context"
+	"encoding/json"
+	"strings"
+	"testing"
+
+	"github.com/google/uuid"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"stream.api/internal/database/model"
+)
+
+func TestValidatePaymentFunding(t *testing.T) {
+
+	baseInput := paymentExecutionInput{PaymentMethod: paymentMethodWallet}
+
+	tests := []struct {
+		name          string
+		input         paymentExecutionInput
+		totalAmount   float64
+		walletBalance float64
+		wantTopup     float64
+		wantCode      codes.Code
+		wantMessage   string
+	}{
+		{
+			name:          "wallet đủ tiền",
+			input:         baseInput,
+			totalAmount:   30,
+			walletBalance: 30,
+			wantTopup:     0,
+		},
+		{
+			name:          "wallet thiếu tiền",
+			input:         baseInput,
+			totalAmount:   50,
+			walletBalance: 20,
+			wantCode:      codes.InvalidArgument,
+			wantMessage:   "Insufficient wallet balance",
+		},
+		{
+			name:          "topup thiếu amount",
+			input:         paymentExecutionInput{PaymentMethod: paymentMethodTopup},
+			totalAmount:   50,
+			walletBalance: 20,
+			wantCode:      codes.InvalidArgument,
+			wantMessage:   "Top-up amount is required when payment method is topup",
+		},
+		{
+			name:          "topup amount <= 0",
+			input:         paymentExecutionInput{PaymentMethod: paymentMethodTopup, TopupAmount: ptrFloat64(0)},
+			totalAmount:   50,
+			walletBalance: 20,
+			wantCode:      codes.InvalidArgument,
+			wantMessage:   "Top-up amount must be greater than 0",
+		},
+		{
+			name:          "topup amount nhỏ hơn shortfall",
+			input:         paymentExecutionInput{PaymentMethod: paymentMethodTopup, TopupAmount: ptrFloat64(20)},
+			totalAmount:   50,
+			walletBalance: 20,
+			wantCode:      codes.InvalidArgument,
+			wantMessage:   "Top-up amount must be greater than or equal to the required shortfall",
+		},
+		{
+			name:          "topup hợp lệ",
+			input:         paymentExecutionInput{PaymentMethod: paymentMethodTopup, TopupAmount: ptrFloat64(30)},
+			totalAmount:   50,
+			walletBalance: 20,
+			wantTopup:     30,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := validatePaymentFunding(context.Background(), tt.input, tt.totalAmount, tt.walletBalance)
+			if tt.wantCode == codes.OK {
+				if err != nil {
+					t.Fatalf("validatePaymentFunding() error = %v", err)
+				}
+				if got != tt.wantTopup {
+					t.Fatalf("validatePaymentFunding() topup = %v, want %v", got, tt.wantTopup)
+				}
+				return
+			}
+
+			if err == nil {
+				t.Fatalf("validatePaymentFunding() error = nil, want %v", tt.wantCode)
+			}
+			if status.Code(err) != tt.wantCode {
+				t.Fatalf("validatePaymentFunding() code = %v, want %v", status.Code(err), tt.wantCode)
+			}
+			if got := err.Error(); !strings.Contains(got, tt.wantMessage) {
+				t.Fatalf("validatePaymentFunding() message = %q, want contains %q", got, tt.wantMessage)
+			}
+		})
+	}
+}
+
+func TestExecutePaymentFlow_CreatesExpectedRecords(t *testing.T) {
+
+	db := newTestDB(t)
+	services := newTestAppServices(t, db)
+
+	user := seedTestUser(t, db, model.User{
+		ID:          uuid.NewString(),
+		Email:       "payer@example.com",
+		Role:        ptrString("USER"),
+		StorageUsed: 0,
+	})
+	plan := seedTestPlan(t, db, model.Plan{
+		ID:            uuid.NewString(),
+		Name:          "Pro",
+		Price:         10,
+		Cycle:         "monthly",
+		StorageLimit:  100,
+		UploadLimit:   10,
+		DurationLimit: 0,
+		QualityLimit:  "1080p",
+		Features:      []string{"priority"},
+		IsActive:      ptrBool(true),
+	})
+	seedWalletTransaction(t, db, model.WalletTransaction{
+		ID:       uuid.NewString(),
+		UserID:   user.ID,
+		Type:     walletTransactionTypeTopup,
+		Amount:   5,
+		Currency: ptrString("USD"),
+		Note:     ptrString("Initial funds"),
+	})
+
+	result, err := services.executePaymentFlow(context.Background(), paymentExecutionInput{
+		UserID:        user.ID,
+		Plan:          &plan,
+		TermMonths:    3,
+		PaymentMethod: paymentMethodTopup,
+		TopupAmount:   ptrFloat64(25),
+	})
+	if err != nil {
+		t.Fatalf("executePaymentFlow() error = %v", err)
+	}
+	if result == nil || result.Payment == nil || result.Subscription == nil {
+		t.Fatalf("executePaymentFlow() returned incomplete result: %#v", result)
+	}
+	if result.InvoiceID != buildInvoiceID(result.Payment.ID) {
+		t.Fatalf("invoice id = %q, want %q", result.InvoiceID, buildInvoiceID(result.Payment.ID))
+	}
+	if result.WalletBalance != 0 {
+		t.Fatalf("wallet balance = %v, want 0", result.WalletBalance)
+	}
+
+	payment := mustLoadPayment(t, db, result.Payment.ID)
+	if payment.Amount != 30 {
+		t.Fatalf("payment amount = %v, want 30", payment.Amount)
+	}
+	if payment.PlanID == nil || *payment.PlanID != plan.ID {
+		t.Fatalf("payment plan_id = %v, want %s", payment.PlanID, plan.ID)
+	}
+	if normalizePaymentStatus(payment.Status) != "success" {
+		t.Fatalf("payment status = %q, want success", normalizePaymentStatus(payment.Status))
+	}
+
+	subscription := mustLoadSubscriptionByPayment(t, db, payment.ID)
+	if subscription.PaymentID != payment.ID {
+		t.Fatalf("subscription payment_id = %q, want %q", subscription.PaymentID, payment.ID)
+	}
+	if subscription.PlanID != plan.ID {
+		t.Fatalf("subscription plan_id = %q, want %q", subscription.PlanID, plan.ID)
+	}
+	if subscription.TermMonths != 3 {
+		t.Fatalf("subscription term_months = %d, want 3", subscription.TermMonths)
+	}
+	if subscription.PaymentMethod != paymentMethodTopup {
+		t.Fatalf("subscription payment_method = %q, want %q", subscription.PaymentMethod, paymentMethodTopup)
+	}
+	if subscription.WalletAmount != 30 {
+		t.Fatalf("subscription wallet_amount = %v, want 30", subscription.WalletAmount)
+	}
+	if subscription.TopupAmount != 25 {
+		t.Fatalf("subscription topup_amount = %v, want 25", subscription.TopupAmount)
+	}
+	if !subscription.ExpiresAt.After(subscription.StartedAt) {
+		t.Fatalf("subscription expires_at = %v should be after started_at = %v", subscription.ExpiresAt, subscription.StartedAt)
+	}
+
+	walletTransactions := mustListWalletTransactionsByPayment(t, db, payment.ID)
+	if len(walletTransactions) != 2 {
+		t.Fatalf("wallet transaction count = %d, want 2", len(walletTransactions))
+	}
+	if walletTransactions[0].Amount != 25 || walletTransactions[0].Type != walletTransactionTypeTopup {
+		t.Fatalf("first wallet transaction = %#v, want topup amount 25", walletTransactions[0])
+	}
+	if walletTransactions[1].Amount != -30 || walletTransactions[1].Type != walletTransactionTypeSubscriptionDebit {
+		t.Fatalf("second wallet transaction = %#v, want debit amount -30", walletTransactions[1])
+	}
+
+	updatedUser := mustLoadUser(t, db, user.ID)
+	if updatedUser.PlanID == nil || *updatedUser.PlanID != plan.ID {
+		t.Fatalf("user plan_id = %v, want %s", updatedUser.PlanID, plan.ID)
+	}
+
+	notifications := mustListNotificationsByUser(t, db, user.ID)
+	if len(notifications) != 1 {
+		t.Fatalf("notification count = %d, want 1", len(notifications))
+	}
+	notification := notifications[0]
+	if notification.Type != "billing.subscription" {
+		t.Fatalf("notification type = %q, want %q", notification.Type, "billing.subscription")
+	}
+	if !strings.Contains(notification.Message, plan.Name) {
+		t.Fatalf("notification message = %q, want plan name", notification.Message)
+	}
+	if notification.Metadata == nil {
+		t.Fatal("notification metadata = nil")
+	}
+
+	var metadataPayload map[string]any
+	if err := json.Unmarshal([]byte(*notification.Metadata), &metadataPayload); err != nil {
+		t.Fatalf("unmarshal notification metadata: %v", err)
+	}
+	if metadataPayload["invoice_id"] != result.InvoiceID {
+		t.Fatalf("metadata invoice_id = %v, want %q", metadataPayload["invoice_id"], result.InvoiceID)
+	}
+	if metadataPayload["payment_id"] != payment.ID {
+		t.Fatalf("metadata payment_id = %v, want %q", metadataPayload["payment_id"], payment.ID)
+	}
+	if metadataPayload["payment_method"] != paymentMethodTopup {
+		t.Fatalf("metadata payment_method = %v, want %q", metadataPayload["payment_method"], paymentMethodTopup)
+	}
+	if metadataPayload["wallet_amount"] != 30.0 {
+		t.Fatalf("metadata wallet_amount = %v, want 30", metadataPayload["wallet_amount"])
+	}
+	if metadataPayload["topup_amount"] != 25.0 {
+		t.Fatalf("metadata topup_amount = %v, want 25", metadataPayload["topup_amount"])
+	}
+}
diff --git a/internal/rpc/app/service_payments.go b/internal/rpc/app/service_payments.go
index 1b22fad..d2ec154 100644
--- a/internal/rpc/app/service_payments.go
+++ b/internal/rpc/app/service_payments.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net/http"
 	"sort"
 	"strings"
 	"time"
@@ -13,7 +12,6 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"gorm.io/gorm"
-	paymentapi "stream.api/internal/api/payment"
 	"stream.api/internal/database/model"
 	"stream.api/internal/database/query"
 	appv1 "stream.api/internal/gen/proto/app/v1"
@@ -38,177 +36,17 @@ func (s *appServices) CreatePayment(ctx context.Context, req *appv1.CreatePaymen
 		return nil, status.Error(codes.InvalidArgument, "Payment method must be wallet or topup")
 	}
 
-	var planRecord model.Plan
-	if err := s.db.WithContext(ctx).Where("id = ?", planID).First(&planRecord).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, status.Error(codes.NotFound, "Plan not found")
-		}
-		s.logger.Error("Failed to load plan", "error", err)
-		return nil, status.Error(codes.Internal, "Failed to create payment")
-	}
-	if planRecord.IsActive == nil || !*planRecord.IsActive {
-		return nil, status.Error(codes.InvalidArgument, "Plan is not active")
+	planRecord, err := s.loadPaymentPlanForUser(ctx, planID)
+	if err != nil {
+		return nil, err
 	}
 
-	totalAmount := planRecord.Price * float64(req.GetTermMonths())
-	if totalAmount < 0 {
-		return nil, status.Error(codes.InvalidArgument, "Amount must be greater than or equal to 0")
-	}
-
-	statusValue := "SUCCESS"
-	provider := "INTERNAL"
-	currency := normalizeCurrency(nil)
-	transactionID := buildTransactionID("sub")
-	now := time.Now().UTC()
-
-	paymentRecord := &model.Payment{
-		ID:            uuid.New().String(),
+	resultValue, err := s.executePaymentFlow(ctx, paymentExecutionInput{
 		UserID:        result.UserID,
-		PlanID:        &planRecord.ID,
-		Amount:        totalAmount,
-		Currency:      &currency,
-		Status:        &statusValue,
-		Provider:      &provider,
-		TransactionID: &transactionID,
-	}
-
-	invoiceID := buildInvoiceID(paymentRecord.ID)
-	var subscription *model.PlanSubscription
-	var walletBalance float64
-
-	err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if _, err := lockUserForUpdate(ctx, tx, result.UserID); err != nil {
-			return err
-		}
-
-		currentSubscription, err := model.GetLatestPlanSubscription(ctx, tx, result.UserID)
-		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-			return err
-		}
-
-		baseExpiry := now
-		if currentSubscription != nil && currentSubscription.ExpiresAt.After(baseExpiry) {
-			baseExpiry = currentSubscription.ExpiresAt.UTC()
-		}
-		newExpiry := baseExpiry.AddDate(0, int(req.GetTermMonths()), 0)
-
-		currentWalletBalance, err := model.GetWalletBalance(ctx, tx, result.UserID)
-		if err != nil {
-			return err
-		}
-		shortfall := maxFloat(totalAmount-currentWalletBalance, 0)
-
-		if paymentMethod == paymentMethodWallet && shortfall > 0 {
-			return statusErrorWithBody(ctx, codes.InvalidArgument, http.StatusBadRequest, "Insufficient wallet balance", map[string]interface{}{
-				"payment_method": paymentMethod,
-				"wallet_balance": currentWalletBalance,
-				"total_amount":   totalAmount,
-				"shortfall":      shortfall,
-			})
-		}
-
-		topupAmount := 0.0
-		if paymentMethod == paymentMethodTopup {
-			if req.TopupAmount == nil {
-				return statusErrorWithBody(ctx, codes.InvalidArgument, http.StatusBadRequest, "Top-up amount is required when payment method is topup", map[string]interface{}{
-					"payment_method": paymentMethod,
-					"wallet_balance": currentWalletBalance,
-					"total_amount":   totalAmount,
-					"shortfall":      shortfall,
-				})
-			}
-
-			topupAmount = maxFloat(req.GetTopupAmount(), 0)
-			if topupAmount <= 0 {
-				return statusErrorWithBody(ctx, codes.InvalidArgument, http.StatusBadRequest, "Top-up amount must be greater than 0", map[string]interface{}{
-					"payment_method": paymentMethod,
-					"wallet_balance": currentWalletBalance,
-					"total_amount":   totalAmount,
-					"shortfall":      shortfall,
-				})
-			}
-			if topupAmount < shortfall {
-				return statusErrorWithBody(ctx, codes.InvalidArgument, http.StatusBadRequest, "Top-up amount must be greater than or equal to the required shortfall", map[string]interface{}{
-					"payment_method": paymentMethod,
-					"wallet_balance": currentWalletBalance,
-					"total_amount":   totalAmount,
-					"shortfall":      shortfall,
-					"topup_amount":   topupAmount,
-				})
-			}
-		}
-
-		if err := tx.Create(paymentRecord).Error; err != nil {
-			return err
-		}
-
-		walletUsedAmount := totalAmount
-
-		if paymentMethod == paymentMethodTopup {
-			topupTransaction := &model.WalletTransaction{
-				ID:         uuid.New().String(),
-				UserID:     result.UserID,
-				Type:       walletTransactionTypeTopup,
-				Amount:     topupAmount,
-				Currency:   model.StringPtr(currency),
-				Note:       model.StringPtr(fmt.Sprintf("Wallet top-up for %s (%d months)", planRecord.Name, req.GetTermMonths())),
-				PaymentID:  &paymentRecord.ID,
-				PlanID:     &planRecord.ID,
-				TermMonths: int32Ptr(req.GetTermMonths()),
-			}
-			if err := tx.Create(topupTransaction).Error; err != nil {
-				return err
-			}
-		}
-
-		debitTransaction := &model.WalletTransaction{
-			ID:         uuid.New().String(),
-			UserID:     result.UserID,
-			Type:       walletTransactionTypeSubscriptionDebit,
-			Amount:     -totalAmount,
-			Currency:   model.StringPtr(currency),
-			Note:       model.StringPtr(fmt.Sprintf("Subscription payment for %s (%d months)", planRecord.Name, req.GetTermMonths())),
-			PaymentID:  &paymentRecord.ID,
-			PlanID:     &planRecord.ID,
-			TermMonths: int32Ptr(req.GetTermMonths()),
-		}
-		if err := tx.Create(debitTransaction).Error; err != nil {
-			return err
-		}
-
-		subscription = &model.PlanSubscription{
-			ID:            uuid.New().String(),
-			UserID:        result.UserID,
-			PaymentID:     paymentRecord.ID,
-			PlanID:        planRecord.ID,
-			TermMonths:    req.GetTermMonths(),
-			PaymentMethod: paymentMethod,
-			WalletAmount:  walletUsedAmount,
-			TopupAmount:   topupAmount,
-			StartedAt:     now,
-			ExpiresAt:     newExpiry,
-		}
-		if err := tx.Create(subscription).Error; err != nil {
-			return err
-		}
-
-		if err := tx.Model(&model.User{}).
-			Where("id = ?", result.UserID).
-			Update("plan_id", planRecord.ID).Error; err != nil {
-			return err
-		}
-
-		notification := buildSubscriptionNotification(result.UserID, paymentRecord.ID, invoiceID, &planRecord, subscription)
-		if err := tx.Create(notification).Error; err != nil {
-			return err
-		}
-
-		walletBalance, err = model.GetWalletBalance(ctx, tx, result.UserID)
-		if err != nil {
-			return err
-		}
-
-		return nil
+		Plan:          planRecord,
+		TermMonths:    req.GetTermMonths(),
+		PaymentMethod: paymentMethod,
+		TopupAmount:   req.TopupAmount,
 	})
 	if err != nil {
 		if _, ok := status.FromError(err); ok {
@@ -219,20 +57,35 @@ func (s *appServices) CreatePayment(ctx context.Context, req *appv1.CreatePaymen
 	}
 
 	return &appv1.CreatePaymentResponse{
-		Payment:       toProtoPayment(paymentRecord),
-		Subscription:  toProtoPlanSubscription(subscription),
-		WalletBalance: walletBalance,
-		InvoiceId:     invoiceID,
+		Payment:       toProtoPayment(resultValue.Payment),
+		Subscription:  toProtoPlanSubscription(resultValue.Subscription),
+		WalletBalance: resultValue.WalletBalance,
+		InvoiceId:     resultValue.InvoiceID,
 		Message:       "Payment completed successfully",
 	}, nil
 }
-func (s *appServices) ListPaymentHistory(ctx context.Context, _ *appv1.ListPaymentHistoryRequest) (*appv1.ListPaymentHistoryResponse, error) {
+func (s *appServices) ListPaymentHistory(ctx context.Context, req *appv1.ListPaymentHistoryRequest) (*appv1.ListPaymentHistoryResponse, error) {
 	result, err := s.authenticate(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	var rows []paymentRow
+	page, limit, offset := adminPageLimitOffset(req.GetPage(), req.GetLimit())
+
+	type paymentHistoryRow struct {
+		ID            string     `gorm:"column:id"`
+		Amount        float64    `gorm:"column:amount"`
+		Currency      *string    `gorm:"column:currency"`
+		Status        *string    `gorm:"column:status"`
+		PlanID        *string    `gorm:"column:plan_id"`
+		PlanName      *string    `gorm:"column:plan_name"`
+		TermMonths    *int32     `gorm:"column:term_months"`
+		PaymentMethod *string    `gorm:"column:payment_method"`
+		ExpiresAt     *time.Time `gorm:"column:expires_at"`
+		CreatedAt     *time.Time `gorm:"column:created_at"`
+	}
+
+	var rows []paymentHistoryRow
 	if err := s.db.WithContext(ctx).
 		Table("payment AS p").
 		Select("p.id, p.amount, p.currency, p.status, p.plan_id, pl.name AS plan_name, ps.term_months, ps.payment_method, ps.expires_at, p.created_at").
@@ -245,21 +98,21 @@ func (s *appServices) ListPaymentHistory(ctx context.Context, _ *appv1.ListPayme
 		return nil, status.Error(codes.Internal, "Failed to fetch payment history")
 	}
 
-	items := make([]paymentapi.PaymentHistoryItem, 0, len(rows))
+	items := make([]*appv1.PaymentHistoryItem, 0, len(rows))
 	for _, row := range rows {
-		items = append(items, paymentapi.PaymentHistoryItem{
-			ID:            row.ID,
+		items = append(items, &appv1.PaymentHistoryItem{
+			Id:            row.ID,
 			Amount:        row.Amount,
 			Currency:      normalizeCurrency(row.Currency),
 			Status:        normalizePaymentStatus(row.Status),
-			PlanID:        row.PlanID,
+			PlanId:        row.PlanID,
 			PlanName:      row.PlanName,
-			InvoiceID:     buildInvoiceID(row.ID),
+			InvoiceId:     buildInvoiceID(row.ID),
 			Kind:          paymentKindSubscription,
 			TermMonths:    row.TermMonths,
 			PaymentMethod: normalizeOptionalPaymentMethod(row.PaymentMethod),
-			ExpiresAt:     row.ExpiresAt,
-			CreatedAt:     row.CreatedAt,
+			ExpiresAt:     timeToProto(row.ExpiresAt),
+			CreatedAt:     timeToProto(row.CreatedAt),
 		})
 	}
 
@@ -273,15 +126,14 @@ func (s *appServices) ListPaymentHistory(ctx context.Context, _ *appv1.ListPayme
 	}
 
 	for _, topup := range topups {
-		createdAt := topup.CreatedAt
-		items = append(items, paymentapi.PaymentHistoryItem{
-			ID:        topup.ID,
+		items = append(items, &appv1.PaymentHistoryItem{
+			Id:        topup.ID,
 			Amount:    topup.Amount,
 			Currency:  normalizeCurrency(topup.Currency),
 			Status:    "success",
-			InvoiceID: buildInvoiceID(topup.ID),
+			InvoiceId: buildInvoiceID(topup.ID),
 			Kind:      paymentKindWalletTopup,
-			CreatedAt: createdAt,
+			CreatedAt: timeToProto(topup.CreatedAt),
 		})
 	}
 
@@ -289,22 +141,30 @@ func (s *appServices) ListPaymentHistory(ctx context.Context, _ *appv1.ListPayme
 		left := time.Time{}
 		right := time.Time{}
 		if items[i].CreatedAt != nil {
-			left = *items[i].CreatedAt
+			left = items[i].CreatedAt.AsTime()
 		}
 		if items[j].CreatedAt != nil {
-			right = *items[j].CreatedAt
+			right = items[j].CreatedAt.AsTime()
+		}
+		if right.Equal(left) {
+			return items[i].GetId() > items[j].GetId()
 		}
 		return right.After(left)
 	})
 
-	payload := make([]*appv1.PaymentHistoryItem, 0, len(items))
-	for _, item := range items {
-		copyItem := item
-		payload = append(payload, toProtoPaymentHistoryItem(&copyItem))
+	total := int64(len(items))
+	hasPrev := page > 1 && total > 0
+	if offset >= len(items) {
+		return &appv1.ListPaymentHistoryResponse{Payments: []*appv1.PaymentHistoryItem{}, Total: total, Page: page, Limit: limit, HasPrev: hasPrev, HasNext: false}, nil
 	}
-
-	return &appv1.ListPaymentHistoryResponse{Payments: payload}, nil
+	end := offset + int(limit)
+	if end > len(items) {
+		end = len(items)
+	}
+	hasNext := end < len(items)
+	return &appv1.ListPaymentHistoryResponse{Payments: items[offset:end], Total: total, Page: page, Limit: limit, HasPrev: hasPrev, HasNext: hasNext}, nil
 }
+
 func (s *appServices) TopupWallet(ctx context.Context, req *appv1.TopupWalletRequest) (*appv1.TopupWalletResponse, error) {
 	result, err := s.authenticate(ctx)
 	if err != nil {
@@ -331,7 +191,7 @@ func (s *appServices) TopupWallet(ctx context.Context, req *appv1.TopupWalletReq
 		Type:    "billing.topup",
 		Title:   "Wallet credited",
 		Message: fmt.Sprintf("Your wallet has been credited with %.2f USD.", amount),
-		Metadata: model.StringPtr(mustMarshalJSON(map[string]interface{}{
+		Metadata: model.StringPtr(mustMarshalJSON(map[string]any{
 			"wallet_transaction_id": transaction.ID,
 			"invoice_id":            buildInvoiceID(transaction.ID),
 		})),
@@ -391,7 +251,7 @@ func (s *appServices) DownloadInvoice(ctx context.Context, req *appv1.DownloadIn
 			Content:     invoiceText,
 		}, nil
 	}
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+	if !errors.Is(err, gorm.ErrRecordNotFound) {
 		s.logger.Error("Failed to load payment invoice", "error", err)
 		return nil, status.Error(codes.Internal, "Failed to download invoice")
 	}
diff --git a/internal/rpc/app/service_payments_test.go b/internal/rpc/app/service_payments_test.go
new file mode 100644
index 0000000..106a5bb
--- /dev/null
+++ b/internal/rpc/app/service_payments_test.go
@@ -0,0 +1,181 @@
+package app
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"github.com/google/uuid"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/status"
+	"stream.api/internal/database/model"
+	appv1 "stream.api/internal/gen/proto/app/v1"
+	"stream.api/internal/middleware"
+)
+
+func TestCreatePayment(t *testing.T) {
+
+	t.Run("plan không tồn tại", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "user@example.com", Role: ptrString("USER")})
+
+		conn, cleanup := newTestGRPCServer(t, services)
+		defer cleanup()
+
+		client := newPaymentsClient(conn)
+		_, err := client.CreatePayment(testActorOutgoingContext(user.ID, "USER"), &appv1.CreatePaymentRequest{
+			PlanId:        uuid.NewString(),
+			TermMonths:    1,
+			PaymentMethod: paymentMethodWallet,
+		})
+		assertGRPCCode(t, err, codes.NotFound)
+	})
+
+	t.Run("plan inactive", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "user@example.com", Role: ptrString("USER")})
+		plan := seedTestPlan(t, db, model.Plan{ID: uuid.NewString(), Name: "Starter", Price: 10, Cycle: "monthly", StorageLimit: 10, UploadLimit: 1, QualityLimit: "720p", IsActive: ptrBool(false)})
+
+		conn, cleanup := newTestGRPCServer(t, services)
+		defer cleanup()
+
+		client := newPaymentsClient(conn)
+		_, err := client.CreatePayment(testActorOutgoingContext(user.ID, "USER"), &appv1.CreatePaymentRequest{
+			PlanId:        plan.ID,
+			TermMonths:    1,
+			PaymentMethod: paymentMethodWallet,
+		})
+		assertGRPCCode(t, err, codes.InvalidArgument)
+	})
+
+	t.Run("term không hợp lệ", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "user@example.com", Role: ptrString("USER")})
+		plan := seedTestPlan(t, db, model.Plan{ID: uuid.NewString(), Name: "Starter", Price: 10, Cycle: "monthly", StorageLimit: 10, UploadLimit: 1, QualityLimit: "720p", IsActive: ptrBool(true)})
+
+		conn, cleanup := newTestGRPCServer(t, services)
+		defer cleanup()
+
+		client := newPaymentsClient(conn)
+		_, err := client.CreatePayment(testActorOutgoingContext(user.ID, "USER"), &appv1.CreatePaymentRequest{
+			PlanId:        plan.ID,
+			TermMonths:    2,
+			PaymentMethod: paymentMethodWallet,
+		})
+		assertGRPCCode(t, err, codes.InvalidArgument)
+	})
+
+	t.Run("payment method không hợp lệ", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "user@example.com", Role: ptrString("USER")})
+		plan := seedTestPlan(t, db, model.Plan{ID: uuid.NewString(), Name: "Starter", Price: 10, Cycle: "monthly", StorageLimit: 10, UploadLimit: 1, QualityLimit: "720p", IsActive: ptrBool(true)})
+
+		conn, cleanup := newTestGRPCServer(t, services)
+		defer cleanup()
+
+		client := newPaymentsClient(conn)
+		_, err := client.CreatePayment(testActorOutgoingContext(user.ID, "USER"), &appv1.CreatePaymentRequest{
+			PlanId:        plan.ID,
+			TermMonths:    1,
+			PaymentMethod: "bank_transfer",
+		})
+		assertGRPCCode(t, err, codes.InvalidArgument)
+	})
+
+	t.Run("wallet thiếu tiền giữ trailer", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "user@example.com", Role: ptrString("USER")})
+		plan := seedTestPlan(t, db, model.Plan{ID: uuid.NewString(), Name: "Pro", Price: 50, Cycle: "monthly", StorageLimit: 100, UploadLimit: 10, QualityLimit: "1080p", IsActive: ptrBool(true)})
+		seedWalletTransaction(t, db, model.WalletTransaction{ID: uuid.NewString(), UserID: user.ID, Type: walletTransactionTypeTopup, Amount: 10, Currency: ptrString("USD")})
+
+		conn, cleanup := newTestGRPCServer(t, services)
+		defer cleanup()
+
+		client := newPaymentsClient(conn)
+		var trailer metadata.MD
+		_, err := client.CreatePayment(testActorOutgoingContext(user.ID, "USER"), &appv1.CreatePaymentRequest{
+			PlanId:        plan.ID,
+			TermMonths:    1,
+			PaymentMethod: paymentMethodWallet,
+		}, grpc.Trailer(&trailer))
+		assertGRPCCode(t, err, codes.InvalidArgument)
+		body := firstTestMetadataValue(trailer, "x-error-body")
+		if body == "" {
+			t.Fatal("expected x-error-body trailer")
+		}
+		if !strings.Contains(body, "Insufficient wallet balance") {
+			t.Fatalf("x-error-body = %q, want insufficient wallet balance", body)
+		}
+	})
+
+	t.Run("happy path user", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "user@example.com", Role: ptrString("USER")})
+		plan := seedTestPlan(t, db, model.Plan{ID: uuid.NewString(), Name: "Pro", Price: 20, Cycle: "monthly", StorageLimit: 100, UploadLimit: 10, QualityLimit: "1080p", IsActive: ptrBool(true)})
+		seedWalletTransaction(t, db, model.WalletTransaction{ID: uuid.NewString(), UserID: user.ID, Type: walletTransactionTypeTopup, Amount: 5, Currency: ptrString("USD")})
+
+		conn, cleanup := newTestGRPCServer(t, services)
+		defer cleanup()
+
+		client := newPaymentsClient(conn)
+		resp, err := client.CreatePayment(testActorOutgoingContext(user.ID, "USER"), &appv1.CreatePaymentRequest{
+			PlanId:        plan.ID,
+			TermMonths:    1,
+			PaymentMethod: paymentMethodTopup,
+			TopupAmount:   ptrFloat64(15),
+		})
+		if err != nil {
+			t.Fatalf("CreatePayment() error = %v", err)
+		}
+		if resp.Payment == nil || resp.Subscription == nil {
+			t.Fatalf("CreatePayment() response incomplete: %#v", resp)
+		}
+		if resp.InvoiceId != buildInvoiceID(resp.Payment.Id) {
+			t.Fatalf("invoice id = %q, want %q", resp.InvoiceId, buildInvoiceID(resp.Payment.Id))
+		}
+		if resp.Subscription.PaymentMethod != paymentMethodTopup {
+			t.Fatalf("subscription payment method = %q, want %q", resp.Subscription.PaymentMethod, paymentMethodTopup)
+		}
+		if resp.Subscription.WalletAmount != 20 {
+			t.Fatalf("subscription wallet amount = %v, want 20", resp.Subscription.WalletAmount)
+		}
+		if resp.Subscription.TopupAmount != 15 {
+			t.Fatalf("subscription topup amount = %v, want 15", resp.Subscription.TopupAmount)
+		}
+		if resp.WalletBalance != 0 {
+			t.Fatalf("wallet balance = %v, want 0", resp.WalletBalance)
+		}
+
+		payment := mustLoadPayment(t, db, resp.Payment.Id)
+		if payment.Amount != 20 {
+			t.Fatalf("payment amount = %v, want 20", payment.Amount)
+		}
+	})
+}
+
+func testActorOutgoingContext(userID, role string) context.Context {
+	return metadata.NewOutgoingContext(context.Background(), metadata.Pairs(
+		middleware.ActorMarkerMetadataKey, testTrustedMarker,
+		middleware.ActorIDMetadataKey, userID,
+		middleware.ActorRoleMetadataKey, role,
+		middleware.ActorEmailMetadataKey, strings.ToLower(role)+"@example.com",
+	))
+}
+
+func assertGRPCCode(t *testing.T, err error, want codes.Code) {
+	t.Helper()
+	if err == nil {
+		t.Fatalf("grpc error = nil, want %v", want)
+	}
+	if got := status.Code(err); got != want {
+		t.Fatalf("grpc code = %v, want %v, err=%v", got, want, err)
+	}
+}
diff --git a/internal/rpc/app/service_player_configs_test.go b/internal/rpc/app/service_player_configs_test.go
new file mode 100644
index 0000000..c2be16b
--- /dev/null
+++ b/internal/rpc/app/service_player_configs_test.go
@@ -0,0 +1,266 @@
+package app
+
+import (
+	"context"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/status"
+	"gorm.io/gorm"
+	"stream.api/internal/database/model"
+	appv1 "stream.api/internal/gen/proto/app/v1"
+	"stream.api/internal/middleware"
+)
+
+func TestPlayerConfigsPolicy(t *testing.T) {
+	t.Run("free user creates first config", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "free@example.com", Role: ptrString("USER")})
+
+		resp, err := services.CreatePlayerConfig(testActorIncomingContext(user.ID, "USER"), &appv1.CreatePlayerConfigRequest{
+			Name:      "Free Config",
+			IsDefault: ptrBool(true),
+		})
+		if err != nil {
+			t.Fatalf("CreatePlayerConfig() error = %v", err)
+		}
+		if resp.Config == nil {
+			t.Fatal("CreatePlayerConfig() config is nil")
+		}
+		if !resp.Config.IsDefault {
+			t.Fatal("CreatePlayerConfig() config should be default")
+		}
+		items := mustListPlayerConfigsByUser(t, db, user.ID)
+		if len(items) != 1 {
+			t.Fatalf("player config count = %d, want 1", len(items))
+		}
+	})
+
+	t.Run("free user cannot create second config", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "free@example.com", Role: ptrString("USER")})
+		seedTestPlayerConfig(t, db, model.PlayerConfig{ID: uuid.NewString(), UserID: user.ID, Name: "Existing", IsActive: ptrBool(true)})
+
+		_, err := services.CreatePlayerConfig(testActorIncomingContext(user.ID, "USER"), &appv1.CreatePlayerConfigRequest{Name: "Second"})
+		assertGRPCCode(t, err, codes.FailedPrecondition)
+		if got := status.Convert(err).Message(); got != playerConfigFreePlanLimitMessage {
+			t.Fatalf("grpc message = %q, want %q", got, playerConfigFreePlanLimitMessage)
+		}
+	})
+
+	t.Run("free user can update and delete single config", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "free@example.com", Role: ptrString("USER")})
+		config := seedTestPlayerConfig(t, db, model.PlayerConfig{ID: uuid.NewString(), UserID: user.ID, Name: "Original", IsActive: ptrBool(true)})
+
+		updateResp, err := services.UpdatePlayerConfig(testActorIncomingContext(user.ID, "USER"), &appv1.UpdatePlayerConfigRequest{
+			Id:           config.ID,
+			Name:         "Updated",
+			Description:  ptrString("note"),
+			Autoplay:     true,
+			ShowControls: true,
+			Pip:          true,
+			Airplay:      true,
+			Chromecast:   true,
+			IsActive:     ptrBool(true),
+			IsDefault:    ptrBool(true),
+		})
+		if err != nil {
+			t.Fatalf("UpdatePlayerConfig() error = %v", err)
+		}
+		if updateResp.Config == nil || updateResp.Config.Name != "Updated" || !updateResp.Config.IsDefault {
+			t.Fatalf("UpdatePlayerConfig() unexpected response: %#v", updateResp)
+		}
+
+		_, err = services.DeletePlayerConfig(testActorIncomingContext(user.ID, "USER"), &appv1.DeletePlayerConfigRequest{Id: config.ID})
+		if err != nil {
+			t.Fatalf("DeletePlayerConfig() error = %v", err)
+		}
+		items := mustListPlayerConfigsByUser(t, db, user.ID)
+		if len(items) != 0 {
+			t.Fatalf("player config count after delete = %d, want 0", len(items))
+		}
+	})
+
+	t.Run("free downgrade reconciliation only allows delete", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "free@example.com", Role: ptrString("USER")})
+		first := seedTestPlayerConfig(t, db, model.PlayerConfig{ID: uuid.NewString(), UserID: user.ID, Name: "First", IsActive: ptrBool(true), IsDefault: true})
+		second := seedTestPlayerConfig(t, db, model.PlayerConfig{ID: uuid.NewString(), UserID: user.ID, Name: "Second", IsActive: ptrBool(true)})
+
+		_, err := services.UpdatePlayerConfig(testActorIncomingContext(user.ID, "USER"), &appv1.UpdatePlayerConfigRequest{
+			Id:           first.ID,
+			Name:         "Blocked",
+			ShowControls: true,
+			Pip:          true,
+			Airplay:      true,
+			Chromecast:   true,
+			IsActive:     ptrBool(true),
+		})
+		assertGRPCCode(t, err, codes.FailedPrecondition)
+		if got := status.Convert(err).Message(); got != playerConfigFreePlanReconciliationMessage {
+			t.Fatalf("grpc message = %q, want %q", got, playerConfigFreePlanReconciliationMessage)
+		}
+
+		_, err = services.DeletePlayerConfig(testActorIncomingContext(user.ID, "USER"), &appv1.DeletePlayerConfigRequest{Id: second.ID})
+		if err != nil {
+			t.Fatalf("DeletePlayerConfig() error = %v", err)
+		}
+		items := mustListPlayerConfigsByUser(t, db, user.ID)
+		if len(items) != 1 {
+			t.Fatalf("player config count after reconciliation delete = %d, want 1", len(items))
+		}
+	})
+
+	t.Run("paid user can create multiple configs", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		planID := uuid.NewString()
+		seedTestPlan(t, db, model.Plan{ID: planID, Name: "Pro", Price: 10, Cycle: "monthly", StorageLimit: 10, UploadLimit: 1, DurationLimit: 60, QualityLimit: "1080p", IsActive: ptrBool(true)})
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "paid@example.com", Role: ptrString("USER"), PlanID: &planID})
+
+		for _, name := range []string{"One", "Two"} {
+			_, err := services.CreatePlayerConfig(testActorIncomingContext(user.ID, "USER"), &appv1.CreatePlayerConfigRequest{Name: name})
+			if err != nil {
+				t.Fatalf("CreatePlayerConfig(%q) error = %v", name, err)
+			}
+		}
+
+		items := mustListPlayerConfigsByUser(t, db, user.ID)
+		if len(items) != 2 {
+			t.Fatalf("player config count = %d, want 2", len(items))
+		}
+	})
+
+	t.Run("set default unsets previous default", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		planID := uuid.NewString()
+		seedTestPlan(t, db, model.Plan{ID: planID, Name: "Pro", Price: 10, Cycle: "monthly", StorageLimit: 10, UploadLimit: 1, DurationLimit: 60, QualityLimit: "1080p", IsActive: ptrBool(true)})
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "paid@example.com", Role: ptrString("USER"), PlanID: &planID})
+		first := seedTestPlayerConfig(t, db, model.PlayerConfig{ID: uuid.NewString(), UserID: user.ID, Name: "First", IsActive: ptrBool(true), IsDefault: true})
+		second := seedTestPlayerConfig(t, db, model.PlayerConfig{ID: uuid.NewString(), UserID: user.ID, Name: "Second", IsActive: ptrBool(true), IsDefault: false})
+
+		_, err := services.UpdatePlayerConfig(testActorIncomingContext(user.ID, "USER"), &appv1.UpdatePlayerConfigRequest{
+			Id:           second.ID,
+			Name:         second.Name,
+			ShowControls: true,
+			Pip:          true,
+			Airplay:      true,
+			Chromecast:   true,
+			IsActive:     ptrBool(true),
+			IsDefault:    ptrBool(true),
+		})
+		if err != nil {
+			t.Fatalf("UpdatePlayerConfig() error = %v", err)
+		}
+
+		items := mustListPlayerConfigsByUser(t, db, user.ID)
+		defaults := map[string]bool{}
+		for _, item := range items {
+			defaults[item.ID] = item.IsDefault
+		}
+		if defaults[first.ID] {
+			t.Fatal("first config should no longer be default")
+		}
+		if !defaults[second.ID] {
+			t.Fatal("second config should be default")
+		}
+	})
+
+	t.Run("concurrent free create creates at most one record", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		user := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "free@example.com", Role: ptrString("USER")})
+
+		const attempts = 8
+		var wg sync.WaitGroup
+		var mu sync.Mutex
+		successes := 0
+		messages := make([]string, 0, attempts)
+
+		for i := 0; i < attempts; i++ {
+			wg.Add(1)
+			go func(index int) {
+				defer wg.Done()
+				_, err := services.CreatePlayerConfig(testActorIncomingContext(user.ID, "USER"), &appv1.CreatePlayerConfigRequest{Name: "Config-" + uuid.NewString()})
+				mu.Lock()
+				defer mu.Unlock()
+				if err == nil {
+					successes++
+					return
+				}
+				messages = append(messages, status.Convert(err).Message())
+			}(i)
+		}
+		wg.Wait()
+
+		if successes != 1 {
+			t.Fatalf("success count = %d, want 1 (messages=%v)", successes, messages)
+		}
+		items := mustListPlayerConfigsByUser(t, db, user.ID)
+		if len(items) != 1 {
+			t.Fatalf("player config count = %d, want 1", len(items))
+		}
+		for _, message := range messages {
+			if message != playerConfigFreePlanLimitMessage && !strings.Contains(strings.ToLower(message), "locked") {
+				t.Fatalf("unexpected concurrent create error message: %q", message)
+			}
+		}
+	})
+}
+
+func testActorIncomingContext(userID, role string) context.Context {
+	incoming := metadata.NewIncomingContext(context.Background(), metadata.Pairs(
+		middleware.ActorMarkerMetadataKey, testTrustedMarker,
+		middleware.ActorIDMetadataKey, userID,
+		middleware.ActorRoleMetadataKey, role,
+		middleware.ActorEmailMetadataKey, strings.ToLower(role)+"@example.com",
+	))
+	return context.WithValue(incoming, struct{}{}, time.Now())
+}
+
+func seedTestPlayerConfig(t *testing.T, db *gorm.DB, config model.PlayerConfig) model.PlayerConfig {
+	t.Helper()
+	if config.ShowControls == nil {
+		config.ShowControls = ptrBool(true)
+	}
+	if config.Pip == nil {
+		config.Pip = ptrBool(true)
+	}
+	if config.Airplay == nil {
+		config.Airplay = ptrBool(true)
+	}
+	if config.Chromecast == nil {
+		config.Chromecast = ptrBool(true)
+	}
+	if config.IsActive == nil {
+		config.IsActive = ptrBool(true)
+	}
+	if config.CreatedAt == nil {
+		now := time.Now().UTC()
+		config.CreatedAt = &now
+	}
+	if err := db.Create(&config).Error; err != nil {
+		t.Fatalf("create player config: %v", err)
+	}
+	return config
+}
+
+func mustListPlayerConfigsByUser(t *testing.T, db *gorm.DB, userID string) []model.PlayerConfig {
+	t.Helper()
+	var items []model.PlayerConfig
+	if err := db.Order("created_at ASC, id ASC").Find(&items, "user_id = ?", userID).Error; err != nil {
+		t.Fatalf("list player configs for user %s: %v", userID, err)
+	}
+	return items
+}
diff --git a/internal/rpc/app/service_referrals_test.go b/internal/rpc/app/service_referrals_test.go
new file mode 100644
index 0000000..7b3dad0
--- /dev/null
+++ b/internal/rpc/app/service_referrals_test.go
@@ -0,0 +1,235 @@
+package app
+
+import (
+	"context"
+	"testing"
+	"strings"
+
+	"github.com/google/uuid"
+	"google.golang.org/grpc/codes"
+	"gorm.io/gorm"
+	"stream.api/internal/database/model"
+	appv1 "stream.api/internal/gen/proto/app/v1"
+)
+
+func TestRegisterReferralCapture(t *testing.T) {
+	t.Run("register với ref hợp lệ lưu referred_by_user_id", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		referrer := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "ref@example.com", Username: ptrString("alice"), Role: ptrString("USER")})
+
+		resp, err := services.Register(context.Background(), &appv1.RegisterRequest{
+			Username:    "bob",
+			Email:       "bob@example.com",
+			Password:    "secret123",
+			RefUsername: ptrString("alice"),
+		})
+		if err != nil {
+			t.Fatalf("Register() error = %v", err)
+		}
+		if resp.User == nil {
+			t.Fatal("Register() user is nil")
+		}
+		created := mustLoadUser(t, db, resp.User.Id)
+		if created.ReferredByUserID == nil || *created.ReferredByUserID != referrer.ID {
+			t.Fatalf("referred_by_user_id = %v, want %s", created.ReferredByUserID, referrer.ID)
+		}
+	})
+
+	t.Run("register với ref invalid hoặc self-ref vẫn tạo user", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+
+		resp, err := services.Register(context.Background(), &appv1.RegisterRequest{
+			Username:    "selfie",
+			Email:       "selfie@example.com",
+			Password:    "secret123",
+			RefUsername: ptrString("selfie"),
+		})
+		if err != nil {
+			t.Fatalf("Register() error = %v", err)
+		}
+		created := mustLoadUser(t, db, resp.User.Id)
+		if created.ReferredByUserID != nil {
+			t.Fatalf("referred_by_user_id = %v, want nil", created.ReferredByUserID)
+		}
+	})
+}
+
+func TestResolveSignupReferrerID(t *testing.T) {
+	t.Run("resolve referrer theo username hợp lệ", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		referrer := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "ref@example.com", Username: ptrString("alice"), Role: ptrString("USER")})
+		referrerID, err := services.resolveSignupReferrerID(context.Background(), "alice", "bob")
+		if err != nil {
+			t.Fatalf("resolveSignupReferrerID() error = %v", err)
+		}
+		if referrerID == nil || *referrerID != referrer.ID {
+			t.Fatalf("referrerID = %v, want %s", referrerID, referrer.ID)
+		}
+	})
+
+	t.Run("invalid hoặc self-ref bị ignore", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		referrerID, err := services.resolveSignupReferrerID(context.Background(), "bob", "bob")
+		if err != nil {
+			t.Fatalf("resolveSignupReferrerID() error = %v", err)
+		}
+		if referrerID != nil {
+			t.Fatalf("referrerID = %v, want nil", referrerID)
+		}
+	})
+
+	t.Run("username trùng thì ignore trong signup path", func(t *testing.T) {
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "a@example.com", Username: ptrString("alice"), Role: ptrString("USER")})
+		seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "b@example.com", Username: ptrString("alice"), Role: ptrString("USER")})
+		referrerID, err := services.resolveSignupReferrerID(context.Background(), "alice", "bob")
+		if err != nil {
+			t.Fatalf("resolveSignupReferrerID() error = %v", err)
+		}
+		if referrerID != nil {
+			t.Fatalf("referrerID = %v, want nil", referrerID)
+		}
+	})
+}
+
+func TestReferralRewardFlow(t *testing.T) {
+	setup := func(t *testing.T) (*appServices, *gorm.DB, model.User, model.User, model.Plan) {
+		t.Helper()
+		db := newTestDB(t)
+		services := newTestAppServices(t, db)
+		referrer := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "ref@example.com", Username: ptrString("alice"), Role: ptrString("USER"), ReferralEligible: ptrBool(true)})
+		referee := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "payer@example.com", Username: ptrString("bob"), Role: ptrString("USER"), ReferredByUserID: &referrer.ID, ReferralEligible: ptrBool(true)})
+		plan := seedTestPlan(t, db, model.Plan{ID: uuid.NewString(), Name: "Pro", Price: 20, Cycle: "monthly", StorageLimit: 100, UploadLimit: 10, QualityLimit: "1080p", IsActive: ptrBool(true)})
+		return services, db, referrer, referee, plan
+	}
+
+	t.Run("first subscription thưởng 5 phần trăm", func(t *testing.T) {
+		services, db, referrer, referee, plan := setup(t)
+		seedWalletTransaction(t, db, model.WalletTransaction{ID: uuid.NewString(), UserID: referee.ID, Type: walletTransactionTypeTopup, Amount: 20, Currency: ptrString("USD")})
+
+		result, err := services.executePaymentFlow(context.Background(), paymentExecutionInput{UserID: referee.ID, Plan: &plan, TermMonths: 1, PaymentMethod: paymentMethodWallet})
+		if err != nil {
+			t.Fatalf("executePaymentFlow() error = %v", err)
+		}
+		updatedReferee := mustLoadUser(t, db, referee.ID)
+		if updatedReferee.ReferralRewardPaymentID == nil || *updatedReferee.ReferralRewardPaymentID != result.Payment.ID {
+			t.Fatalf("reward payment id = %v, want %s", updatedReferee.ReferralRewardPaymentID, result.Payment.ID)
+		}
+		if updatedReferee.ReferralRewardAmount == nil || *updatedReferee.ReferralRewardAmount != 1 {
+			t.Fatalf("reward amount = %v, want 1", updatedReferee.ReferralRewardAmount)
+		}
+		balance, err := model.GetWalletBalance(context.Background(), db, referrer.ID)
+		if err != nil {
+			t.Fatalf("GetWalletBalance() error = %v", err)
+		}
+		if balance != 1 {
+			t.Fatalf("referrer wallet balance = %v, want 1", balance)
+		}
+		notifications := mustListNotificationsByUser(t, db, referrer.ID)
+		if len(notifications) != 1 || notifications[0].Type != "billing.referral_reward" {
+			t.Fatalf("notifications = %#v, want one referral reward notification", notifications)
+		}
+	})
+
+	t.Run("subscription thứ hai không thưởng lại", func(t *testing.T) {
+		services, db, referrer, referee, plan := setup(t)
+		seedWalletTransaction(t, db, model.WalletTransaction{ID: uuid.NewString(), UserID: referee.ID, Type: walletTransactionTypeTopup, Amount: 40, Currency: ptrString("USD")})
+		if _, err := services.executePaymentFlow(context.Background(), paymentExecutionInput{UserID: referee.ID, Plan: &plan, TermMonths: 1, PaymentMethod: paymentMethodWallet}); err != nil {
+			t.Fatalf("first executePaymentFlow() error = %v", err)
+		}
+		if _, err := services.executePaymentFlow(context.Background(), paymentExecutionInput{UserID: referee.ID, Plan: &plan, TermMonths: 1, PaymentMethod: paymentMethodWallet}); err != nil {
+			t.Fatalf("second executePaymentFlow() error = %v", err)
+		}
+		balance, err := model.GetWalletBalance(context.Background(), db, referrer.ID)
+		if err != nil {
+			t.Fatalf("GetWalletBalance() error = %v", err)
+		}
+		if balance != 1 {
+			t.Fatalf("referrer wallet balance = %v, want 1", balance)
+		}
+	})
+
+	t.Run("topup ví đơn thuần không kích hoạt reward", func(t *testing.T) {
+		services, db, referrer, referee, _ := setup(t)
+		_, err := services.TopupWallet(testActorIncomingContext(referee.ID, "USER"), &appv1.TopupWalletRequest{Amount: 10})
+		if err != nil {
+			t.Fatalf("TopupWallet() error = %v", err)
+		}
+		balance, err := model.GetWalletBalance(context.Background(), db, referrer.ID)
+		if err != nil {
+			t.Fatalf("GetWalletBalance() error = %v", err)
+		}
+		if balance != 0 {
+			t.Fatalf("referrer wallet balance = %v, want 0", balance)
+		}
+	})
+
+	t.Run("referrer không eligible thì không grant", func(t *testing.T) {
+		services, db, referrer, referee, plan := setup(t)
+		if err := db.Model(&model.User{}).Where("id = ?", referrer.ID).Update("referral_eligible", false).Error; err != nil {
+			t.Fatalf("update referral_eligible: %v", err)
+		}
+		seedWalletTransaction(t, db, model.WalletTransaction{ID: uuid.NewString(), UserID: referee.ID, Type: walletTransactionTypeTopup, Amount: 20, Currency: ptrString("USD")})
+		if _, err := services.executePaymentFlow(context.Background(), paymentExecutionInput{UserID: referee.ID, Plan: &plan, TermMonths: 1, PaymentMethod: paymentMethodWallet}); err != nil {
+			t.Fatalf("executePaymentFlow() error = %v", err)
+		}
+		balance, err := model.GetWalletBalance(context.Background(), db, referrer.ID)
+		if err != nil {
+			t.Fatalf("GetWalletBalance() error = %v", err)
+		}
+		if balance != 0 {
+			t.Fatalf("referrer wallet balance = %v, want 0", balance)
+		}
+	})
+
+	t.Run("override reward bps áp dụng đúng", func(t *testing.T) {
+		services, db, referrer, referee, plan := setup(t)
+		if err := db.Model(&model.User{}).Where("id = ?", referrer.ID).Update("referral_reward_bps", 750).Error; err != nil {
+			t.Fatalf("update referral_reward_bps: %v", err)
+		}
+		seedWalletTransaction(t, db, model.WalletTransaction{ID: uuid.NewString(), UserID: referee.ID, Type: walletTransactionTypeTopup, Amount: 20, Currency: ptrString("USD")})
+		if _, err := services.executePaymentFlow(context.Background(), paymentExecutionInput{UserID: referee.ID, Plan: &plan, TermMonths: 1, PaymentMethod: paymentMethodWallet}); err != nil {
+			t.Fatalf("executePaymentFlow() error = %v", err)
+		}
+		balance, err := model.GetWalletBalance(context.Background(), db, referrer.ID)
+		if err != nil {
+			t.Fatalf("GetWalletBalance() error = %v", err)
+		}
+		if balance != 1.5 {
+			t.Fatalf("referrer wallet balance = %v, want 1.5", balance)
+		}
+	})
+}
+
+func TestUpdateAdminUserReferralSettings(t *testing.T) {
+	db := newTestDB(t)
+	services := newTestAppServices(t, db)
+	admin := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "admin@example.com", Role: ptrString("ADMIN")})
+	referrer := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "ref@example.com", Username: ptrString("alice"), Role: ptrString("USER")})
+	referee := seedTestUser(t, db, model.User{ID: uuid.NewString(), Email: "payer@example.com", Username: ptrString("bob"), Role: ptrString("USER"), ReferredByUserID: &referrer.ID, ReferralEligible: ptrBool(true)})
+	plan := seedTestPlan(t, db, model.Plan{ID: uuid.NewString(), Name: "Pro", Price: 20, Cycle: "monthly", StorageLimit: 100, UploadLimit: 10, QualityLimit: "1080p", IsActive: ptrBool(true)})
+	seedWalletTransaction(t, db, model.WalletTransaction{ID: uuid.NewString(), UserID: referee.ID, Type: walletTransactionTypeTopup, Amount: 20, Currency: ptrString("USD")})
+	if _, err := services.executePaymentFlow(context.Background(), paymentExecutionInput{UserID: referee.ID, Plan: &plan, TermMonths: 1, PaymentMethod: paymentMethodWallet}); err != nil {
+		t.Fatalf("executePaymentFlow() error = %v", err)
+	}
+
+	_, err := services.UpdateAdminUserReferralSettings(testActorIncomingContext(admin.ID, "ADMIN"), &appv1.UpdateAdminUserReferralSettingsRequest{
+		Id:          referee.ID,
+		RefUsername: ptrString("alice"),
+	})
+	assertGRPCCode(t, err, codes.InvalidArgument)
+}
+
+func containsAny(value string, parts ...string) bool {
+	for _, part := range parts {
+		if part != "" && strings.Contains(value, part) {
+			return true
+		}
+	}
+	return false
+}
diff --git a/internal/rpc/app/service_user_features.go b/internal/rpc/app/service_user_features.go
index 2a0e6a3..64baaf1 100644
--- a/internal/rpc/app/service_user_features.go
+++ b/internal/rpc/app/service_user_features.go
@@ -346,8 +346,9 @@ func (s *appServices) DeleteAdTemplate(ctx context.Context, req *appv1.DeleteAdT
 	}
 
 	if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Where("ad_template_id = ? AND user_id = ?", id, result.UserID).
-			Delete(&model.VideoAdConfig{}).Error; err != nil {
+		if err := tx.Model(&model.Video{}).
+			Where("user_id = ? AND ad_id = ?", result.UserID, id).
+			Update("ad_id", nil).Error; err != nil {
 			return err
 		}
 
@@ -388,3 +389,236 @@ func (s *appServices) ListPlans(ctx context.Context, _ *appv1.ListPlansRequest)
 
 	return &appv1.ListPlansResponse{Plans: items}, nil
 }
+
+func (s *appServices) ListPlayerConfigs(ctx context.Context, _ *appv1.ListPlayerConfigsRequest) (*appv1.ListPlayerConfigsResponse, error) {
+	result, err := s.authenticate(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	var items []model.PlayerConfig
+	if err := s.db.WithContext(ctx).
+		Where("user_id = ?", result.UserID).
+		Order("is_default DESC").
+		Order("created_at DESC").
+		Find(&items).Error; err != nil {
+		s.logger.Error("Failed to list player configs", "error", err)
+		return nil, status.Error(codes.Internal, "Failed to load player configs")
+	}
+
+	payload := make([]*appv1.PlayerConfig, 0, len(items))
+	for _, item := range items {
+		copyItem := item
+		payload = append(payload, toProtoPlayerConfig(&copyItem))
+	}
+
+	return &appv1.ListPlayerConfigsResponse{Configs: payload}, nil
+}
+
+func (s *appServices) CreatePlayerConfig(ctx context.Context, req *appv1.CreatePlayerConfigRequest) (*appv1.CreatePlayerConfigResponse, error) {
+	result, err := s.authenticate(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	name := strings.TrimSpace(req.GetName())
+	if name == "" {
+		return nil, status.Error(codes.InvalidArgument, "Name is required")
+	}
+
+	item := &model.PlayerConfig{
+		ID:            uuid.New().String(),
+		UserID:        result.UserID,
+		Name:          name,
+		Description:   nullableTrimmedString(req.Description),
+		Autoplay:      req.GetAutoplay(),
+		Loop:          req.GetLoop(),
+		Muted:         req.GetMuted(),
+		ShowControls:  model.BoolPtr(req.GetShowControls()),
+		Pip:           model.BoolPtr(req.GetPip()),
+		Airplay:       model.BoolPtr(req.GetAirplay()),
+		Chromecast:    model.BoolPtr(req.GetChromecast()),
+		IsActive:      model.BoolPtr(req.IsActive == nil || *req.IsActive),
+		IsDefault:     req.IsDefault != nil && *req.IsDefault,
+		EncrytionM3u8: model.BoolPtr(req.EncrytionM3U8 == nil || *req.EncrytionM3U8),
+		LogoURL:       nullableTrimmedString(req.LogoUrl),
+	}
+	if !playerConfigIsActive(item.IsActive) {
+		item.IsDefault = false
+	}
+
+	if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		lockedUser, err := lockUserForUpdate(ctx, tx, result.UserID)
+		if err != nil {
+			return err
+		}
+
+		var configCount int64
+		if err := tx.WithContext(ctx).
+			Model(&model.PlayerConfig{}).
+			Where("user_id = ?", result.UserID).
+			Count(&configCount).Error; err != nil {
+			return err
+		}
+		if err := playerConfigActionAllowed(lockedUser, configCount, "create"); err != nil {
+			return err
+		}
+
+		if item.IsDefault {
+			if err := unsetDefaultPlayerConfigs(tx, result.UserID, ""); err != nil {
+				return err
+			}
+		}
+		return tx.Create(item).Error
+	}); err != nil {
+		if status.Code(err) != codes.Unknown {
+			return nil, err
+		}
+		s.logger.Error("Failed to create player config", "error", err)
+		return nil, status.Error(codes.Internal, "Failed to save player config")
+	}
+
+	return &appv1.CreatePlayerConfigResponse{Config: toProtoPlayerConfig(item)}, nil
+}
+
+func (s *appServices) UpdatePlayerConfig(ctx context.Context, req *appv1.UpdatePlayerConfigRequest) (*appv1.UpdatePlayerConfigResponse, error) {
+	result, err := s.authenticate(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	id := strings.TrimSpace(req.GetId())
+	if id == "" {
+		return nil, status.Error(codes.NotFound, "Player config not found")
+	}
+
+	name := strings.TrimSpace(req.GetName())
+	if name == "" {
+		return nil, status.Error(codes.InvalidArgument, "Name is required")
+	}
+
+	var item model.PlayerConfig
+	if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		lockedUser, err := lockUserForUpdate(ctx, tx, result.UserID)
+		if err != nil {
+			return err
+		}
+
+		var configCount int64
+		if err := tx.WithContext(ctx).
+			Model(&model.PlayerConfig{}).
+			Where("user_id = ?", result.UserID).
+			Count(&configCount).Error; err != nil {
+			return err
+		}
+
+		if err := tx.WithContext(ctx).Where("id = ? AND user_id = ?", id, result.UserID).First(&item).Error; err != nil {
+			return err
+		}
+
+		action := "update"
+		wasActive := playerConfigIsActive(item.IsActive)
+		if req.IsActive != nil && *req.IsActive != wasActive {
+			action = "toggle-active"
+		}
+		if req.IsDefault != nil && *req.IsDefault {
+			action = "set-default"
+		}
+		if err := playerConfigActionAllowed(lockedUser, configCount, action); err != nil {
+			return err
+		}
+
+		item.Name = name
+		item.Description = nullableTrimmedString(req.Description)
+		item.Autoplay = req.GetAutoplay()
+		item.Loop = req.GetLoop()
+		item.Muted = req.GetMuted()
+		item.ShowControls = model.BoolPtr(req.GetShowControls())
+		item.Pip = model.BoolPtr(req.GetPip())
+		item.Airplay = model.BoolPtr(req.GetAirplay())
+		item.Chromecast = model.BoolPtr(req.GetChromecast())
+		if req.EncrytionM3U8 != nil {
+			item.EncrytionM3u8 = model.BoolPtr(*req.EncrytionM3U8)
+		}
+		if req.LogoUrl != nil {
+			item.LogoURL = nullableTrimmedString(req.LogoUrl)
+		}
+		if req.IsActive != nil {
+			item.IsActive = model.BoolPtr(*req.IsActive)
+		}
+		if req.IsDefault != nil {
+			item.IsDefault = *req.IsDefault
+		}
+		if !playerConfigIsActive(item.IsActive) {
+			item.IsDefault = false
+		}
+
+		if item.IsDefault {
+			if err := unsetDefaultPlayerConfigs(tx, result.UserID, item.ID); err != nil {
+				return err
+			}
+		}
+		return tx.Save(&item).Error
+	}); err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, status.Error(codes.NotFound, "Player config not found")
+		}
+		if status.Code(err) != codes.Unknown {
+			return nil, err
+		}
+		s.logger.Error("Failed to update player config", "error", err)
+		return nil, status.Error(codes.Internal, "Failed to save player config")
+	}
+
+	return &appv1.UpdatePlayerConfigResponse{Config: toProtoPlayerConfig(&item)}, nil
+}
+
+func (s *appServices) DeletePlayerConfig(ctx context.Context, req *appv1.DeletePlayerConfigRequest) (*appv1.MessageResponse, error) {
+	result, err := s.authenticate(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	id := strings.TrimSpace(req.GetId())
+	if id == "" {
+		return nil, status.Error(codes.NotFound, "Player config not found")
+	}
+
+	if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		lockedUser, err := lockUserForUpdate(ctx, tx, result.UserID)
+		if err != nil {
+			return err
+		}
+
+		var configCount int64
+		if err := tx.WithContext(ctx).
+			Model(&model.PlayerConfig{}).
+			Where("user_id = ?", result.UserID).
+			Count(&configCount).Error; err != nil {
+			return err
+		}
+		if err := playerConfigActionAllowed(lockedUser, configCount, "delete"); err != nil {
+			return err
+		}
+
+		res := tx.Where("id = ? AND user_id = ?", id, result.UserID).Delete(&model.PlayerConfig{})
+		if res.Error != nil {
+			return res.Error
+		}
+		if res.RowsAffected == 0 {
+			return gorm.ErrRecordNotFound
+		}
+		return nil
+	}); err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, status.Error(codes.NotFound, "Player config not found")
+		}
+		if status.Code(err) != codes.Unknown {
+			return nil, err
+		}
+		s.logger.Error("Failed to delete player config", "error", err)
+		return nil, status.Error(codes.Internal, "Failed to delete player config")
+	}
+
+	return messageResponse("Player config deleted"), nil
+}
diff --git a/internal/rpc/app/service_videos.go b/internal/rpc/app/service_videos.go
index a2fcb30..d9e1ac7 100644
--- a/internal/rpc/app/service_videos.go
+++ b/internal/rpc/app/service_videos.go
@@ -13,6 +13,7 @@ import (
 	"gorm.io/gorm"
 	"stream.api/internal/database/model"
 	appv1 "stream.api/internal/gen/proto/app/v1"
+	"stream.api/internal/video"
 )
 
 func (s *appServices) GetUploadUrl(ctx context.Context, req *appv1.GetUploadUrlRequest) (*appv1.GetUploadUrlResponse, error) {
@@ -44,6 +45,9 @@ func (s *appServices) CreateVideo(ctx context.Context, req *appv1.CreateVideoReq
 	if err != nil {
 		return nil, err
 	}
+	if s.videoService == nil {
+		return nil, status.Error(codes.Unavailable, "Job service is unavailable")
+	}
 
 	title := strings.TrimSpace(req.GetTitle())
 	if title == "" {
@@ -53,41 +57,28 @@ func (s *appServices) CreateVideo(ctx context.Context, req *appv1.CreateVideoReq
 	if videoURL == "" {
 		return nil, status.Error(codes.InvalidArgument, "URL is required")
 	}
-
-	statusValue := "ready"
-	processingStatus := "READY"
-	storageType := detectStorageType(videoURL)
 	description := strings.TrimSpace(req.GetDescription())
-	format := strings.TrimSpace(req.GetFormat())
 
-	video := &model.Video{
-		ID:               uuid.New().String(),
-		UserID:           result.UserID,
-		Name:             title,
-		Title:            title,
-		Description:      nullableTrimmedString(&description),
-		URL:              videoURL,
-		Size:             req.GetSize(),
-		Duration:         req.GetDuration(),
-		Format:           format,
-		Status:           &statusValue,
-		ProcessingStatus: &processingStatus,
-		StorageType:      &storageType,
-	}
-
-	if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Create(video).Error; err != nil {
-			return err
-		}
-		return tx.Model(&model.User{}).
-			Where("id = ?", result.UserID).
-			UpdateColumn("storage_used", gorm.Expr("storage_used + ?", video.Size)).Error
-	}); err != nil {
+	created, err := s.videoService.CreateVideo(ctx, video.CreateVideoInput{
+		UserID:      result.UserID,
+		Title:       title,
+		Description: &description,
+		URL:         videoURL,
+		Size:        req.GetSize(),
+		Duration:    req.GetDuration(),
+		Format:      strings.TrimSpace(req.GetFormat()),
+	})
+	if err != nil {
 		s.logger.Error("Failed to create video", "error", err)
-		return nil, status.Error(codes.Internal, "Failed to create video")
+		switch {
+		case errors.Is(err, video.ErrJobServiceUnavailable):
+			return nil, status.Error(codes.Unavailable, "Job service is unavailable")
+		default:
+			return nil, status.Error(codes.Internal, "Failed to create video")
+		}
 	}
 
-	return &appv1.CreateVideoResponse{Video: toProtoVideo(video)}, nil
+	return &appv1.CreateVideoResponse{Video: toProtoVideo(created.Video, created.Job.ID)}, nil
 }
 func (s *appServices) ListVideos(ctx context.Context, req *appv1.ListVideosRequest) (*appv1.ListVideosResponse, error) {
 	result, err := s.authenticate(ctx)
@@ -131,7 +122,12 @@ func (s *appServices) ListVideos(ctx context.Context, req *appv1.ListVideosReque
 
 	items := make([]*appv1.Video, 0, len(videos))
 	for i := range videos {
-		items = append(items, toProtoVideo(&videos[i]))
+		payload, err := s.buildVideo(ctx, &videos[i])
+		if err != nil {
+			s.logger.Error("Failed to build video payload", "error", err, "video_id", videos[i].ID)
+			return nil, status.Error(codes.Internal, "Failed to fetch videos")
+		}
+		items = append(items, payload)
 	}
 
 	return &appv1.ListVideosResponse{Videos: items, Total: total, Page: page, Limit: limit}, nil
@@ -160,7 +156,12 @@ func (s *appServices) GetVideo(ctx context.Context, req *appv1.GetVideoRequest)
 		return nil, status.Error(codes.Internal, "Failed to fetch video")
 	}
 
-	return &appv1.GetVideoResponse{Video: toProtoVideo(&video)}, nil
+	payload, err := s.buildVideo(ctx, &video)
+	if err != nil {
+		s.logger.Error("Failed to build video payload", "error", err, "video_id", video.ID)
+		return nil, status.Error(codes.Internal, "Failed to fetch video")
+	}
+	return &appv1.GetVideoResponse{Video: payload}, nil
 }
 func (s *appServices) UpdateVideo(ctx context.Context, req *appv1.UpdateVideoRequest) (*appv1.UpdateVideoResponse, error) {
 	result, err := s.authenticate(ctx)
@@ -219,7 +220,12 @@ func (s *appServices) UpdateVideo(ctx context.Context, req *appv1.UpdateVideoReq
 		return nil, status.Error(codes.Internal, "Failed to update video")
 	}
 
-	return &appv1.UpdateVideoResponse{Video: toProtoVideo(&video)}, nil
+	payload, err := s.buildVideo(ctx, &video)
+	if err != nil {
+		s.logger.Error("Failed to build video payload", "error", err, "video_id", video.ID)
+		return nil, status.Error(codes.Internal, "Failed to update video")
+	}
+	return &appv1.UpdateVideoResponse{Video: payload}, nil
 }
 func (s *appServices) DeleteVideo(ctx context.Context, req *appv1.DeleteVideoRequest) (*appv1.MessageResponse, error) {
 	result, err := s.authenticate(ctx)
@@ -256,9 +262,6 @@ func (s *appServices) DeleteVideo(ctx context.Context, req *appv1.DeleteVideoReq
 	}
 
 	if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		if err := tx.Where("video_id = ? AND user_id = ?", video.ID, result.UserID).Delete(&model.VideoAdConfig{}).Error; err != nil {
-			return err
-		}
 		if err := tx.Where("id = ? AND user_id = ?", video.ID, result.UserID).Delete(&model.Video{}).Error; err != nil {
 			return err
 		}
diff --git a/internal/rpc/app/testdb_setup_test.go b/internal/rpc/app/testdb_setup_test.go
new file mode 100644
index 0000000..ee4fd3f
--- /dev/null
+++ b/internal/rpc/app/testdb_setup_test.go
@@ -0,0 +1,408 @@
+package app
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/test/bufconn"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
+	_ "modernc.org/sqlite"
+	"stream.api/internal/database/model"
+	"stream.api/internal/database/query"
+	appv1 "stream.api/internal/gen/proto/app/v1"
+	"stream.api/internal/middleware"
+	"stream.api/pkg/cache"
+	"stream.api/pkg/logger"
+	"stream.api/pkg/token"
+)
+
+const testTrustedMarker = "trusted-test-marker"
+
+var testBufDialerListenerSize = 1024 * 1024
+
+type testLogger struct{}
+
+type fakeCache struct {
+	values map[string]string
+}
+
+type fakeTokenProvider struct{}
+
+func (testLogger) Info(string, ...any)  {}
+func (testLogger) Error(string, ...any) {}
+func (testLogger) Debug(string, ...any) {}
+func (testLogger) Warn(string, ...any)  {}
+
+func (f *fakeCache) Set(_ context.Context, key string, value interface{}, _ time.Duration) error {
+	if f.values == nil {
+		f.values = map[string]string{}
+	}
+	f.values[key] = fmt.Sprint(value)
+	return nil
+}
+
+func (f *fakeCache) Get(_ context.Context, key string) (string, error) {
+	if f.values == nil {
+		return "", fmt.Errorf("cache miss")
+	}
+	value, ok := f.values[key]
+	if !ok {
+		return "", fmt.Errorf("cache miss")
+	}
+	return value, nil
+}
+
+func (f *fakeCache) Del(_ context.Context, key string) error {
+	delete(f.values, key)
+	return nil
+}
+
+func (f *fakeCache) Close() error {
+	return nil
+}
+
+func (fakeTokenProvider) GenerateTokenPair(userID, _, _ string) (*token.TokenPair, error) {
+	return &token.TokenPair{
+		AccessToken:  "access-" + userID,
+		RefreshToken: "refresh-" + userID,
+		AccessUUID:   "access-uuid-" + userID,
+		RefreshUUID:  "refresh-uuid-" + userID,
+		AtExpires:    time.Now().Add(time.Hour).Unix(),
+		RtExpires:    time.Now().Add(24 * time.Hour).Unix(),
+	}, nil
+}
+
+func (fakeTokenProvider) ParseToken(tokenString string) (*token.Claims, error) {
+	return &token.Claims{UserID: tokenString}, nil
+}
+
+func (fakeTokenProvider) ParseMapToken(tokenString string) (map[string]interface{}, error) {
+	return map[string]interface{}{"token": tokenString}, nil
+}
+
+var _ cache.Cache = (*fakeCache)(nil)
+var _ token.Provider = fakeTokenProvider{}
+
+func newTestDB(t *testing.T) *gorm.DB {
+	t.Helper()
+
+	dsn := fmt.Sprintf("file:%s?mode=memory&cache=shared", uuid.NewString())
+	db, err := gorm.Open(sqlite.Dialector{DriverName: "sqlite", DSN: dsn}, &gorm.Config{})
+	if err != nil {
+		t.Fatalf("open sqlite db: %v", err)
+	}
+
+	for _, stmt := range []string{
+		`CREATE TABLE user (
+			id TEXT PRIMARY KEY,
+			email TEXT NOT NULL,
+			password TEXT,
+			username TEXT,
+			avatar TEXT,
+			role TEXT NOT NULL,
+			google_id TEXT,
+			storage_used INTEGER NOT NULL DEFAULT 0,
+			plan_id TEXT,
+			referred_by_user_id TEXT,
+			referral_eligible BOOLEAN NOT NULL DEFAULT 1,
+			referral_reward_bps INTEGER,
+			referral_reward_granted_at DATETIME,
+			referral_reward_payment_id TEXT,
+			referral_reward_amount REAL,
+			created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+			updated_at DATETIME,
+			version INTEGER NOT NULL DEFAULT 1,
+			telegram_id TEXT
+		)`,
+		`CREATE TABLE plan (
+			id TEXT PRIMARY KEY,
+			name TEXT NOT NULL,
+			description TEXT,
+			price REAL NOT NULL,
+			cycle TEXT NOT NULL,
+			storage_limit INTEGER NOT NULL,
+			upload_limit INTEGER NOT NULL,
+			duration_limit INTEGER NOT NULL,
+			quality_limit TEXT NOT NULL,
+			features JSON,
+			is_active BOOLEAN NOT NULL DEFAULT 1,
+			version INTEGER NOT NULL DEFAULT 1
+		)`,
+		`CREATE TABLE payment (
+			id TEXT PRIMARY KEY,
+			user_id TEXT NOT NULL,
+			plan_id TEXT,
+			amount REAL NOT NULL,
+			currency TEXT,
+			status TEXT,
+			provider TEXT,
+			transaction_id TEXT,
+			created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+			updated_at DATETIME,
+			version INTEGER NOT NULL DEFAULT 1
+		)`,
+		`CREATE TABLE plan_subscriptions (
+			id TEXT PRIMARY KEY,
+			user_id TEXT NOT NULL,
+			payment_id TEXT NOT NULL,
+			plan_id TEXT NOT NULL,
+			term_months INTEGER NOT NULL,
+			payment_method TEXT NOT NULL,
+			wallet_amount REAL NOT NULL,
+			topup_amount REAL NOT NULL,
+			started_at DATETIME NOT NULL,
+			expires_at DATETIME NOT NULL,
+			reminder_7d_sent_at DATETIME,
+			reminder_3d_sent_at DATETIME,
+			reminder_1d_sent_at DATETIME,
+			created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+			updated_at DATETIME,
+			version INTEGER NOT NULL DEFAULT 1
+		)`,
+		`CREATE TABLE wallet_transactions (
+			id TEXT PRIMARY KEY,
+			user_id TEXT NOT NULL,
+			type TEXT NOT NULL,
+			amount REAL NOT NULL,
+			currency TEXT,
+			note TEXT,
+			created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+			updated_at DATETIME,
+			payment_id TEXT,
+			plan_id TEXT,
+			term_months INTEGER,
+			version INTEGER NOT NULL DEFAULT 1
+		)`,
+		`CREATE TABLE notifications (
+			id TEXT PRIMARY KEY,
+			user_id TEXT NOT NULL,
+			type TEXT NOT NULL,
+			title TEXT NOT NULL,
+			message TEXT NOT NULL,
+			metadata TEXT,
+			action_url TEXT,
+			action_label TEXT,
+			is_read BOOLEAN NOT NULL DEFAULT 0,
+			created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+			updated_at DATETIME,
+			version INTEGER NOT NULL DEFAULT 1
+		)`,
+		`CREATE TABLE user_preferences (
+			user_id TEXT PRIMARY KEY,
+			language TEXT NOT NULL DEFAULT 'en',
+			locale TEXT NOT NULL DEFAULT 'en',
+			email_notifications BOOLEAN NOT NULL DEFAULT 1,
+			push_notifications BOOLEAN NOT NULL DEFAULT 1,
+			marketing_notifications BOOLEAN NOT NULL DEFAULT 0,
+			telegram_notifications BOOLEAN NOT NULL DEFAULT 0,
+			created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+			updated_at DATETIME,
+			version INTEGER NOT NULL DEFAULT 1
+		)`,
+		`CREATE TABLE player_configs (
+			id TEXT PRIMARY KEY,
+			user_id TEXT NOT NULL,
+			name TEXT NOT NULL,
+			description TEXT,
+			autoplay BOOLEAN NOT NULL DEFAULT 0,
+			loop BOOLEAN NOT NULL DEFAULT 0,
+			muted BOOLEAN NOT NULL DEFAULT 0,
+			show_controls BOOLEAN NOT NULL DEFAULT 1,
+			pip BOOLEAN NOT NULL DEFAULT 1,
+			airplay BOOLEAN NOT NULL DEFAULT 1,
+			chromecast BOOLEAN NOT NULL DEFAULT 1,
+			is_active BOOLEAN NOT NULL DEFAULT 1,
+			is_default BOOLEAN NOT NULL DEFAULT 0,
+			created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+			updated_at DATETIME,
+			version INTEGER NOT NULL DEFAULT 1,
+			encrytion_m3u8 BOOLEAN NOT NULL DEFAULT 1,
+			logo_url TEXT
+		)`,
+	} {
+		if err := db.Exec(stmt).Error; err != nil {
+			t.Fatalf("create test schema: %v", err)
+		}
+	}
+
+	query.SetDefault(db)
+	return db
+}
+
+func newTestAppServices(t *testing.T, db *gorm.DB) *appServices {
+	t.Helper()
+
+	if db == nil {
+		db = newTestDB(t)
+	}
+
+	return &appServices{
+		db:                db,
+		logger:            testLogger{},
+		authenticator:     middleware.NewAuthenticator(db, testLogger{}, testTrustedMarker),
+		cache:             &fakeCache{values: map[string]string{}},
+		tokenProvider:     fakeTokenProvider{},
+		googleUserInfoURL: defaultGoogleUserInfoURL,
+	}
+}
+
+func newTestGRPCServer(t *testing.T, services *appServices) (*grpc.ClientConn, func()) {
+	t.Helper()
+
+	lis := bufconn.Listen(testBufDialerListenerSize)
+	server := grpc.NewServer()
+	Register(server, &Services{
+		AuthServiceServer:          services,
+		AccountServiceServer:       services,
+		PreferencesServiceServer:   services,
+		UsageServiceServer:         services,
+		NotificationsServiceServer: services,
+		DomainsServiceServer:       services,
+		AdTemplatesServiceServer:   services,
+		PlayerConfigsServiceServer: services,
+		PlansServiceServer:         services,
+		PaymentsServiceServer:      services,
+		VideosServiceServer:        services,
+		AdminServiceServer:         services,
+	})
+
+	go func() {
+		_ = server.Serve(lis)
+	}()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	conn, err := grpc.DialContext(ctx, "bufnet",
+		grpc.WithContextDialer(func(context.Context, string) (net.Conn, error) {
+			return lis.Dial()
+		}),
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+	)
+	cancel()
+	if err != nil {
+		server.Stop()
+		_ = lis.Close()
+		t.Fatalf("dial bufconn: %v", err)
+	}
+
+	cleanup := func() {
+		_ = conn.Close()
+		server.Stop()
+		_ = lis.Close()
+	}
+
+	return conn, cleanup
+}
+
+func ptrFloat64(v float64) *float64 { return &v }
+func ptrString(v string) *string    { return &v }
+func ptrBool(v bool) *bool          { return &v }
+func ptrInt64(v int64) *int64       { return &v }
+
+func firstTestMetadataValue(md metadata.MD, key string) string {
+	values := md.Get(key)
+	if len(values) == 0 {
+		return ""
+	}
+	return values[0]
+}
+
+func seedTestUser(t *testing.T, db *gorm.DB, user model.User) model.User {
+	t.Helper()
+	if user.Role == nil {
+		user.Role = ptrString("USER")
+	}
+	if err := db.Create(&user).Error; err != nil {
+		t.Fatalf("create user: %v", err)
+	}
+	return user
+}
+
+func seedTestPlan(t *testing.T, db *gorm.DB, plan model.Plan) model.Plan {
+	t.Helper()
+	if plan.IsActive == nil {
+		plan.IsActive = ptrBool(true)
+	}
+	if err := db.Create(&plan).Error; err != nil {
+		t.Fatalf("create plan: %v", err)
+	}
+	return plan
+}
+
+func seedWalletTransaction(t *testing.T, db *gorm.DB, tx model.WalletTransaction) model.WalletTransaction {
+	t.Helper()
+	if err := db.Create(&tx).Error; err != nil {
+		t.Fatalf("create wallet transaction: %v", err)
+	}
+	return tx
+}
+
+func seedSubscription(t *testing.T, db *gorm.DB, subscription model.PlanSubscription) model.PlanSubscription {
+	t.Helper()
+	if err := db.Create(&subscription).Error; err != nil {
+		t.Fatalf("create subscription: %v", err)
+	}
+	return subscription
+}
+
+func mustLoadUser(t *testing.T, db *gorm.DB, userID string) model.User {
+	t.Helper()
+	var user model.User
+	if err := db.First(&user, "id = ?", userID).Error; err != nil {
+		t.Fatalf("load user %s: %v", userID, err)
+	}
+	return user
+}
+
+func mustLoadPayment(t *testing.T, db *gorm.DB, paymentID string) model.Payment {
+	t.Helper()
+	var payment model.Payment
+	if err := db.First(&payment, "id = ?", paymentID).Error; err != nil {
+		t.Fatalf("load payment %s: %v", paymentID, err)
+	}
+	return payment
+}
+
+func mustLoadSubscriptionByPayment(t *testing.T, db *gorm.DB, paymentID string) model.PlanSubscription {
+	t.Helper()
+	var subscription model.PlanSubscription
+	if err := db.First(&subscription, "payment_id = ?", paymentID).Error; err != nil {
+		t.Fatalf("load subscription for payment %s: %v", paymentID, err)
+	}
+	return subscription
+}
+
+func mustListWalletTransactionsByPayment(t *testing.T, db *gorm.DB, paymentID string) []model.WalletTransaction {
+	t.Helper()
+	var items []model.WalletTransaction
+	if err := db.Order("amount DESC").Find(&items, "payment_id = ?", paymentID).Error; err != nil {
+		t.Fatalf("list wallet transactions for payment %s: %v", paymentID, err)
+	}
+	return items
+}
+
+func mustListNotificationsByUser(t *testing.T, db *gorm.DB, userID string) []model.Notification {
+	t.Helper()
+	var items []model.Notification
+	if err := db.Order("created_at ASC, id ASC").Find(&items, "user_id = ?", userID).Error; err != nil {
+		t.Fatalf("list notifications for user %s: %v", userID, err)
+	}
+	return items
+}
+
+func newPaymentsClient(conn *grpc.ClientConn) appv1.PaymentsServiceClient {
+	return appv1.NewPaymentsServiceClient(conn)
+}
+
+func newAdminClient(conn *grpc.ClientConn) appv1.AdminServiceClient {
+	return appv1.NewAdminServiceClient(conn)
+}
+
+var _ logger.Logger = testLogger{}
diff --git a/internal/api/usage/service.go b/internal/rpc/app/usage_helpers.go
similarity index 59%
rename from internal/api/usage/service.go
rename to internal/rpc/app/usage_helpers.go
index 3727454..d06fdad 100644
--- a/internal/api/usage/service.go
+++ b/internal/rpc/app/usage_helpers.go
@@ -1,4 +1,4 @@
-package usage
+package app
 
 import (
 	"context"
@@ -8,14 +8,20 @@ import (
 	"stream.api/pkg/logger"
 )
 
-func LoadUsage(ctx context.Context, db *gorm.DB, l logger.Logger, user *model.User) (*UsagePayload, error) {
+type usagePayload struct {
+	UserID       string `json:"user_id"`
+	TotalVideos  int64  `json:"total_videos"`
+	TotalStorage int64  `json:"total_storage"`
+}
+
+func loadUsage(ctx context.Context, db *gorm.DB, l logger.Logger, user *model.User) (*usagePayload, error) {
 	var totalVideos int64
 	if err := db.WithContext(ctx).Model(&model.Video{}).Where("user_id = ?", user.ID).Count(&totalVideos).Error; err != nil {
 		l.Error("Failed to count user videos", "error", err, "user_id", user.ID)
 		return nil, err
 	}
 
-	return &UsagePayload{
+	return &usagePayload{
 		UserID:       user.ID,
 		TotalVideos:  totalVideos,
 		TotalStorage: user.StorageUsed,
diff --git a/internal/api/auth/user_payload.go b/internal/rpc/app/user_payload.go
similarity index 88%
rename from internal/api/auth/user_payload.go
rename to internal/rpc/app/user_payload.go
index 4e1f480..e10c24d 100644
--- a/internal/api/auth/user_payload.go
+++ b/internal/rpc/app/user_payload.go
@@ -1,4 +1,4 @@
-package auth
+package app
 
 import (
 	"context"
@@ -10,7 +10,7 @@ import (
 	"stream.api/internal/database/model"
 )
 
-type UserPayload struct {
+type userPayload struct {
 	ID                string     `json:"id"`
 	Email             string     `json:"email"`
 	Username          *string    `json:"username,omitempty"`
@@ -31,7 +31,7 @@ type UserPayload struct {
 	UpdatedAt         time.Time  `json:"updated_at"`
 }
 
-func BuildUserPayload(ctx context.Context, db *gorm.DB, user *model.User) (*UserPayload, error) {
+func buildUserPayload(ctx context.Context, db *gorm.DB, user *model.User) (*userPayload, error) {
 	pref, err := model.FindOrCreateUserPreference(ctx, db, user.ID)
 	if err != nil {
 		return nil, err
@@ -76,13 +76,13 @@ func BuildUserPayload(ctx context.Context, db *gorm.DB, user *model.User) (*User
 
 		if expiresAt.After(now) {
 			effectivePlanID = &subscription.PlanID
-			planExpiringSoon = model.IsSubscriptionExpiringSoon(expiresAt, now)
+			planExpiringSoon = isPlanExpiringSoon(expiresAt, now)
 		} else {
 			effectivePlanID = nil
 		}
 	}
 
-	return &UserPayload{
+	return &userPayload{
 		ID:                user.ID,
 		Email:             user.Email,
 		Username:          user.Username,
@@ -112,3 +112,9 @@ func normalizePlanPaymentMethod(value string) string {
 		return "wallet"
 	}
 }
+
+func isPlanExpiringSoon(expiresAt time.Time, now time.Time) bool {
+	hoursUntilExpiry := expiresAt.Sub(now).Hours()
+	const thresholdHours = 7 * 24
+	return hoursUntilExpiry > 0 && hoursUntilExpiry <= thresholdHours
+}
diff --git a/internal/video/interfaces.go b/internal/video/interfaces.go
new file mode 100644
index 0000000..c9fafe6
--- /dev/null
+++ b/internal/video/interfaces.go
@@ -0,0 +1,34 @@
+package video
+
+import (
+	"context"
+
+	runtimedomain "stream.api/internal/video/runtime/domain"
+	runtimeservices "stream.api/internal/video/runtime/services"
+)
+
+type Job = runtimedomain.Job
+
+type AgentWithStats = runtimeservices.AgentWithStats
+
+type PaginatedJobs = runtimeservices.PaginatedJobs
+
+var ErrInvalidJobCursor = runtimeservices.ErrInvalidJobCursor
+
+type JobService interface {
+	CreateJob(ctx context.Context, userID string, videoID string, name string, config []byte, priority int, timeLimit int64) (*Job, error)
+	ListJobs(ctx context.Context, offset, limit int) (*PaginatedJobs, error)
+	ListJobsByAgent(ctx context.Context, agentID string, offset, limit int) (*PaginatedJobs, error)
+	ListJobsByCursor(ctx context.Context, agentID string, cursor string, pageSize int) (*PaginatedJobs, error)
+	GetJob(ctx context.Context, id string) (*Job, error)
+	CancelJob(ctx context.Context, id string) error
+	RetryJob(ctx context.Context, id string) (*Job, error)
+	SubscribeJobLogs(ctx context.Context, jobID string) (<-chan runtimedomain.LogEntry, error)
+	SubscribeJobUpdates(ctx context.Context) (<-chan string, error)
+	SubscribeSystemResources(ctx context.Context) (<-chan runtimedomain.SystemResource, error)
+}
+
+type AgentRuntime interface {
+	ListAgentsWithStats() []*AgentWithStats
+	SendCommand(agentID string, cmd string) bool
+}
diff --git a/internal/video/runtime/adapters/queue/redis/adapter.go b/internal/video/runtime/adapters/queue/redis/adapter.go
index 79dfb2e..26105a9 100644
--- a/internal/video/runtime/adapters/queue/redis/adapter.go
+++ b/internal/video/runtime/adapters/queue/redis/adapter.go
@@ -152,8 +152,8 @@ func (r *Adapter) SubscribeCancel(ctx context.Context, agentID string) (<-chan s
 	return ch, nil
 }
 
-func (r *Adapter) PublishJobUpdate(ctx context.Context, jobID string, status string) error {
-	payload, err := json.Marshal(map[string]string{"job_id": jobID, "status": status})
+func (r *Adapter) PublishJobUpdate(ctx context.Context, jobID string, status string, videoID string) error {
+	payload, err := json.Marshal(map[string]string{"job_id": jobID, "status": status, "video_id": videoID})
 	if err != nil {
 		return err
 	}
diff --git a/internal/video/runtime/domain/job.go b/internal/video/runtime/domain/job.go
index a357e1e..2226ff6 100644
--- a/internal/video/runtime/domain/job.go
+++ b/internal/video/runtime/domain/job.go
@@ -17,6 +17,7 @@ type Job struct {
 	Status        JobStatus `json:"status" gorm:"type:varchar(32);index"`
 	Priority      int       `json:"priority" gorm:"default:0;index"`
 	UserID        string    `json:"user_id" gorm:"index"`
+	VideoID       string    `json:"video_id,omitempty"`
 	Name          string    `json:"name"`
 	TimeLimit     int64     `json:"time_limit"`
 	InputURL      string    `json:"input_url"`
diff --git a/internal/video/runtime/module.go b/internal/video/runtime/module.go
index 302cf49..98a77d6 100644
--- a/internal/video/runtime/module.go
+++ b/internal/video/runtime/module.go
@@ -9,6 +9,7 @@ import (
 	"gorm.io/gorm"
 	"stream.api/internal/config"
 	apprpc "stream.api/internal/rpc/app"
+	"stream.api/internal/video"
 	redisadapter "stream.api/internal/video/runtime/adapters/queue/redis"
 	runtimegrpc "stream.api/internal/video/runtime/grpc"
 	"stream.api/internal/video/runtime/services"
@@ -36,16 +37,17 @@ func NewModule(ctx context.Context, cfg *config.Config, db *gorm.DB, cacheClient
 	healthService := services.NewHealthService(db, adapter.Client(), cfg.Render.ServiceName)
 	grpcServer := runtimegrpc.NewServer(jobService, cfg.Render.AgentSecret)
 	module := &Module{ctx: ctx, cfg: cfg, jobService: jobService, healthService: healthService, grpcServer: grpcServer, grpcRaw: grpcpkg.NewServer()}
-	if publisher, err := newMQTTPublisher(jobService, grpcServer, appLogger); err != nil {
+	if publisher, err := NewMQTTBootstrap(jobService, grpcServer, appLogger); err != nil {
 		appLogger.Error("Failed to initialize MQTT publisher", "error", err)
 	} else {
-		module.mqttPublisher = publisher
+		module.mqttPublisher = publisher.mqttPublisher
 		grpcServer.SetAgentEventHandler(func(eventType string, agent *services.AgentWithStats) {
-			publishAgentEvent(publisher.client, appLogger, eventType, agent)
+			PublishAgentMQTTEvent(publisher.Client(), appLogger, eventType, agent)
 		})
 	}
+	videoService := video.NewService(db, jobService)
 	grpcServer.Register(module.grpcRaw)
-	apprpc.Register(module.grpcRaw, apprpc.NewServices(cacheClient, tokenProvider, db, appLogger, cfg, jobService, grpcServer))
+	apprpc.Register(module.grpcRaw, apprpc.NewServices(cacheClient, tokenProvider, db, appLogger, cfg, videoService, grpcServer))
 	if module.mqttPublisher != nil {
 		module.mqttPublisher.start(ctx)
 	}
diff --git a/internal/video/runtime/mqtt_publisher.go b/internal/video/runtime/mqtt_publisher.go
index 166a35b..b34f6d0 100644
--- a/internal/video/runtime/mqtt_publisher.go
+++ b/internal/video/runtime/mqtt_publisher.go
@@ -20,12 +20,16 @@ const (
 type mqttPublisher struct {
 	client     mqtt.Client
 	jobService *services.JobService
-	agentRT    interface{ ListAgentsWithStats() []*services.AgentWithStats }
-	logger     logger.Logger
-	prefix     string
+	agentRT    interface {
+		ListAgentsWithStats() []*services.AgentWithStats
+	}
+	logger logger.Logger
+	prefix string
 }
 
-func newMQTTPublisher(jobService *services.JobService, agentRT interface{ ListAgentsWithStats() []*services.AgentWithStats }, appLogger logger.Logger) (*mqttPublisher, error) {
+func newMQTTPublisher(jobService *services.JobService, agentRT interface {
+	ListAgentsWithStats() []*services.AgentWithStats
+}, appLogger logger.Logger) (*mqttPublisher, error) {
 	opts := mqtt.NewClientOptions()
 	opts.AddBroker(defaultMQTTBrokerURL)
 	opts.SetClientID(fmt.Sprintf("stream-api-%d", time.Now().UnixNano()))
@@ -133,7 +137,7 @@ func (p *mqttPublisher) consumeResources(ctx context.Context) {
 						continue
 					}
 					agentPayload, _ := json.Marshal(map[string]any{
-						"type": "agent_update",
+						"type":    "agent_update",
 						"payload": mapAgentPayload(agent),
 					})
 					p.publish(fmt.Sprintf("%s/events", p.prefix), agentPayload)
@@ -157,18 +161,18 @@ func mapAgentPayload(agent *services.AgentWithStats) map[string]any {
 		return map[string]any{}
 	}
 	return map[string]any{
-		"id":             agent.ID,
-		"name":           agent.Name,
-		"platform":       agent.Platform,
-		"backend":        agent.Backend,
-		"version":        agent.Version,
-		"capacity":       agent.Capacity,
-		"status":         string(agent.Status),
-		"cpu":            agent.CPU,
-		"ram":            agent.RAM,
-		"last_heartbeat": agent.LastHeartbeat,
-		"created_at":     agent.CreatedAt,
-		"updated_at":     agent.UpdatedAt,
+		"id":               agent.ID,
+		"name":             agent.Name,
+		"platform":         agent.Platform,
+		"backend":          agent.Backend,
+		"version":          agent.Version,
+		"capacity":         agent.Capacity,
+		"status":           string(agent.Status),
+		"cpu":              agent.CPU,
+		"ram":              agent.RAM,
+		"last_heartbeat":   agent.LastHeartbeat,
+		"created_at":       agent.CreatedAt,
+		"updated_at":       agent.UpdatedAt,
 		"active_job_count": agent.ActiveJobCount,
 	}
 }
@@ -204,3 +208,33 @@ func publishResourceEvent(client mqtt.Client, appLogger logger.Logger, entry dom
 	token := client.Publish(fmt.Sprintf("%s/events", defaultMQTTPrefix), 0, false, payload)
 	token.WaitTimeout(5 * time.Second)
 }
+
+type MQTTBootstrap struct{ *mqttPublisher }
+
+func NewMQTTBootstrap(jobService *services.JobService, agentRT interface {
+	ListAgentsWithStats() []*services.AgentWithStats
+}, appLogger logger.Logger) (*MQTTBootstrap, error) {
+	publisher, err := newMQTTPublisher(jobService, agentRT, appLogger)
+	if err != nil {
+		return nil, err
+	}
+	return &MQTTBootstrap{mqttPublisher: publisher}, nil
+}
+
+func (b *MQTTBootstrap) Start(ctx context.Context) {
+	if b == nil || b.mqttPublisher == nil {
+		return
+	}
+	b.mqttPublisher.start(ctx)
+}
+
+func (b *MQTTBootstrap) Client() mqtt.Client {
+	if b == nil || b.mqttPublisher == nil {
+		return nil
+	}
+	return b.client
+}
+
+func PublishAgentMQTTEvent(client mqtt.Client, appLogger logger.Logger, eventType string, agent *services.AgentWithStats) {
+	publishAgentEvent(client, appLogger, eventType, agent)
+}
diff --git a/internal/video/runtime/services/job_service.go b/internal/video/runtime/services/job_service.go
index 686def1..8aa3f8c 100644
--- a/internal/video/runtime/services/job_service.go
+++ b/internal/video/runtime/services/job_service.go
@@ -2,7 +2,9 @@ package services
 
 import (
 	"context"
+	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"regexp"
 	"strconv"
@@ -23,7 +25,7 @@ type LogPubSub interface {
 	Publish(ctx context.Context, jobID string, logLine string, progress float64) error
 	PublishResource(ctx context.Context, agentID string, data []byte) error
 	PublishCancel(ctx context.Context, agentID string, jobID string) error
-	PublishJobUpdate(ctx context.Context, jobID string, status string) error
+	PublishJobUpdate(ctx context.Context, jobID string, status string, videoID string) error
 	Subscribe(ctx context.Context, jobID string) (<-chan domain.LogEntry, error)
 	SubscribeResources(ctx context.Context) (<-chan domain.SystemResource, error)
 	SubscribeCancel(ctx context.Context, agentID string) (<-chan string, error)
@@ -39,12 +41,29 @@ func NewJobService(queue JobQueue, pubsub LogPubSub) *JobService {
 	return &JobService{queue: queue, pubsub: pubsub}
 }
 
+var ErrInvalidJobCursor = errors.New("invalid job cursor")
+
+const (
+	defaultJobPageSize = 20
+	maxJobPageSize     = 100
+	jobCursorVersion   = 1
+)
+
 type PaginatedJobs struct {
-	Jobs    []*domain.Job `json:"jobs"`
-	Total   int64         `json:"total"`
-	Offset  int           `json:"offset"`
-	Limit   int           `json:"limit"`
-	HasMore bool          `json:"has_more"`
+	Jobs       []*domain.Job `json:"jobs"`
+	Total      int64         `json:"total"`
+	Offset     int           `json:"offset"`
+	Limit      int           `json:"limit"`
+	HasMore    bool          `json:"has_more"`
+	NextCursor string        `json:"next_cursor,omitempty"`
+	PageSize   int           `json:"page_size"`
+}
+
+type jobListCursor struct {
+	Version           int    `json:"v"`
+	CreatedAtUnixNano int64  `json:"created_at_unix_nano"`
+	ID                string `json:"id"`
+	AgentID           string `json:"agent_id,omitempty"`
 }
 
 type jobConfigEnvelope struct {
@@ -53,6 +72,7 @@ type jobConfigEnvelope struct {
 	Environment map[string]string `json:"environment,omitempty"`
 	Name        string            `json:"name,omitempty"`
 	UserID      string            `json:"user_id,omitempty"`
+	VideoID     string            `json:"video_id,omitempty"`
 	TimeLimit   int64             `json:"time_limit,omitempty"`
 }
 
@@ -60,7 +80,6 @@ func strPtr(v string) *string        { return &v }
 func int64Ptr(v int64) *int64        { return &v }
 func boolPtr(v bool) *bool           { return &v }
 func float64Ptr(v float64) *float64  { return &v }
-func int32Ptr(v int32) *int32        { return &v }
 func timePtr(v time.Time) *time.Time { return &v }
 
 func parseJobConfig(raw *string) jobConfigEnvelope {
@@ -72,7 +91,7 @@ func parseJobConfig(raw *string) jobConfigEnvelope {
 	return cfg
 }
 
-func encodeJobConfig(raw []byte, name, userID string, timeLimit int64) string {
+func encodeJobConfig(raw []byte, name, userID, videoID string, timeLimit int64) string {
 	cfg := parseJobConfig(strPtr(string(raw)))
 	if name != "" {
 		cfg.Name = name
@@ -80,6 +99,9 @@ func encodeJobConfig(raw []byte, name, userID string, timeLimit int64) string {
 	if userID != "" {
 		cfg.UserID = userID
 	}
+	if videoID != "" {
+		cfg.VideoID = videoID
+	}
 	if timeLimit > 0 {
 		cfg.TimeLimit = timeLimit
 	}
@@ -87,12 +109,87 @@ func encodeJobConfig(raw []byte, name, userID string, timeLimit int64) string {
 	return string(encoded)
 }
 
+func normalizeJobPageSize(pageSize int) int {
+	if pageSize <= 0 {
+		return defaultJobPageSize
+	}
+	if pageSize > maxJobPageSize {
+		return maxJobPageSize
+	}
+	return pageSize
+}
+
+func encodeJobListCursor(cursor jobListCursor) (string, error) {
+	payload, err := json.Marshal(cursor)
+	if err != nil {
+		return "", err
+	}
+	return base64.RawURLEncoding.EncodeToString(payload), nil
+}
+
+func decodeJobListCursor(raw string) (*jobListCursor, error) {
+	raw = strings.TrimSpace(raw)
+	if raw == "" {
+		return nil, nil
+	}
+	payload, err := base64.RawURLEncoding.DecodeString(raw)
+	if err != nil {
+		return nil, ErrInvalidJobCursor
+	}
+	var cursor jobListCursor
+	if err := json.Unmarshal(payload, &cursor); err != nil {
+		return nil, ErrInvalidJobCursor
+	}
+	if cursor.Version != jobCursorVersion || cursor.CreatedAtUnixNano <= 0 || strings.TrimSpace(cursor.ID) == "" {
+		return nil, ErrInvalidJobCursor
+	}
+	cursor.ID = strings.TrimSpace(cursor.ID)
+	cursor.AgentID = strings.TrimSpace(cursor.AgentID)
+	return &cursor, nil
+}
+
+func buildJobListCursor(job *model.Job, agentID string) (string, error) {
+	if job == nil || job.CreatedAt == nil {
+		return "", nil
+	}
+	return encodeJobListCursor(jobListCursor{
+		Version:           jobCursorVersion,
+		CreatedAtUnixNano: job.CreatedAt.UTC().UnixNano(),
+		ID:                strings.TrimSpace(job.ID),
+		AgentID:           strings.TrimSpace(agentID),
+	})
+}
+
+func listJobsByOffset(ctx context.Context, agentID string, offset, limit int) (*PaginatedJobs, error) {
+	if offset < 0 {
+		offset = 0
+	}
+	limit = normalizeJobPageSize(limit)
+	q := query.Job.WithContext(ctx).Order(query.Job.CreatedAt.Desc(), query.Job.ID.Desc())
+	if agentID != "" {
+		agentNumeric, err := strconv.ParseInt(agentID, 10, 64)
+		if err != nil {
+			return &PaginatedJobs{Jobs: []*domain.Job{}, Total: 0, Offset: offset, Limit: limit, PageSize: limit, HasMore: false}, nil
+		}
+		q = q.Where(query.Job.AgentID.Eq(agentNumeric))
+	}
+	jobs, total, err := q.FindByPage(offset, limit)
+	if err != nil {
+		return nil, err
+	}
+	items := make([]*domain.Job, 0, len(jobs))
+	for _, job := range jobs {
+		items = append(items, toDomainJob(job))
+	}
+	return &PaginatedJobs{Jobs: items, Total: total, Offset: offset, Limit: limit, PageSize: limit, HasMore: offset+len(items) < int(total)}, nil
+}
+
 func toDomainJob(job *model.Job) *domain.Job {
 	if job == nil {
 		return nil
 	}
 	cfg := parseJobConfig(job.Config)
-	result := &domain.Job{ID: job.ID, Name: cfg.Name, UserID: cfg.UserID, TimeLimit: cfg.TimeLimit}
+	result := &domain.Job{ID: job.ID, Name: cfg.Name, UserID: cfg.UserID, VideoID: cfg.VideoID, TimeLimit: cfg.TimeLimit}
 	if job.Status != nil {
 		result.Status = domain.JobStatus(*job.Status)
 	}
@@ -142,14 +239,14 @@ func toDomainJob(job *model.Job) *domain.Job {
 	return result
 }
 
-func (s *JobService) CreateJob(ctx context.Context, userID string, name string, config []byte, priority int, timeLimit int64) (*domain.Job, error) {
+func (s *JobService) CreateJob(ctx context.Context, userID string, videoID string, name string, config []byte, priority int, timeLimit int64) (*domain.Job, error) {
 	status := string(domain.JobStatusPending)
 	now := time.Now()
 	job := &model.Job{
 		ID:         fmt.Sprintf("job-%d", now.UnixNano()),
 		Status:     strPtr(status),
 		Priority:   int64Ptr(int64(priority)),
-		Config:     strPtr(encodeJobConfig(config, name, userID, timeLimit)),
+		Config:     strPtr(encodeJobConfig(config, name, userID, videoID, timeLimit)),
 		Cancelled:  boolPtr(false),
 		RetryCount: int64Ptr(0),
 		MaxRetries: int64Ptr(3),
@@ -159,52 +256,86 @@ func (s *JobService) CreateJob(ctx context.Context, userID string, name string,
 	if err := query.Job.WithContext(ctx).Create(job); err != nil {
 		return nil, err
 	}
+	if err := syncVideoStatus(ctx, videoID, domain.JobStatusPending); err != nil {
+		return nil, err
+	}
 	domainJob := toDomainJob(job)
 	if err := s.queue.Enqueue(ctx, domainJob); err != nil {
 		return nil, err
 	}
+	_ = s.pubsub.PublishJobUpdate(ctx, job.ID, status, videoID)
 	return domainJob, nil
 }
 
 func (s *JobService) ListJobs(ctx context.Context, offset, limit int) (*PaginatedJobs, error) {
-	if offset < 0 {
-		offset = 0
-	}
-	if limit <= 0 || limit > 100 {
-		limit = 20
-	}
-	jobs, total, err := query.Job.WithContext(ctx).Order(query.Job.CreatedAt.Desc()).FindByPage(offset, limit)
-	if err != nil {
-		return nil, err
-	}
-	items := make([]*domain.Job, 0, len(jobs))
-	for _, job := range jobs {
-		items = append(items, toDomainJob(job))
-	}
-	return &PaginatedJobs{Jobs: items, Total: total, Offset: offset, Limit: limit, HasMore: offset+len(items) < int(total)}, nil
+	return listJobsByOffset(ctx, "", offset, limit)
 }
 
 func (s *JobService) ListJobsByAgent(ctx context.Context, agentID string, offset, limit int) (*PaginatedJobs, error) {
-	if offset < 0 {
-		offset = 0
-	}
-	if limit <= 0 || limit > 100 {
-		limit = 20
-	}
-	agentNumeric, err := strconv.ParseInt(agentID, 10, 64)
-	if err != nil {
-		return &PaginatedJobs{Jobs: []*domain.Job{}, Total: 0, Offset: offset, Limit: limit, HasMore: false}, nil
-	}
-	q := query.Job.WithContext(ctx).Where(query.Job.AgentID.Eq(agentNumeric)).Order(query.Job.CreatedAt.Desc())
-	jobs, total, err := q.FindByPage(offset, limit)
+	return listJobsByOffset(ctx, strings.TrimSpace(agentID), offset, limit)
+}
+
+func (s *JobService) ListJobsByCursor(ctx context.Context, agentID string, cursor string, pageSize int) (*PaginatedJobs, error) {
+	agentID = strings.TrimSpace(agentID)
+	pageSize = normalizeJobPageSize(pageSize)
+
+	decodedCursor, err := decodeJobListCursor(cursor)
 	if err != nil {
 		return nil, err
 	}
+	if decodedCursor != nil && decodedCursor.AgentID != agentID {
+		return nil, ErrInvalidJobCursor
+	}
+
+	q := query.Job.WithContext(ctx).Order(query.Job.CreatedAt.Desc(), query.Job.ID.Desc())
+	if agentID != "" {
+		agentNumeric, err := strconv.ParseInt(agentID, 10, 64)
+		if err != nil {
+			return &PaginatedJobs{Jobs: []*domain.Job{}, Total: 0, Limit: pageSize, PageSize: pageSize, HasMore: false}, nil
+		}
+		q = q.Where(query.Job.AgentID.Eq(agentNumeric))
+	}
+	var cursorTime time.Time
+	if decodedCursor != nil {
+		cursorTime = time.Unix(0, decodedCursor.CreatedAtUnixNano).UTC()
+	}
+
+	queryDB := q.UnderlyingDB()
+	if decodedCursor != nil {
+		queryDB = queryDB.Where("(created_at < ?) OR (created_at = ? AND id < ?)", cursorTime, cursorTime, decodedCursor.ID)
+	}
+
+	var jobs []*model.Job
+	if err := queryDB.Limit(pageSize + 1).Find(&jobs).Error; err != nil {
+		return nil, err
+	}
+
+	hasMore := len(jobs) > pageSize
+	if hasMore {
+		jobs = jobs[:pageSize]
+	}
+
 	items := make([]*domain.Job, 0, len(jobs))
 	for _, job := range jobs {
 		items = append(items, toDomainJob(job))
 	}
-	return &PaginatedJobs{Jobs: items, Total: total, Offset: offset, Limit: limit, HasMore: offset+len(items) < int(total)}, nil
+
+	nextCursor := ""
+	if hasMore && len(jobs) > 0 {
+		nextCursor, err = buildJobListCursor(jobs[len(jobs)-1], agentID)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return &PaginatedJobs{
+		Jobs:       items,
+		Total:      0,
+		Limit:      pageSize,
+		PageSize:   pageSize,
+		HasMore:    hasMore,
+		NextCursor: nextCursor,
+	}, nil
 }
 
 func (s *JobService) GetJob(ctx context.Context, id string) (*domain.Job, error) {
@@ -242,7 +373,11 @@ func (s *JobService) UpdateJobStatus(ctx context.Context, jobID string, status d
 	if err := query.Job.WithContext(ctx).Save(job); err != nil {
 		return err
 	}
-	return s.pubsub.PublishJobUpdate(ctx, jobID, string(status))
+	cfg := parseJobConfig(job.Config)
+	if err := syncVideoStatus(ctx, cfg.VideoID, status); err != nil {
+		return err
+	}
+	return s.pubsub.PublishJobUpdate(ctx, jobID, string(status), cfg.VideoID)
 }
 
 func (s *JobService) AssignJob(ctx context.Context, jobID string, agentID string) error {
@@ -262,7 +397,11 @@ func (s *JobService) AssignJob(ctx context.Context, jobID string, agentID string
 	if err := query.Job.WithContext(ctx).Save(job); err != nil {
 		return err
 	}
-	return s.pubsub.PublishJobUpdate(ctx, jobID, status)
+	cfg := parseJobConfig(job.Config)
+	if err := syncVideoStatus(ctx, cfg.VideoID, domain.JobStatusRunning); err != nil {
+		return err
+	}
+	return s.pubsub.PublishJobUpdate(ctx, jobID, status, cfg.VideoID)
 }
 
 func (s *JobService) CancelJob(ctx context.Context, jobID string) error {
@@ -286,7 +425,11 @@ func (s *JobService) CancelJob(ctx context.Context, jobID string) error {
 	if err := query.Job.WithContext(ctx).Save(job); err != nil {
 		return err
 	}
-	_ = s.pubsub.PublishJobUpdate(ctx, jobID, status)
+	cfg := parseJobConfig(job.Config)
+	if err := syncVideoStatus(ctx, cfg.VideoID, domain.JobStatusCancelled); err != nil {
+		return err
+	}
+	_ = s.pubsub.PublishJobUpdate(ctx, jobID, status, cfg.VideoID)
 	if job.AgentID != nil {
 		_ = s.pubsub.PublishCancel(ctx, strconv.FormatInt(*job.AgentID, 10), job.ID)
 	}
@@ -329,10 +472,15 @@ func (s *JobService) RetryJob(ctx context.Context, jobID string) (*domain.Job, e
 	if err := query.Job.WithContext(ctx).Save(job); err != nil {
 		return nil, err
 	}
+	cfg := parseJobConfig(job.Config)
+	if err := syncVideoStatus(ctx, cfg.VideoID, domain.JobStatusPending); err != nil {
+		return nil, err
+	}
 	domainJob := toDomainJob(job)
 	if err := s.queue.Enqueue(ctx, domainJob); err != nil {
 		return nil, err
 	}
+	_ = s.pubsub.PublishJobUpdate(ctx, jobID, pending, cfg.VideoID)
 	return domainJob, nil
 }
 
@@ -389,6 +537,29 @@ func (s *JobService) ProcessLog(ctx context.Context, jobID string, logData []byt
 	return s.pubsub.Publish(ctx, jobID, line, progress)
 }
 
+func syncVideoStatus(ctx context.Context, videoID string, status domain.JobStatus) error {
+	videoID = strings.TrimSpace(videoID)
+	if videoID == "" {
+		return nil
+	}
+
+	statusValue := "processing"
+	processingStatus := "PROCESSING"
+	switch status {
+	case domain.JobStatusSuccess:
+		statusValue = "ready"
+		processingStatus = "READY"
+	case domain.JobStatusFailure, domain.JobStatusCancelled:
+		statusValue = "failed"
+		processingStatus = "FAILED"
+	}
+
+	_, err := query.Video.WithContext(ctx).
+		Where(query.Video.ID.Eq(videoID)).
+		Updates(map[string]any{"status": statusValue, "processing_status": processingStatus})
+	return err
+}
+
 func (s *JobService) PublishSystemResources(ctx context.Context, agentID string, data []byte) error {
 	return s.pubsub.PublishResource(ctx, agentID, data)
 }
diff --git a/internal/video/service.go b/internal/video/service.go
new file mode 100644
index 0000000..b56c463
--- /dev/null
+++ b/internal/video/service.go
@@ -0,0 +1,250 @@
+package video
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"net/url"
+	"strings"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+	"stream.api/internal/database/model"
+)
+
+var (
+	ErrUserNotFound          = errors.New("user not found")
+	ErrAdTemplateNotFound    = errors.New("ad template not found")
+	ErrJobServiceUnavailable = errors.New("job service is unavailable")
+)
+
+type Service struct {
+	db         *gorm.DB
+	jobService JobService
+}
+
+type CreateVideoInput struct {
+	UserID       string
+	Title        string
+	Description  *string
+	URL          string
+	Size         int64
+	Duration     int32
+	Format       string
+	AdTemplateID *string
+}
+
+type CreateVideoResult struct {
+	Video *model.Video
+	Job   *Job
+}
+
+func NewService(db *gorm.DB, jobService JobService) *Service {
+	return &Service{db: db, jobService: jobService}
+}
+
+func (s *Service) JobService() JobService {
+	if s == nil {
+		return nil
+	}
+	return s.jobService
+}
+
+func (s *Service) CreateVideo(ctx context.Context, input CreateVideoInput) (*CreateVideoResult, error) {
+	if s == nil || s.db == nil {
+		return nil, gorm.ErrInvalidDB
+	}
+
+	userID := strings.TrimSpace(input.UserID)
+	if userID == "" {
+		return nil, ErrUserNotFound
+	}
+
+	var user model.User
+	if err := s.db.WithContext(ctx).Where("id = ?", userID).First(&user).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, ErrUserNotFound
+		}
+		return nil, err
+	}
+
+	title := strings.TrimSpace(input.Title)
+	videoURL := strings.TrimSpace(input.URL)
+	format := strings.TrimSpace(input.Format)
+	statusValue := "processing"
+	processingStatus := "PENDING"
+	storageType := detectStorageType(videoURL)
+
+	video := &model.Video{
+		ID:               uuid.NewString(),
+		UserID:           user.ID,
+		Name:             title,
+		Title:            title,
+		Description:      nullableTrimmedString(input.Description),
+		URL:              videoURL,
+		Size:             input.Size,
+		Duration:         input.Duration,
+		Format:           format,
+		Status:           model.StringPtr(statusValue),
+		ProcessingStatus: model.StringPtr(processingStatus),
+		StorageType:      model.StringPtr(storageType),
+	}
+	if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		if err := tx.Create(video).Error; err != nil {
+			return err
+		}
+		if err := tx.Model(&model.User{}).Where("id = ?", user.ID).UpdateColumn("storage_used", gorm.Expr("storage_used + ?", video.Size)).Error; err != nil {
+			return err
+		}
+		return saveVideoAdConfig(ctx, tx, video, user.ID, input.AdTemplateID)
+	}); err != nil {
+		return nil, err
+	}
+
+	if s.jobService == nil {
+		_ = markVideoJobFailed(ctx, s.db, video.ID)
+		return nil, ErrJobServiceUnavailable
+	}
+
+	jobPayload, err := buildJobPayload(video.ID, user.ID, videoURL, format)
+	if err != nil {
+		_ = markVideoJobFailed(ctx, s.db, video.ID)
+		return nil, err
+	}
+
+	job, err := s.jobService.CreateJob(ctx, user.ID, video.ID, title, jobPayload, 0, 0)
+	if err != nil {
+		_ = markVideoJobFailed(ctx, s.db, video.ID)
+		return nil, err
+	}
+
+	return &CreateVideoResult{Video: video, Job: job}, nil
+}
+
+func (s *Service) ListJobs(ctx context.Context, offset, limit int) (*PaginatedJobs, error) {
+	if s == nil || s.jobService == nil {
+		return nil, ErrJobServiceUnavailable
+	}
+	return s.jobService.ListJobs(ctx, offset, limit)
+}
+
+func (s *Service) ListJobsByAgent(ctx context.Context, agentID string, offset, limit int) (*PaginatedJobs, error) {
+	if s == nil || s.jobService == nil {
+		return nil, ErrJobServiceUnavailable
+	}
+	return s.jobService.ListJobsByAgent(ctx, agentID, offset, limit)
+}
+
+func (s *Service) ListJobsByCursor(ctx context.Context, agentID string, cursor string, pageSize int) (*PaginatedJobs, error) {
+	if s == nil || s.jobService == nil {
+		return nil, ErrJobServiceUnavailable
+	}
+	return s.jobService.ListJobsByCursor(ctx, agentID, cursor, pageSize)
+}
+
+func (s *Service) GetJob(ctx context.Context, id string) (*Job, error) {
+	if s == nil || s.jobService == nil {
+		return nil, ErrJobServiceUnavailable
+	}
+	return s.jobService.GetJob(ctx, id)
+}
+
+func (s *Service) CreateJob(ctx context.Context, userID string, videoID string, name string, config []byte, priority int, timeLimit int64) (*Job, error) {
+	if s == nil || s.jobService == nil {
+		return nil, ErrJobServiceUnavailable
+	}
+	return s.jobService.CreateJob(ctx, userID, videoID, name, config, priority, timeLimit)
+}
+
+func (s *Service) CancelJob(ctx context.Context, id string) error {
+	if s == nil || s.jobService == nil {
+		return ErrJobServiceUnavailable
+	}
+	return s.jobService.CancelJob(ctx, id)
+}
+
+func (s *Service) RetryJob(ctx context.Context, id string) (*Job, error) {
+	if s == nil || s.jobService == nil {
+		return nil, ErrJobServiceUnavailable
+	}
+	return s.jobService.RetryJob(ctx, id)
+}
+
+func buildJobPayload(videoID, userID, videoURL, format string) ([]byte, error) {
+	return json.Marshal(map[string]any{
+		"video_id":   videoID,
+		"user_id":    userID,
+		"input_url":  videoURL,
+		"source_url": videoURL,
+		"format":     format,
+	})
+}
+
+func saveVideoAdConfig(ctx context.Context, tx *gorm.DB, video *model.Video, userID string, adTemplateID *string) error {
+	if video == nil || adTemplateID == nil {
+		return nil
+	}
+
+	trimmed := strings.TrimSpace(*adTemplateID)
+	if trimmed == "" {
+		if err := tx.WithContext(ctx).Model(&model.Video{}).Where("id = ?", video.ID).Update("ad_id", nil).Error; err != nil {
+			return err
+		}
+		video.AdID = nil
+		return nil
+	}
+
+	var template model.AdTemplate
+	if err := tx.WithContext(ctx).Select("id").Where("id = ? AND user_id = ?", trimmed, userID).First(&template).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return ErrAdTemplateNotFound
+		}
+		return err
+	}
+
+	if err := tx.WithContext(ctx).Model(&model.Video{}).Where("id = ?", video.ID).Update("ad_id", template.ID).Error; err != nil {
+		return err
+	}
+	video.AdID = &template.ID
+	return nil
+}
+
+func markVideoJobFailed(ctx context.Context, db *gorm.DB, videoID string) error {
+	if db == nil {
+		return nil
+	}
+	return db.WithContext(ctx).
+		Model(&model.Video{}).
+		Where("id = ?", strings.TrimSpace(videoID)).
+		Updates(map[string]any{"status": "failed", "processing_status": "FAILED"}).Error
+}
+
+func detectStorageType(rawURL string) string {
+	if shouldDeleteStoredObject(rawURL) {
+		return "S3"
+	}
+	return "WORKER"
+}
+
+func shouldDeleteStoredObject(rawURL string) bool {
+	trimmed := strings.TrimSpace(rawURL)
+	if trimmed == "" {
+		return false
+	}
+	parsed, err := url.Parse(trimmed)
+	if err != nil {
+		return !strings.HasPrefix(trimmed, "/")
+	}
+	return parsed.Scheme == "" && parsed.Host == "" && !strings.HasPrefix(trimmed, "/")
+}
+
+func nullableTrimmedString(value *string) *string {
+	if value == nil {
+		return nil
+	}
+	trimmed := strings.TrimSpace(*value)
+	if trimmed == "" {
+		return nil
+	}
+	return &trimmed
+}
diff --git a/migrate_player_configs.sh b/migrate_player_configs.sh
new file mode 100755
index 0000000..92bf39e
--- /dev/null
+++ b/migrate_player_configs.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+# Full migration script for player_configs feature
+# This script:
+#   1. Runs the SQL migration to create player_configs table
+#   2. Migrates data from user_preferences to player_configs
+#   3. Removes player-related columns from user_preferences
+#   4. Regenerates Go models to reflect schema changes
+#
+# Usage: ./migrate_player_configs.sh
+
+set -e
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+
+# Database config from config.yaml or environment
+DB_HOST="${DB_HOST:-47.84.63.130}"
+DB_PORT="${DB_PORT:-5432}"
+DB_NAME="${DB_NAME:-video_db}"
+DB_USER="${DB_USER:-postgres}"
+DB_PASSWORD="${DB_PASSWORD:-D@tkhong9}"
+
+export PGPASSWORD="$DB_PASSWORD"
+
+echo -e "${BLUE}============================================${NC}"
+echo -e "${BLUE}  Player Configs Migration Script${NC}"
+echo -e "${BLUE}============================================${NC}"
+echo ""
+
+# Step 1: Run SQL migration
+echo -e "${YELLOW}[Step 1/3] Running SQL migration...${NC}"
+psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$DB_NAME" -f full_player_configs_migration.sql
+
+if [ $? -ne 0 ]; then
+    echo -e "${RED}SQL migration failed!${NC}"
+    exit 1
+fi
+echo -e "${GREEN}✓ SQL migration completed${NC}"
+echo ""
+
+# Step 2: Regenerate Go models
+echo -e "${YELLOW}[Step 2/3] Regenerating Go models...${NC}"
+go run cmd/gendb/main.go
+
+if [ $? -ne 0 ]; then
+    echo -e "${RED}Model generation failed!${NC}"
+    echo -e "${YELLOW}Note: You may need to manually update the model files.${NC}"
+    exit 1
+fi
+echo -e "${GREEN}✓ Go models regenerated${NC}"
+echo ""
+
+# Step 3: Build to verify
+echo -e "${YELLOW}[Step 3/3] Building to verify changes...${NC}"
+go build -o bin/api ./cmd/api
+
+if [ $? -ne 0 ]; then
+    echo -e "${RED}Build failed!${NC}"
+    exit 1
+fi
+echo -e "${GREEN}✓ Build successful${NC}"
+echo ""
+
+unset PGPASSWORD
+
+echo -e "${GREEN}============================================${NC}"
+echo -e "${GREEN}  Migration completed successfully!${NC}"
+echo -e "${GREEN}============================================${NC}"
+echo ""
+echo -e "${BLUE}Summary of changes:${NC}"
+echo "  ✓ player_configs table created"
+echo "  ✓ Data migrated from user_preferences"
+echo "  ✓ Player columns removed from user_preferences:"
+echo "    - autoplay, loop, muted"
+echo "    - show_controls, pip, airplay, chromecast"
+echo "    - encrytion_m3u8"
+echo "  ✓ Go models regenerated"
+echo ""
+echo -e "${YELLOW}Note: Please restart your application to apply changes.${NC}"
diff --git a/migrations/001_create_player_configs_table.sql b/migrations/001_create_player_configs_table.sql
new file mode 100644
index 0000000..ef4981b
--- /dev/null
+++ b/migrations/001_create_player_configs_table.sql
@@ -0,0 +1,65 @@
+-- Migration: Create player_configs table
+-- Created: 2026-03-19
+-- Description: Creates the player_configs table for storing multiple player configurations per user
+
+-- Create player_configs table
+CREATE TABLE IF NOT EXISTS player_configs (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    user_id UUID NOT NULL REFERENCES "user"(id) ON DELETE CASCADE,
+    name TEXT NOT NULL,
+    description TEXT,
+    autoplay BOOLEAN NOT NULL DEFAULT FALSE,
+    loop BOOLEAN NOT NULL DEFAULT FALSE,
+    muted BOOLEAN NOT NULL DEFAULT FALSE,
+    show_controls BOOLEAN NOT NULL DEFAULT TRUE,
+    pip BOOLEAN NOT NULL DEFAULT TRUE,
+    airplay BOOLEAN NOT NULL DEFAULT TRUE,
+    chromecast BOOLEAN NOT NULL DEFAULT TRUE,
+    is_active BOOLEAN NOT NULL DEFAULT TRUE,
+    is_default BOOLEAN NOT NULL DEFAULT FALSE,
+    created_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP(3) WITHOUT TIME ZONE NOT NULL,
+    version BIGINT NOT NULL DEFAULT 1
+);
+
+-- Index for user_id to optimize queries by user
+CREATE INDEX IF NOT EXISTS idx_player_configs_user_id ON player_configs(user_id);
+
+-- Index for is_default to optimize default config lookups
+CREATE INDEX IF NOT EXISTS idx_player_configs_is_default ON player_configs(is_default);
+
+-- Composite index for user + is_default (common query pattern)
+CREATE INDEX IF NOT EXISTS idx_player_configs_user_default ON player_configs(user_id, is_default);
+
+-- Trigger function to update updated_at and version on row update
+CREATE OR REPLACE FUNCTION update_player_configs_updated_at()
+RETURNS TRIGGER AS $$
+BEGIN
+    NEW.updated_at = CURRENT_TIMESTAMP;
+    NEW.version = OLD.version + 1;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Trigger to auto-update updated_at and version
+CREATE OR REPLACE TRIGGER trg_update_player_configs
+BEFORE UPDATE ON player_configs
+FOR EACH ROW
+EXECUTE FUNCTION update_player_configs_updated_at();
+
+-- Comments for documentation
+COMMENT ON TABLE player_configs IS 'Stores multiple player configurations per user for video playback settings';
+COMMENT ON COLUMN player_configs.id IS 'Unique identifier for the player config (UUID)';
+COMMENT ON COLUMN player_configs.user_id IS 'Reference to the user who owns this config';
+COMMENT ON COLUMN player_configs.name IS 'Human-readable name for the configuration';
+COMMENT ON COLUMN player_configs.description IS 'Optional description of the configuration';
+COMMENT ON COLUMN player_configs.autoplay IS 'Whether videos should autoplay';
+COMMENT ON COLUMN player_configs.loop IS 'Whether videos should loop on end';
+COMMENT ON COLUMN player_configs.muted IS 'Whether videos should start muted';
+COMMENT ON COLUMN player_configs.show_controls IS 'Whether to show player controls';
+COMMENT ON COLUMN player_configs.pip IS 'Whether Picture-in-Picture is enabled';
+COMMENT ON COLUMN player_configs.airplay IS 'Whether AirPlay is enabled';
+COMMENT ON COLUMN player_configs.chromecast IS 'Whether Chromecast is enabled';
+COMMENT ON COLUMN player_configs.is_active IS 'Whether this config is active';
+COMMENT ON COLUMN player_configs.is_default IS 'Whether this is the default config for new videos';
+COMMENT ON COLUMN player_configs.version IS 'Optimistic locking version number';
diff --git a/migrations/002_migrate_player_settings.sql b/migrations/002_migrate_player_settings.sql
new file mode 100644
index 0000000..768354e
--- /dev/null
+++ b/migrations/002_migrate_player_settings.sql
@@ -0,0 +1,134 @@
+-- Migration: Migrate player settings from user_preferences to player_configs
+-- Created: 2026-03-19
+-- Description:
+--   1. Creates player_configs records from existing user_preferences player settings
+--   2. Removes player-related columns from user_preferences table
+--   3. Removes encrytion_m3u8 column (VIP feature not in use)
+--
+-- IMPORTANT: Run this AFTER 001_create_player_configs_table.sql
+-- Usage: psql -h <host> -U postgres -d video_db -f 002_migrate_player_settings.sql
+
+BEGIN;
+
+-- ============================================================
+-- STEP 1: Migrate existing player settings to player_configs
+-- ============================================================
+
+-- Insert player configs for all users that have user_preferences
+-- Each user gets one default config with their existing settings
+INSERT INTO player_configs (
+    id,
+    user_id,
+    name,
+    description,
+    autoplay,
+    loop,
+    muted,
+    show_controls,
+    pip,
+    airplay,
+    chromecast,
+    is_active,
+    is_default,
+    created_at,
+    updated_at,
+    version
+)
+SELECT
+    gen_random_uuid() AS id,
+    up.user_id,
+    'Default Config' AS name,
+    'Migrated from user_preferences' AS description,
+    COALESCE(up.autoplay, FALSE) AS autoplay,
+    COALESCE(up.loop, FALSE) AS loop,
+    COALESCE(up.muted, FALSE) AS muted,
+    COALESCE(up.show_controls, TRUE) AS show_controls,
+    COALESCE(up.pip, TRUE) AS pip,
+    COALESCE(up.airplay, TRUE) AS airplay,
+    COALESCE(up.chromecast, TRUE) AS chromecast,
+    TRUE AS is_active,
+    TRUE AS is_default,
+    COALESCE(up.created_at, CURRENT_TIMESTAMP) AS created_at,
+    CURRENT_TIMESTAMP AS updated_at,
+    COALESCE(up.version, 1) AS version
+FROM user_preferences up
+WHERE NOT EXISTS (
+    -- Skip if user already has a player config (from previous migration)
+    SELECT 1 FROM player_configs pc WHERE pc.user_id = up.user_id AND pc.is_default = TRUE
+);
+
+-- Also handle users that exist in "user" table but don't have user_preferences yet
+-- They won't get a config now, but will get default values when they first access settings
+
+-- ============================================================
+-- STEP 2: Remove player-related columns from user_preferences
+-- ============================================================
+
+-- Drop player settings columns
+ALTER TABLE user_preferences
+    DROP COLUMN IF EXISTS autoplay,
+    DROP COLUMN IF EXISTS loop,
+    DROP COLUMN IF EXISTS muted,
+    DROP COLUMN IF EXISTS show_controls,
+    DROP COLUMN IF EXISTS pip,
+    DROP COLUMN IF EXISTS airplay,
+    DROP COLUMN IF EXISTS chromecast;
+
+-- Drop encrytion_m3u8 column (VIP feature not in use)
+ALTER TABLE user_preferences
+    DROP COLUMN IF EXISTS encrytion_m3u8;
+
+-- ============================================================
+-- STEP 3: Add constraint to ensure one default config per user
+-- ============================================================
+
+-- Create a partial unique index to ensure only one is_default = TRUE per user
+-- This prevents multiple default configs per user
+CREATE UNIQUE INDEX IF NOT EXISTS idx_player_configs_one_default_per_user
+ON player_configs(user_id)
+WHERE is_default = TRUE;
+
+-- ============================================================
+-- STEP 4: Verify migration
+-- ============================================================
+
+-- Count migrated configs
+DO $$
+DECLARE
+    migrated_count INTEGER;
+    user_count INTEGER;
+BEGIN
+    SELECT COUNT(*) INTO migrated_count FROM player_configs WHERE description = 'Migrated from user_preferences';
+    SELECT COUNT(*) INTO user_count FROM "user";
+
+    RAISE NOTICE '============================================';
+    RAISE NOTICE 'Migration completed successfully!';
+    RAISE NOTICE '============================================';
+    RAISE NOTICE 'Users in system: %', user_count;
+    RAISE NOTICE 'Player configs created: %', migrated_count;
+    RAISE NOTICE '============================================';
+END $$;
+
+COMMIT;
+
+-- ============================================================
+-- Verification queries (run after migration)
+-- ============================================================
+
+-- Verify player_configs structure
+SELECT column_name, data_type, is_nullable, column_default
+FROM information_schema.columns
+WHERE table_name = 'player_configs'
+ORDER BY ordinal_position;
+
+-- Verify user_preferences structure (should not have player columns anymore)
+SELECT column_name, data_type
+FROM information_schema.columns
+WHERE table_name = 'user_preferences'
+ORDER BY ordinal_position;
+
+-- Sample migrated data
+SELECT pc.user_id, pc.name, pc.autoplay, pc.loop, pc.muted, pc.is_default
+FROM player_configs pc
+WHERE pc.description = 'Migrated from user_preferences'
+LIMIT 5;
diff --git a/migrations/003_add_user_referrals.sql b/migrations/003_add_user_referrals.sql
new file mode 100644
index 0000000..5de8250
--- /dev/null
+++ b/migrations/003_add_user_referrals.sql
@@ -0,0 +1,17 @@
+-- Migration: Add user referral state
+-- Created: 2026-03-23
+-- Description: Adds minimal referral linkage and first-subscription reward tracking fields to user
+
+BEGIN;
+
+ALTER TABLE "user"
+    ADD COLUMN IF NOT EXISTS referred_by_user_id UUID REFERENCES "user"(id) ON DELETE SET NULL,
+    ADD COLUMN IF NOT EXISTS referral_eligible BOOLEAN NOT NULL DEFAULT TRUE,
+    ADD COLUMN IF NOT EXISTS referral_reward_bps INTEGER,
+    ADD COLUMN IF NOT EXISTS referral_reward_granted_at TIMESTAMP WITH TIME ZONE,
+    ADD COLUMN IF NOT EXISTS referral_reward_payment_id UUID,
+    ADD COLUMN IF NOT EXISTS referral_reward_amount NUMERIC(65,30);
+
+CREATE INDEX IF NOT EXISTS idx_user_referred_by_user_id ON "user"(referred_by_user_id);
+
+COMMIT;
diff --git a/proto/app/v1/account.proto b/proto/app/v1/account.proto
index 6b5b2c0..34e96af 100644
--- a/proto/app/v1/account.proto
+++ b/proto/app/v1/account.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package stream.app.v1;
 
 option go_package = "stream.api/internal/gen/proto/app/v1;appv1";
-
+import "google/protobuf/wrappers.proto"; 
 import "app/v1/common.proto";
 
 service AccountService {
@@ -11,6 +11,7 @@ service AccountService {
   rpc UpdateMe(UpdateMeRequest) returns (UpdateMeResponse);
   rpc DeleteMe(DeleteMeRequest) returns (MessageResponse);
   rpc ClearMyData(ClearMyDataRequest) returns (MessageResponse);
+  rpc GetUserById (google.protobuf.StringValue) returns (User) {}
 }
 
 service PreferencesService {
@@ -41,6 +42,7 @@ message UpdateMeRequest {
   optional string email = 2;
   optional string language = 3;
   optional string locale = 4;
+  optional string telegram_id = 5;
 }
 
 message UpdateMeResponse {
diff --git a/proto/app/v1/admin.proto b/proto/app/v1/admin.proto
index 9f4cc12..2902e28 100644
--- a/proto/app/v1/admin.proto
+++ b/proto/app/v1/admin.proto
@@ -12,6 +12,7 @@ service AdminService {
   rpc GetAdminUser(GetAdminUserRequest) returns (GetAdminUserResponse);
   rpc CreateAdminUser(CreateAdminUserRequest) returns (CreateAdminUserResponse);
   rpc UpdateAdminUser(UpdateAdminUserRequest) returns (UpdateAdminUserResponse);
+  rpc UpdateAdminUserReferralSettings(UpdateAdminUserReferralSettingsRequest) returns (UpdateAdminUserReferralSettingsResponse);
   rpc UpdateAdminUserRole(UpdateAdminUserRoleRequest) returns (UpdateAdminUserRoleResponse);
   rpc DeleteAdminUser(DeleteAdminUserRequest) returns (MessageResponse);
   rpc ListAdminVideos(ListAdminVideosRequest) returns (ListAdminVideosResponse);
@@ -32,6 +33,11 @@ service AdminService {
   rpc CreateAdminAdTemplate(CreateAdminAdTemplateRequest) returns (CreateAdminAdTemplateResponse);
   rpc UpdateAdminAdTemplate(UpdateAdminAdTemplateRequest) returns (UpdateAdminAdTemplateResponse);
   rpc DeleteAdminAdTemplate(DeleteAdminAdTemplateRequest) returns (MessageResponse);
+  rpc ListAdminPlayerConfigs(ListAdminPlayerConfigsRequest) returns (ListAdminPlayerConfigsResponse);
+  rpc GetAdminPlayerConfig(GetAdminPlayerConfigRequest) returns (GetAdminPlayerConfigResponse);
+  rpc CreateAdminPlayerConfig(CreateAdminPlayerConfigRequest) returns (CreateAdminPlayerConfigResponse);
+  rpc UpdateAdminPlayerConfig(UpdateAdminPlayerConfigRequest) returns (UpdateAdminPlayerConfigResponse);
+  rpc DeleteAdminPlayerConfig(DeleteAdminPlayerConfigRequest) returns (MessageResponse);
   rpc ListAdminJobs(ListAdminJobsRequest) returns (ListAdminJobsResponse);
   rpc GetAdminJob(GetAdminJobRequest) returns (GetAdminJobResponse);
   rpc GetAdminJobLogs(GetAdminJobLogsRequest) returns (GetAdminJobLogsResponse);
@@ -96,6 +102,19 @@ message UpdateAdminUserResponse {
   AdminUser user = 1;
 }
 
+message UpdateAdminUserReferralSettingsRequest {
+  string id = 1;
+  optional string ref_username = 2;
+  optional bool clear_referrer = 3;
+  optional bool referral_eligible = 4;
+  optional int32 referral_reward_bps = 5;
+  optional bool clear_referral_reward_bps = 6;
+}
+
+message UpdateAdminUserReferralSettingsResponse {
+  AdminUserDetail user = 1;
+}
+
 message UpdateAdminUserRoleRequest {
   string id = 1;
   string role = 2;
@@ -319,8 +338,81 @@ message DeleteAdminAdTemplateRequest {
   string id = 1;
 }
 
+message ListAdminPlayerConfigsRequest {
+  int32 page = 1;
+  int32 limit = 2;
+  optional string user_id = 3;
+  optional string search = 4;
+}
+
+message ListAdminPlayerConfigsResponse {
+  repeated AdminPlayerConfig configs = 1;
+  int64 total = 2;
+  int32 page = 3;
+  int32 limit = 4;
+}
+
+message GetAdminPlayerConfigRequest {
+  string id = 1;
+}
+
+message GetAdminPlayerConfigResponse {
+  AdminPlayerConfig config = 1;
+}
+
+message CreateAdminPlayerConfigRequest {
+  string user_id = 1;
+  string name = 2;
+  optional string description = 3;
+  bool autoplay = 4;
+  bool loop = 5;
+  bool muted = 6;
+  bool show_controls = 7;
+  bool pip = 8;
+  bool airplay = 9;
+  bool chromecast = 10;
+  optional bool is_active = 11;
+  optional bool is_default = 12;
+  optional bool encrytion_m3u8 = 13;
+  optional string logo_url = 14;
+}
+
+message CreateAdminPlayerConfigResponse {
+  AdminPlayerConfig config = 1;
+}
+
+message UpdateAdminPlayerConfigRequest {
+  string id = 1;
+  string user_id = 2;
+  string name = 3;
+  optional string description = 4;
+  bool autoplay = 5;
+  bool loop = 6;
+  bool muted = 7;
+  bool show_controls = 8;
+  bool pip = 9;
+  bool airplay = 10;
+  bool chromecast = 11;
+  optional bool is_active = 12;
+  optional bool is_default = 13;
+  optional bool encrytion_m3u8 = 14;
+  optional string logo_url = 15;
+}
+
+message UpdateAdminPlayerConfigResponse {
+  AdminPlayerConfig config = 1;
+}
+
+message DeleteAdminPlayerConfigRequest {
+  string id = 1;
+}
+
 message ListAdminJobsRequest {
+  optional string cursor = 4;
+  int32 page_size = 5;
+  // Deprecated: use cursor for keyset pagination.
   int32 offset = 1;
+  // Deprecated: use page_size for keyset pagination.
   int32 limit = 2;
   optional string agent_id = 3;
 }
@@ -331,6 +423,8 @@ message ListAdminJobsResponse {
   int32 offset = 3;
   int32 limit = 4;
   bool has_more = 5;
+  optional string next_cursor = 6;
+  int32 page_size = 7;
 }
 
 message GetAdminJobRequest {
@@ -357,6 +451,7 @@ message CreateAdminJobRequest {
   optional string user_id = 5;
   optional string name = 6;
   int64 time_limit = 7;
+  optional string video_id = 8;
 }
 
 message CreateAdminJobResponse {
diff --git a/proto/app/v1/auth.proto b/proto/app/v1/auth.proto
index 9aaa9f8..4a31150 100644
--- a/proto/app/v1/auth.proto
+++ b/proto/app/v1/auth.proto
@@ -30,6 +30,7 @@ message RegisterRequest {
   string username = 1;
   string email = 2;
   string password = 3;
+  optional string ref_username = 4;
 }
 
 message RegisterResponse {
@@ -60,6 +61,7 @@ message GetGoogleLoginUrlResponse {
 
 message CompleteGoogleLoginRequest {
   string code = 1;
+  optional string ref_username = 2;
 }
 
 message CompleteGoogleLoginResponse {
diff --git a/proto/app/v1/catalog.proto b/proto/app/v1/catalog.proto
index 356deed..02c0b5d 100644
--- a/proto/app/v1/catalog.proto
+++ b/proto/app/v1/catalog.proto
@@ -19,6 +19,13 @@ service AdTemplatesService {
   rpc DeleteAdTemplate(DeleteAdTemplateRequest) returns (MessageResponse);
 }
 
+service PlayerConfigsService {
+  rpc ListPlayerConfigs(ListPlayerConfigsRequest) returns (ListPlayerConfigsResponse);
+  rpc CreatePlayerConfig(CreatePlayerConfigRequest) returns (CreatePlayerConfigResponse);
+  rpc UpdatePlayerConfig(UpdatePlayerConfigRequest) returns (UpdatePlayerConfigResponse);
+  rpc DeletePlayerConfig(DeletePlayerConfigRequest) returns (MessageResponse);
+}
+
 service PlansService {
   rpc ListPlans(ListPlansRequest) returns (ListPlansResponse);
 }
@@ -80,6 +87,57 @@ message DeleteAdTemplateRequest {
   string id = 1;
 }
 
+message ListPlayerConfigsRequest {}
+
+message ListPlayerConfigsResponse {
+  repeated PlayerConfig configs = 1;
+}
+
+message CreatePlayerConfigRequest {
+  string name = 1;
+  optional string description = 2;
+  bool autoplay = 3;
+  bool loop = 4;
+  bool muted = 5;
+  bool show_controls = 6;
+  bool pip = 7;
+  bool airplay = 8;
+  bool chromecast = 9;
+  optional bool is_active = 10;
+  optional bool is_default = 11;
+  optional bool encrytion_m3u8 = 12;
+  optional string logo_url = 13;
+}
+
+message CreatePlayerConfigResponse {
+  PlayerConfig config = 1;
+}
+
+message UpdatePlayerConfigRequest {
+  string id = 1;
+  string name = 2;
+  optional string description = 3;
+  bool autoplay = 4;
+  bool loop = 5;
+  bool muted = 6;
+  bool show_controls = 7;
+  bool pip = 8;
+  bool airplay = 9;
+  bool chromecast = 10;
+  optional bool is_active = 11;
+  optional bool is_default = 12;
+  optional bool encrytion_m3u8 = 13;
+  optional string logo_url = 14;
+}
+
+message UpdatePlayerConfigResponse {
+  PlayerConfig config = 1;
+}
+
+message DeletePlayerConfigRequest {
+  string id = 1;
+}
+
 message ListPlansRequest {}
 
 message ListPlansResponse {
diff --git a/proto/app/v1/common.proto b/proto/app/v1/common.proto
index 1ffa13a..d8cbbf7 100644
--- a/proto/app/v1/common.proto
+++ b/proto/app/v1/common.proto
@@ -27,8 +27,9 @@ message User {
   double wallet_balance = 14;
   string language = 15;
   string locale = 16;
-  google.protobuf.Timestamp created_at = 17;
-  google.protobuf.Timestamp updated_at = 18;
+  string telegram_id = 17;
+  google.protobuf.Timestamp created_at = 18;
+  google.protobuf.Timestamp updated_at = 19;
 }
 
 message Preferences {
@@ -78,6 +79,46 @@ message AdTemplate {
   google.protobuf.Timestamp updated_at = 10;
 }
 
+message PlayerConfig {
+  string id = 1;
+  string name = 2;
+  optional string description = 3;
+  bool autoplay = 4;
+  bool loop = 5;
+  bool muted = 6;
+  bool show_controls = 7;
+  bool pip = 8;
+  bool airplay = 9;
+  bool chromecast = 10;
+  bool is_active = 11;
+  bool is_default = 12;
+  google.protobuf.Timestamp created_at = 13;
+  google.protobuf.Timestamp updated_at = 14;
+  bool encrytion_m3u8 = 15;
+  optional string logo_url = 16;
+}
+
+message AdminPlayerConfig {
+  string id = 1;
+  string user_id = 2;
+  string name = 3;
+  optional string description = 4;
+  bool autoplay = 5;
+  bool loop = 6;
+  bool muted = 7;
+  bool show_controls = 8;
+  bool pip = 9;
+  bool airplay = 10;
+  bool chromecast = 11;
+  bool is_active = 12;
+  bool is_default = 13;
+  optional string owner_email = 14;
+  google.protobuf.Timestamp created_at = 15;
+  google.protobuf.Timestamp updated_at = 16;
+  bool encrytion_m3u8 = 17;
+  optional string logo_url = 18;
+}
+
 message Plan {
   string id = 1;
   string name = 2;
@@ -164,6 +205,7 @@ message Video {
   optional string storage_type = 12;
   google.protobuf.Timestamp created_at = 13;
   google.protobuf.Timestamp updated_at = 14;
+  optional string job_id = 15;
 }
 
 message AdminDashboard {
@@ -193,9 +235,28 @@ message AdminUser {
   google.protobuf.Timestamp updated_at = 12;
 }
 
+message ReferralUserSummary {
+  string id = 1;
+  string email = 2;
+  optional string username = 3;
+}
+
+message AdminUserReferralInfo {
+  optional ReferralUserSummary referrer = 1;
+  bool referral_eligible = 2;
+  double effective_reward_percent = 3;
+  optional double reward_override_percent = 4;
+  optional string share_link = 5;
+  bool reward_granted = 6;
+  google.protobuf.Timestamp reward_granted_at = 7;
+  optional string reward_payment_id = 8;
+  optional double reward_amount = 9;
+}
+
 message AdminUserDetail {
   AdminUser user = 1;
   optional PlanSubscription subscription = 2;
+  optional AdminUserReferralInfo referral = 3;
 }
 
 message AdminVideo {
@@ -213,6 +274,8 @@ message AdminVideo {
   optional string ad_template_name = 12;
   google.protobuf.Timestamp created_at = 13;
   google.protobuf.Timestamp updated_at = 14;
+  optional string processing_status = 15;
+  optional string job_id = 16;
 }
 
 message AdminPayment {
@@ -288,6 +351,7 @@ message AdminJob {
   int32 max_retries = 17;
   google.protobuf.Timestamp created_at = 18;
   google.protobuf.Timestamp updated_at = 19;
+  optional string video_id = 20;
 }
 
 message AdminAgent {
diff --git a/proto/app/v1/payments.proto b/proto/app/v1/payments.proto
index 7985411..138f4b7 100644
--- a/proto/app/v1/payments.proto
+++ b/proto/app/v1/payments.proto
@@ -28,10 +28,18 @@ message CreatePaymentResponse {
   string message = 5;
 }
 
-message ListPaymentHistoryRequest {}
+message ListPaymentHistoryRequest {
+  int32 page = 1;
+  int32 limit = 2;
+}
 
 message ListPaymentHistoryResponse {
   repeated PaymentHistoryItem payments = 1;
+  int64 total = 2;
+  int32 page = 3;
+  int32 limit = 4;
+  bool has_prev = 5;
+  bool has_next = 6;
 }
 
 message TopupWalletRequest {
diff --git a/run_migration.sh b/run_migration.sh
new file mode 100755
index 0000000..9a73f1b
--- /dev/null
+++ b/run_migration.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Migration runner script for stream.api
+# Usage: ./run_migration.sh [migration_file.sql]
+
+set -e
+
+# Load environment variables from config if exists
+if [ -f "config.yaml" ]; then
+    echo "Loading configuration from config.yaml..."
+fi
+
+# Database connection parameters (adjust these based on your config)
+DB_HOST="${DB_HOST:-localhost}"
+DB_PORT="${DB_PORT:-5432}"
+DB_NAME="${DB_NAME:-stream}"
+DB_USER="${DB_USER:-postgres}"
+DB_PASSWORD="${DB_PASSWORD:-}"
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+echo -e "${GREEN}=== Stream API Migration Runner ===${NC}"
+
+# Check if psql is available
+if ! command -v psql &> /dev/null; then
+    echo -e "${RED}Error: psql command not found. Please install PostgreSQL client.${NC}"
+    exit 1
+fi
+
+# Build connection string
+export PGPASSWORD="$DB_PASSWORD"
+
+# Run specific migration or all migrations
+if [ -n "$1" ]; then
+    MIGRATION_FILE="$1"
+    if [ ! -f "$MIGRATION_FILE" ]; then
+        echo -e "${RED}Error: Migration file '$MIGRATION_FILE' not found${NC}"
+        exit 1
+    fi
+    echo -e "${YELLOW}Running migration: $MIGRATION_FILE${NC}"
+    psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$DB_NAME" -f "$MIGRATION_FILE"
+    echo -e "${GREEN}✓ Migration completed successfully${NC}"
+else
+    # Run all migrations in order
+    echo -e "${YELLOW}Running all migrations in ./migrations/...${NC}"
+    for migration in $(ls -1 migrations/*.sql 2>/dev/null | sort); do
+        echo -e "${YELLOW}Running: $migration${NC}"
+        psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$DB_NAME" -f "$migration"
+        echo -e "${GREEN}✓ Completed: $migration${NC}"
+        echo ""
+    done
+    echo -e "${GREEN}=== All migrations completed ===${NC}"
+fi
+
+unset PGPASSWORD