diff --git a/requirements.txt b/requirements.txt
index 2ab66f4..1d660ec 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,14 @@
 fastapi==0.115.*
 sqlmodel==0.0.22
-uvicorn==0.18.0
+uvicorn==0.32.0
 alembic==1.10.0
 python-dotenv==0.21.0
 pydantic>=1.10.0
 python3-application @ git+https://github.com/AGProjects/python3-application.git
 python3-gnutls @ git+https://github.com/AGProjects/python3-gnutls.git
 python3-xcaplib @ git+https://github.com/AGProjects/python3-xcaplib.git
 lxml==5.3.* 
 aiosqlite==0.21.0
 aiomysql==0.2.0
 twisted
 greenlet
diff --git a/setup.py b/setup.py
index 1425d33..aa99330 100755
--- a/setup.py
+++ b/setup.py
@@ -1,48 +1,38 @@
-#!/usr/bin/python2
 
-import os
-import xcap
+from setuptools import find_packages, setup
 
-from distutils.core import setup
+import xcap
 
 long_description = """XCAP protocol allows a client to read, write, and modify application
 configuration data stored in XML format on a server. XCAP maps XML document
 sub-trees and element attributes to HTTP URIs, so that these components can
 be directly accessed by HTTP. An XCAP server is used by the XCAP clients to
 store data like Presence policy in combination with a SIP Presence server
 that supports PUBLISH/SUBSCRIBE/NOTIFY methods to provide a complete
 [http://www.tech-invite.com/Ti-sip-WGs.html#wg-simple SIP SIMPLE] server
 solution."""
-
-
-def find_packages(toplevel):
-    return [directory.replace(os.path.sep, '.') for directory, subdirs, files in os.walk(toplevel) if '__init__.py' in files]
-
-
 setup(
-    name='openxcap',
+    name=xcap.__project__,
     version=xcap.__version__,
 
-    description='XCAP server',
+    description=xcap.__description__,
     long_description=long_description,
-    url='http://openxcap.org/',
-
-    author='AG Projects',
-    author_email='support@ag-projects.com',
-
-    license='GPL',
-    platforms=['Platform Independent'],
+    url=xcap.__url__,
 
+    author=xcap.__author__,
+    author_email=xcap.__author_email__,
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Service Providers',
-        'License :: OSI Approved :: GNU General Public License (GPL)',
-        'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python',
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.8",
+        "Intended Audience :: Service Providers",
+        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "Operating System :: OS Independent",
     ],
-
-    packages=find_packages('xcap'),
+    python_requires=">=3.8",
+    packages=find_packages(where="xcap"),  # Looking for packages in the "xcap" folder
     package_data={'xcap.appusage': ['xml-schemas/*']},
     data_files=[('/etc/openxcap', ['config.ini.sample']), ('/etc/openxcap/tls', ['tls/README'])],
-    scripts=['openxcap']
+    scrips=['openxcap'],
+    include_package_data=True,
 )
+
diff --git a/xcap/__init__.py b/xcap/__init__.py
index 6de8aad..e906345 100644
--- a/xcap/__init__.py
+++ b/xcap/__init__.py
@@ -1,15 +1,15 @@
 __project__ = "openxcap"
 __fullname__ = "OpenXCAP"
 __version__ = "3.0.0"
 __author__ = "AG Projects"
 __author_email__ = "support@ag-projects.com"
 __description__ = "An open source XCAP server"
 __license__ = "GPL-3.0-or-later"
-__url__ = "https://github.com/AGProjects/openxcap"
+__url__ = "http://openxcap.org"
+__repository__ = "https://github.com/AGProjects/openxcap"
 __status__ = "Development"
 
 # Additional metadata (optional)
 __maintainer__ = "AG Projects"
 __maintainer_email__ = "support@ag-projects.com"
-__docs_url__ = "https://github.com/AGProjects/openxcap"  # Link to project documentation
- 
+__docs_url__ = __url__