diff --git a/endpoints/signup.post.py b/endpoints/signup.post.py
index 77e4d09..5627a8e 100644
--- a/endpoints/signup.post.py
+++ b/endpoints/signup.post.py
@@ -1,50 +1,27 @@
-from fastapi import APIRouter, HTTPException, Depends
+# Entity: User
+
+from fastapi import APIRouter, Depends, HTTPException, status
 from sqlalchemy.orm import Session
-from pydantic import BaseModel
 from core.database import get_db
-from core.auth import get_password_hash, create_access_token
-import uuid
 from models.user import User
+from schemas.user import UserSchema, UserCreate
 
 router = APIRouter()
 
-class UserCreate(BaseModel):
-    username: str
-    email: str
-    password: str
-
-@router.post("/signup")
-async def signup(
+@router.post("/signup", status_code=status.HTTP_201_CREATED, response_model=UserSchema)
+async def signup_user(
     user_data: UserCreate,
     db: Session = Depends(get_db)
 ):
-    """User registration endpoint"""
-    # Check existing user
-    db_user = db.query(User).filter(
-        (User.username == user_data.username) |
-        (User.email == user_data.email)
-    ).first()
-    
+    db_user = db.query(User).filter(User.email == user_data.email).first()
     if db_user:
         raise HTTPException(
-            status_code=400, 
-            detail="Username or email already exists"
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Email already registered"
         )
-
-    # Create new user
-    new_user = User(
-        id=str(uuid.uuid4()),
-        username=user_data.username,
-        email=user_data.email,
-        hashed_password=get_password_hash(user_data.password)
-    )
     
+    new_user = User(**user_data.dict())
     db.add(new_user)
     db.commit()
-
-    # Return token directly after registration
-    return {
-        "message": "User created successfully",
-        "access_token": create_access_token({"sub": new_user.id}),
-        "token_type": "bearer"
-    }
+    db.refresh(new_user)
+    return new_user
\ No newline at end of file