diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f26cdc6..7fb867d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ on:
     branches: [main]
 
 env:
-  IMAGE_NAME: student-service
+  IMAGE_NAME: user-service
   GO_VERSION: "1.22"
 
 jobs:
@@ -100,7 +100,7 @@ jobs:
       - name: Deploy to Cloud Run
         uses: google-github-actions/deploy-cloudrun@v2
         with:
-          service: student-service
+          service: user-service
           region: us-central1
           image: docker.io/${{ secrets.DOCKER_USERNAME }}/${{ secrets.IMAGE_NAME }}:latest
           flags: --allow-unauthenticated --port=${{ secrets.SERVER_PORT }}
@@ -111,5 +111,5 @@ jobs:
 
       - name: Summary
         run: |
-          echo "✅ Deployment triggered for student-service"
+          echo "✅ Deployment triggered for user-service"
           echo "🐳 Image: ${{ secrets.DOCKER_USERNAME }}/${{ secrets.IMAGE_NAME }}:latest"
diff --git a/README.md b/README.md
index 549facf..13d91d8 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ A production-ready Go microservice for student management with comprehensive sec
 ### 1. Clone and Setup
 
 ```bash
-cd /workspaces/student-service
+cd /workspaces/user-service
 cp .env.example .env
 ```
 
@@ -112,12 +112,12 @@ go mod verify
 ### 4. Run the Service
 
 ```bash
-# Development mode (with auto-reload)
-go run main.go
+# Development mode
+go run .
 
 # Or build and run
-go build -o student-service .
-./student-service
+go build -o user-service .
+./user-service
 ```
 
 ### 5. Access Services
@@ -367,7 +367,7 @@ See [test/README.md](test/README.md) and [test/QUICKSTART.md](test/QUICKSTART.md
 
 ### Build Image
 ```bash
-docker build -t student-service:dev .
+docker build -t user-service:dev .
 ```
 
 ### Run Container
@@ -378,8 +378,8 @@ docker run -d \
   -e MONGODB_DB=usersdb \
   -e SERVER_PORT=5001 \
   -e JWT_SECRET='your-strong-secret' \
-  --name student-service \
-  student-service:dev
+  --name user-service \
+  user-service:dev
 ```
 
 ### With Docker Compose
@@ -391,7 +391,7 @@ docker-compose up -d
 
 ### Project Structure
 ```
-student-service/
+user-service/
 ├── config/              # MongoDB configuration
 │   └── database.go
 ├── types/               # Data type definitions
diff --git a/README_API.md b/README_API.md
index e0e545e..8670a83 100644
--- a/README_API.md
+++ b/README_API.md
@@ -38,7 +38,7 @@ The server will start on `http://localhost:8080`
 
 ### 2. Register Student
 - **POST** `/auth/register`
-- Register a new student with the following JSON body:
+- Register a new user with the following JSON body:
 
 ```json
 {
@@ -71,7 +71,7 @@ The server will start on `http://localhost:8080`
 ### Using cURL
 
 ```bash
-# Register a new student
+# Register a new user
 curl -X POST http://localhost:8080/auth/register \
   -H "Content-Type: application/json" \
   -d '{
diff --git a/go.mod b/go.mod
index 2bb940b..fbcb78a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,34 +1,23 @@
-module github.com/y4-systems/student-service
+module github.com/y4-systems/user-service
 
 go 1.24.0
 
 require (
 	github.com/golang-jwt/jwt/v5 v5.2.0
 	github.com/joho/godotenv v1.5.1
-	github.com/swaggo/swag v1.16.6
 	go.mongodb.org/mongo-driver v1.17.9
 	golang.org/x/crypto v0.33.0
 	golang.org/x/time v0.14.0
 )
 
 require (
-	github.com/KyleBanks/depth v1.2.1 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/spec v0.20.6 // indirect
-	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/klauspost/compress v1.17.6 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.2.0 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
-	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/sync v0.11.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
diff --git a/go.sum b/go.sum
index a5a478e..b1bf382 100644
--- a/go.sum
+++ b/go.sum
@@ -1,19 +1,5 @@
-github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
-github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
-github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
-github.com/go-openapi/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jIQ=
-github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
-github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
 github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
@@ -22,32 +8,10 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI=
 github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/swaggo/swag v1.16.6 h1:qBNcx53ZaX+M5dxVyTrgQ0PJ/ACK+NzhwcbieTt+9yI=
-github.com/swaggo/swag v1.16.6/go.mod h1:ngP2etMK5a0P3QBizic5MEwpRmluJZPHjXcMoj4Xesg=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.2.0 h1:bYKF2AEwG5rqd1BumT4gAnvwU/M9nBp2pTSxeZw7Wvs=
@@ -64,8 +28,6 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
 golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@@ -91,17 +53,4 @@ golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/main.go b/main.go
index d4adc93..a20a34e 100644
--- a/main.go
+++ b/main.go
@@ -13,13 +13,12 @@ import (
 	"reflect"
 
 	"github.com/joho/godotenv"
-	"github.com/y4-systems/student-service/config"
-	"github.com/y4-systems/student-service/types"
+	"github.com/y4-systems/user-service/config"
+	"github.com/y4-systems/user-service/types"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"golang.org/x/crypto/bcrypt"
 	"golang.org/x/time/rate"
-	_ "github.com/y4-systems/student-service/docs"
 )
 
 // @title Student Service API
@@ -80,7 +79,7 @@ func main() {
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.Path == "/" {
 			w.Header().Set("Content-Type", "text/html; charset=utf-8")
-			fmt.Fprintf(w, `<html><body><h1>Student Service</h1><a href="/swagger/index.html">Open Swagger API Docs</a></body></html>`)
+			fmt.Fprintf(w, `<html><body><h1>User Service</h1><a href="/swagger/index.html">Open Swagger API Docs</a></body></html>`)
 		} else {
 			http.NotFound(w, r)
 		}
@@ -203,8 +202,8 @@ func swaggerJSONHandler(w http.ResponseWriter, r *http.Request) {
     "schemes": %s,
     "swagger": "2.0",
     "info": {
-        "description": "A simple student management API with MongoDB and JWT authentication",
-        "title": "Student Service API",
+        "description": "A simple user management API with MongoDB and JWT authentication",
+		"title": "User Service API",
         "contact": {},
         "version": "1.0"
     },
@@ -220,7 +219,7 @@ func swaggerJSONHandler(w http.ResponseWriter, r *http.Request) {
     "paths": {
         "/auth/register": {
             "post": {
-                "description": "Register a new student with email, password, name, and phone",
+                "description": "Register a user with email, password, name, and phone",
                 "consumes": [
                     "application/json"
                 ],
@@ -228,7 +227,7 @@ func swaggerJSONHandler(w http.ResponseWriter, r *http.Request) {
                     "application/json"
                 ],
                 "tags": ["Auth"],
-                "summary": "Register a new student",
+                "summary": "Register a new user",
                 "parameters": [
                     {
                         "description": "Register Request",
@@ -417,7 +416,8 @@ func swaggerJSONHandler(w http.ResponseWriter, r *http.Request) {
             "properties": {
                 "id": {"type": "string"},
                 "email": {"type": "string"},
-                "name": {"type": "string"}
+                "name": {"type": "string"},
+                "role": {"type": "string"}
             }
         },
         "EnrollmentRecord": {
@@ -461,14 +461,222 @@ func swaggerUIHandler(w http.ResponseWriter, r *http.Request) {
     <head>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <title>Swagger UI</title>
+		<title>User Service Swagger UI</title>
         <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist/swagger-ui.css" />
+		<style>
+			body {
+				margin: 0;
+			}
+
+			.theme-toggle {
+				position: fixed;
+				top: 12px;
+				right: 12px;
+				z-index: 10000;
+				border: 1px solid #3b4151;
+				border-radius: 6px;
+				padding: 8px 12px;
+				cursor: pointer;
+				font-size: 14px;
+				background: #ffffff;
+				color: #3b4151;
+			}
+
+			body.dark-mode {
+				background: #111827;
+			}
+
+			body.dark-mode .theme-toggle {
+				background: #1f2937;
+				color: #e5e7eb;
+				border-color: #374151;
+			}
+
+			body.dark-mode .swagger-ui,
+			body.dark-mode .swagger-ui .wrapper,
+			body.dark-mode .swagger-ui .information-container,
+			body.dark-mode .swagger-ui .scheme-container,
+			body.dark-mode .swagger-ui .opblock,
+			body.dark-mode .swagger-ui .opblock .opblock-summary,
+			body.dark-mode .swagger-ui .opblock-section,
+			body.dark-mode .swagger-ui .opblock-section-header,
+			body.dark-mode .swagger-ui .responses-inner,
+			body.dark-mode .swagger-ui .responses-table,
+			body.dark-mode .swagger-ui table,
+			body.dark-mode .swagger-ui .model-box,
+			body.dark-mode .swagger-ui .tab,
+			body.dark-mode .swagger-ui .highlight-code,
+			body.dark-mode .swagger-ui .microlight,
+			body.dark-mode .swagger-ui .opblock-body pre,
+			body.dark-mode .swagger-ui textarea,
+			body.dark-mode .swagger-ui input,
+			body.dark-mode .swagger-ui select {
+				background: #1f2937 !important;
+				color: #e5e7eb !important;
+				border-color: #374151 !important;
+			}
+
+			body.dark-mode .swagger-ui .topbar {
+				background-color: #111827 !important;
+			}
+
+			body.dark-mode .swagger-ui,
+			body.dark-mode .swagger-ui .info .title,
+			body.dark-mode .swagger-ui .info p,
+			body.dark-mode .swagger-ui .info li,
+			body.dark-mode .swagger-ui .opblock-tag,
+			body.dark-mode .swagger-ui .opblock-summary-description,
+			body.dark-mode .swagger-ui .opblock-summary-path,
+			body.dark-mode .swagger-ui .opblock-summary-method,
+			body.dark-mode .swagger-ui .opblock-section-header h4,
+			body.dark-mode .swagger-ui .opblock-section-header label,
+			body.dark-mode .swagger-ui .parameter__name,
+			body.dark-mode .swagger-ui .parameter__type,
+			body.dark-mode .swagger-ui .parameter__deprecated,
+			body.dark-mode .swagger-ui .parameter__in,
+			body.dark-mode .swagger-ui .response-col_status,
+			body.dark-mode .swagger-ui .response-col_description,
+			body.dark-mode .swagger-ui .response-col_description__inner,
+			body.dark-mode .swagger-ui .model-title,
+			body.dark-mode .swagger-ui .model,
+			body.dark-mode .swagger-ui .prop-name,
+			body.dark-mode .swagger-ui .prop-type,
+			body.dark-mode .swagger-ui .btn,
+			body.dark-mode .swagger-ui label,
+			body.dark-mode .swagger-ui h1,
+			body.dark-mode .swagger-ui h2,
+			body.dark-mode .swagger-ui h3,
+			body.dark-mode .swagger-ui h4,
+			body.dark-mode .swagger-ui h5,
+			body.dark-mode .swagger-ui h6,
+			body.dark-mode .swagger-ui span,
+			body.dark-mode .swagger-ui td,
+			body.dark-mode .swagger-ui th,
+			body.dark-mode .swagger-ui p,
+			body.dark-mode .swagger-ui a {
+				color: #e5e7eb !important;
+			}
+
+			body.dark-mode .swagger-ui .opblock.opblock-get,
+			body.dark-mode .swagger-ui .opblock.opblock-post,
+			body.dark-mode .swagger-ui .opblock.opblock-put,
+			body.dark-mode .swagger-ui .opblock.opblock-delete,
+			body.dark-mode .swagger-ui .opblock.opblock-patch {
+				border-color: #374151 !important;
+			}
+
+			body.dark-mode .swagger-ui .microlight span,
+			body.dark-mode .swagger-ui .highlight-code span,
+			body.dark-mode .swagger-ui pre,
+			body.dark-mode .swagger-ui code,
+			body.dark-mode .swagger-ui .markdown code {
+				color: #e5e7eb !important;
+			}
+
+			body.dark-mode .swagger-ui .btn.execute {
+				border-color: #60a5fa !important;
+				color: #60a5fa !important;
+				background: #1f2937 !important;
+			}
+
+			body.dark-mode .swagger-ui .try-out__btn,
+			body.dark-mode .swagger-ui .btn.try-out__btn,
+			body.dark-mode .swagger-ui .btn.cancel,
+			body.dark-mode .swagger-ui .btn.clear,
+			body.dark-mode .swagger-ui .btn.authorize,
+			body.dark-mode .swagger-ui .opblock-control-arrow {
+				color: #e5e7eb !important;
+				border-color: #4b5563 !important;
+				background: #1f2937 !important;
+			}
+
+			body.dark-mode .swagger-ui .parameters-col_description input::placeholder,
+			body.dark-mode .swagger-ui textarea::placeholder {
+				color: #9ca3af !important;
+			}
+
+			body.dark-mode .swagger-ui .dialog-ux .modal-ux,
+			body.dark-mode .swagger-ui .dialog-ux .modal-ux-content,
+			body.dark-mode .swagger-ui .dialog-ux .modal-ux-header,
+			body.dark-mode .swagger-ui .dialog-ux .modal-ux-body,
+			body.dark-mode .swagger-ui .dialog-ux .auth-container,
+			body.dark-mode .swagger-ui .dialog-ux .scope-def {
+				background: #1f2937 !important;
+				color: #e5e7eb !important;
+				border-color: #374151 !important;
+			}
+
+			body.dark-mode .swagger-ui .dialog-ux .modal-ux-header h3,
+			body.dark-mode .swagger-ui .dialog-ux .auth-container h4,
+			body.dark-mode .swagger-ui .dialog-ux .auth-container p,
+			body.dark-mode .swagger-ui .dialog-ux label,
+			body.dark-mode .swagger-ui .dialog-ux .scopes h2,
+			body.dark-mode .swagger-ui .dialog-ux .scope-def,
+			body.dark-mode .swagger-ui .dialog-ux .scope-def span,
+			body.dark-mode .swagger-ui .dialog-ux .errors-wrapper,
+			body.dark-mode .swagger-ui .dialog-ux .markdown p,
+			body.dark-mode .swagger-ui .dialog-ux .markdown code {
+				color: #e5e7eb !important;
+			}
+
+			body.dark-mode .swagger-ui .dialog-ux input[type=text],
+			body.dark-mode .swagger-ui .dialog-ux input[type=password] {
+				background: #111827 !important;
+				color: #e5e7eb !important;
+				border: 1px solid #4b5563 !important;
+			}
+
+			body.dark-mode .swagger-ui .dialog-ux .btn,
+			body.dark-mode .swagger-ui .dialog-ux .btn.modal-btn {
+				background: #1f2937 !important;
+				color: #e5e7eb !important;
+				border-color: #4b5563 !important;
+			}
+
+			body.dark-mode .swagger-ui .dialog-ux .btn.authorize {
+				color: #60a5fa !important;
+				border-color: #60a5fa !important;
+			}
+
+			body.dark-mode .swagger-ui .dialog-ux .close-modal {
+				color: #e5e7eb !important;
+			}
+
+			body.dark-mode .swagger-ui a {
+				color: #93c5fd !important;
+			}
+		</style>
     </head>
     <body>
+		<button id="theme-toggle" class="theme-toggle" type="button">🌙 Dark</button>
         <div id="swagger-ui"></div>
         <script src="https://unpkg.com/swagger-ui-dist/swagger-ui-bundle.js"></script>
         <script>
+			function applyTheme(theme) {
+				const dark = theme === 'dark';
+				document.body.classList.toggle('dark-mode', dark);
+				const btn = document.getElementById('theme-toggle');
+				if (btn) {
+					btn.textContent = dark ? '☀️ Light' : '🌙 Dark';
+				}
+			}
+
+			function getInitialTheme() {
+				const saved = localStorage.getItem('swagger-theme');
+				if (saved === 'dark' || saved === 'light') return saved;
+				return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+			}
+
             window.onload = function() {
+				let theme = getInitialTheme();
+				applyTheme(theme);
+
+				document.getElementById('theme-toggle').addEventListener('click', function() {
+					theme = theme === 'dark' ? 'light' : 'dark';
+					localStorage.setItem('swagger-theme', theme);
+					applyTheme(theme);
+				});
+
 				const ui = SwaggerUIBundle({
 					url: window.location.origin + '/swagger.json',
                     dom_id: '#swagger-ui',
@@ -664,8 +872,10 @@ func deleteStudent(ctx context.Context, collection interface{}, oid primitive.Ob
 }
 
 // registerHandler godoc
-// @Summary Register a new student
-// @Description Register a new student with email, password, name, and phone
+// @Summary Register a new user Available authorizations
+
+
+// @Description Register a new user with email, password, name, and phone
 // @Tags Auth
 // @Accept json
 // @Produce json
@@ -879,6 +1089,7 @@ func validateHandler(w http.ResponseWriter, r *http.Request) {
 		ID:    claims.ID,
 		Email: claims.Email,
 		Name:  claims.Name,
+		Role:  claims.Role,
 	}
 
 	w.Header().Set("Content-Type", "application/json")
diff --git a/test/QUICKSTART.md b/test/QUICKSTART.md
index 5ce0b60..0114594 100644
--- a/test/QUICKSTART.md
+++ b/test/QUICKSTART.md
@@ -4,7 +4,7 @@
 
 ### 1. Run Unit Tests (Fastest)
 ```bash
-cd /workspaces/student-service
+cd /workspaces/user-service
 go test -v -short ./test
 ```
 
@@ -38,14 +38,14 @@ go test -bench=. -benchmem ./test
 ### Start the Service
 ```bash
 # Terminal 1
-cd /workspaces/student-service
+cd /workspaces/user-service
 go run main.go
 ```
 
 ### Run Demo (Go)
 ```bash
 # Terminal 2
-cd /workspaces/student-service
+cd /workspaces/user-service
 go run test/demo/rate_limiter_demo.go
 ```
 
@@ -80,7 +80,7 @@ go run test/demo/rate_limiter_demo.go
 === RUN   Test_GetIPAddress_Priority
 --- PASS: Test_GetIPAddress_Priority (0.00s)
 PASS
-ok      github.com/y4-systems/student-service/test      0.006s
+ok      github.com/y4-systems/user-service/test      0.006s
 ```
 
 
diff --git a/test/README.md b/test/README.md
index 75ce573..bd08000 100644
--- a/test/README.md
+++ b/test/README.md
@@ -65,11 +65,11 @@ ok      test    1.234s
 ```bash
 # Make sure the service is running first!
 # In one terminal:
-cd /workspaces/student-service
+cd /workspaces/user-service
 go run main.go
 
 # In another terminal:
-cd /workspaces/student-service/test
+cd /workspaces/user-service/test
 go run demo/rate_limiter_demo.go
 
 # Or with custom URL:
@@ -181,7 +181,7 @@ This means:
 ### Problem: "Connection refused"
 **Solution:** Make sure the Student Service is running
 ```bash
-cd /workspaces/student-service
+cd /workspaces/user-service
 go run main.go
 ```
 
diff --git a/test_integration.sh b/test_integration.sh
index 9a52c00..e8c5196 100755
--- a/test_integration.sh
+++ b/test_integration.sh
@@ -29,7 +29,7 @@ if curl -s -f "$STUDENT_SERVICE/" > /dev/null 2>&1; then
     echo "✅ Running"
 else
     echo "❌ Not running"
-    echo "Start with: cd /workspaces/student-service && go run main.go"
+    echo "Start with: cd /workspaces/user-service && go run main.go"
     exit 1
 fi
 
diff --git a/types/student.go b/types/user.go
similarity index 98%
rename from types/student.go
rename to types/user.go
index c4cf83d..ed3c9c1 100644
--- a/types/student.go
+++ b/types/user.go
@@ -37,6 +37,7 @@ type ValidateResponse struct {
 	ID    string `json:"id"`
 	Email string `json:"email"`
 	Name  string `json:"name"`
+	Role  string `json:"role"`
 }
 
 // Student represents a student in MongoDB
diff --git a/student-service b/user-service
similarity index 66%
rename from student-service
rename to user-service
index f8c57a9..7cc3e8d 100755
Binary files a/student-service and b/user-service differ