diff --git a/main.py b/main.py
index 9a697e5..2bc7f9d 100644
--- a/main.py
+++ b/main.py
@@ -35,12 +35,12 @@ def get_db():
 def home_page(request: Request, db: Session = Depends((get_db))):
     vm = homeviewmodel.HomeViewModel(db=db)
     books = vm.books
-    return templates.TemplateResponse('home/index.html', {"request": request, "books": books})
+    return templates.TemplateResponse(request,'home/index.html',{"books": books})
 
 
 @app.get("/author/add")
 def authors_add(request: Request):
-    return templates.TemplateResponse('authors/partials/add_authors_form.html', {"request": request})
+    return templates.TemplateResponse(request,'authors/partials/add_authors_form.html')
 
 
 @app.post("/authors/add")
@@ -52,9 +52,9 @@ def create_author(request: Request, email: str = Form(...), first_name: str = Fo
     dbs.create_author(db=db, author=author)
     url = request.headers.get('HX-Current-URL').split('/')[-1]
     if request.headers.get('HX-Request') and url == 'authors':
-        return templates.TemplateResponse('authors/partials/show_add_author_form.html', {"request": request})
+        return templates.TemplateResponse(request, 'authors/partials/show_add_author_form.html')
     elif request.headers.get('HX-Request') and url == '':
-        return templates.TemplateResponse('books/partials/show_add_form.html', {"request": request})
+        return templates.TemplateResponse(request, 'books/partials/show_add_form.html')
     else:
         pass
     return RedirectResponse(url="/", status_code=302)
@@ -64,35 +64,35 @@ def create_author(request: Request, email: str = Form(...), first_name: str = Fo
 def cancel_author(request: Request):
     url = request.headers.get('HX-Current-URL').split('/')[-1]
     if url == 'authors':
-        return templates.TemplateResponse('authors/partials/show_add_author_form.html', {"request": request})
-    return templates.TemplateResponse('books/partials/show_add_form.html', {"request": request})
+        return templates.TemplateResponse(request,'authors/partials/show_add_author_form.html')
+    return templates.TemplateResponse(request,'books/partials/show_add_form.html')
 
 
 @app.get("/authors/close_books/{author_id}")
 def close_authors_books(request: Request, author_id: int):
-    return templates.TemplateResponse('authors/partials/show_books.html', {"request": request, "author_id": author_id})
+    return templates.TemplateResponse(request,'authors/partials/show_books.html', {"author_id": author_id})
 
 
 @app.get("/authors")
 def show_authors(request: Request, db: Session = Depends(get_db)):
     vm = showauthors.ShowAuthorsViewModel(db=db)
     authors = vm.authors
-    return templates.TemplateResponse('authors/authors.html', {"request": request, "authors": authors})
+    return templates.TemplateResponse(request, 'authors/authors.html', {"authors": authors})
 
 
 @app.get("/author/books/{author_id}")
 def authors_books(request: Request, author_id: int, db: Session = Depends(get_db)):
     vm = authorbooks.AuthorBooksViewModel(db=db, author_id=author_id)
     books = vm.books
-    return templates.TemplateResponse('authors/partials/authors_books.html',
-                                      {"request": request, "books": books, "author_id": author_id})
+    return templates.TemplateResponse(request, 'authors/partials/authors_books.html',
+                                      {"books": books, "author_id": author_id})
 
 
 @app.get("/books/add")
 def add_book(request: Request, db: Session = Depends(get_db)):
     vm = addbookviewmodel.AddBookViewModel(db=db)
     data = vm.to_dict()
-    return templates.TemplateResponse('books/partials/add_books_form.html', {"request": request, "data": data})
+    return templates.TemplateResponse(request, 'books/partials/add_books_form.html', {"data": data})
 
 
 @app.post("/books/add")
@@ -117,7 +117,7 @@ def cancel_add(request: Request):
 def get_books(request: Request, db: Session = Depends(get_db)):
     vm = showbooks.ShowBooksViewModel(db=db)
     books = vm.books
-    return templates.TemplateResponse('books/books.html', {"request": request, "books": books, "search_text": ""})
+    return templates.TemplateResponse(request, 'books/books.html', {"books": books, "search_text": ""})
 
 
 @app.get("/books/search")
@@ -125,4 +125,4 @@ def search_books(request: Request, search_text: str, db: Session = Depends(get_d
     vm = searchbooks.SearchViewModel(db=db, search_text=search_text)
     if request.headers.get('HX-Request'):
         return templates.TemplateResponse("books/partials/search_results.html", {"request": request, "books": vm.books})
-    return templates.TemplateResponse('books/books.html', {"request": request, "books": vm.books, "search_text": search_text})
+    return templates.TemplateResponse(request, 'books/books.html', {"books": vm.books, "search_text": search_text})
diff --git a/schema/schema.py b/schema/schema.py
index d7a3bdc..30778f8 100644
--- a/schema/schema.py
+++ b/schema/schema.py
@@ -1,6 +1,6 @@
 from typing import List
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 
 class BookBase(BaseModel):
@@ -17,7 +17,7 @@ class Book(BookBase):
     id: str
 
     class Config:
-        orm_mode = True
+        model_config = ConfigDict(from_attributes=True)
 
 
 class AuthorBase(BaseModel):
@@ -35,4 +35,4 @@ class Author(AuthorBase):
     books: List[Book] = []
 
     class Config:
-        orm_mode = True
+        model_config = ConfigDict(from_attributes=True)