diff --git a/src/ciberwebscan/__init__.py b/src/ciberwebscan/__init__.py
index b9e7f2c..58c210c 100644
--- a/src/ciberwebscan/__init__.py
+++ b/src/ciberwebscan/__init__.py
@@ -3,6 +3,8 @@
 Defines package-level metadata.
 """
 
+from __future__ import annotations
+
 from importlib.metadata import PackageNotFoundError, version
 
 try:
diff --git a/src/ciberwebscan/__main__.py b/src/ciberwebscan/__main__.py
index 329c797..5110bb3 100644
--- a/src/ciberwebscan/__main__.py
+++ b/src/ciberwebscan/__main__.py
@@ -4,6 +4,8 @@
 Allows running with: python -m ciberwebscan
 """
 
+from __future__ import annotations
+
 from ciberwebscan.cli import main
 
 if __name__ == "__main__":
diff --git a/src/ciberwebscan/api/__init__.py b/src/ciberwebscan/api/__init__.py
index 57a208f..16e34bd 100644
--- a/src/ciberwebscan/api/__init__.py
+++ b/src/ciberwebscan/api/__init__.py
@@ -1 +1,3 @@
 """CiberWebScan API"""
+
+from __future__ import annotations
diff --git a/src/ciberwebscan/api/models/__init__.py b/src/ciberwebscan/api/models/__init__.py
index 57a9b2a..c995757 100644
--- a/src/ciberwebscan/api/models/__init__.py
+++ b/src/ciberwebscan/api/models/__init__.py
@@ -4,6 +4,8 @@
 Provides request and response models for the REST API.
 """
 
+from __future__ import annotations
+
 from ciberwebscan.api.models.requests import (
     AnalyzeRequest,
     AttackRequest,
diff --git a/src/ciberwebscan/api/routes/__init__.py b/src/ciberwebscan/api/routes/__init__.py
index 1de2855..d86fdc8 100644
--- a/src/ciberwebscan/api/routes/__init__.py
+++ b/src/ciberwebscan/api/routes/__init__.py
@@ -4,6 +4,8 @@
 This package contains all FastAPI route handlers for the REST API.
 """
 
+from __future__ import annotations
+
 from . import analyze, attack, auth, config, download, health, quick, scrape
 
 __all__ = [
diff --git a/src/ciberwebscan/cli/__init__.py b/src/ciberwebscan/cli/__init__.py
index bb4f611..095ac20 100644
--- a/src/ciberwebscan/cli/__init__.py
+++ b/src/ciberwebscan/cli/__init__.py
@@ -4,6 +4,8 @@
 Simple command-line interface built with Typer (no Rich).
 """
 
+from __future__ import annotations
+
 from ciberwebscan.cli.app import app, main
 from ciberwebscan.cli.output import (
     print_error,
diff --git a/src/ciberwebscan/cli/commands/__init__.py b/src/ciberwebscan/cli/commands/__init__.py
index e70036e..a482a20 100644
--- a/src/ciberwebscan/cli/commands/__init__.py
+++ b/src/ciberwebscan/cli/commands/__init__.py
@@ -2,6 +2,8 @@
 CLI commands for CiberWebScan.
 """
 
+from __future__ import annotations
+
 from ciberwebscan.cli.commands.analyze import analyze_cmd
 from ciberwebscan.cli.commands.attack import attack_cmd
 from ciberwebscan.cli.commands.completion import completion_app
diff --git a/src/ciberwebscan/config/__init__.py b/src/ciberwebscan/config/__init__.py
index 4d7cc2a..86adef0 100644
--- a/src/ciberwebscan/config/__init__.py
+++ b/src/ciberwebscan/config/__init__.py
@@ -4,6 +4,8 @@
 Provides configuration models, defaults, and loading utilities.
 """
 
+from __future__ import annotations
+
 from ciberwebscan.config.models import (
     AnalysisConfig,
     AppConfig,
diff --git a/src/ciberwebscan/core/analyzers/__init__.py b/src/ciberwebscan/core/analyzers/__init__.py
index 606e649..9af866b 100644
--- a/src/ciberwebscan/core/analyzers/__init__.py
+++ b/src/ciberwebscan/core/analyzers/__init__.py
@@ -6,6 +6,8 @@
 header security analysis.
 """
 
+from __future__ import annotations
+
 from .fingerprint import (
     TechnologyFingerprinter,
     fingerprint_technologies,
diff --git a/src/ciberwebscan/core/analyzers/cve/__init__.py b/src/ciberwebscan/core/analyzers/cve/__init__.py
index 713c7eb..9b87747 100644
--- a/src/ciberwebscan/core/analyzers/cve/__init__.py
+++ b/src/ciberwebscan/core/analyzers/cve/__init__.py
@@ -16,6 +16,8 @@
     >>> cves = lookup_cves("nginx", version="1.19")
 """
 
+from __future__ import annotations
+
 from ciberwebscan.core.analyzers.cve.aggregator import (
     CVEAggregator,
     lookup_cves,
diff --git a/src/ciberwebscan/core/analyzers/fingerprint/__init__.py b/src/ciberwebscan/core/analyzers/fingerprint/__init__.py
index 22bff2c..20a2e69 100644
--- a/src/ciberwebscan/core/analyzers/fingerprint/__init__.py
+++ b/src/ciberwebscan/core/analyzers/fingerprint/__init__.py
@@ -6,6 +6,8 @@
 and HTML content analysis.
 """
 
+from __future__ import annotations
+
 from .header_analyzer import analyze_headers
 from .helpers import (
     append_tech_with_version,
diff --git a/src/ciberwebscan/core/analyzers/headers/__init__.py b/src/ciberwebscan/core/analyzers/headers/__init__.py
index 7e80140..fc67700 100644
--- a/src/ciberwebscan/core/analyzers/headers/__init__.py
+++ b/src/ciberwebscan/core/analyzers/headers/__init__.py
@@ -3,6 +3,8 @@
 Provides security analysis for HTTP headers and cookies.
 """
 
+from __future__ import annotations
+
 from .cookies import CookieAnalyzer
 from .security_headers import SecurityHeadersAnalyzer
 
diff --git a/src/ciberwebscan/core/analyzers/ssl/__init__.py b/src/ciberwebscan/core/analyzers/ssl/__init__.py
index 87acefc..b14dfdb 100644
--- a/src/ciberwebscan/core/analyzers/ssl/__init__.py
+++ b/src/ciberwebscan/core/analyzers/ssl/__init__.py
@@ -5,6 +5,8 @@
 and security configurations.
 """
 
+from __future__ import annotations
+
 from .analyzer import (
     SSLAnalysisResult,
     SSLAnalyzer,
diff --git a/src/ciberwebscan/core/attacks/__init__.py b/src/ciberwebscan/core/attacks/__init__.py
index fd9f656..bcd18d3 100644
--- a/src/ciberwebscan/core/attacks/__init__.py
+++ b/src/ciberwebscan/core/attacks/__init__.py
@@ -13,6 +13,8 @@
 explicit written authorization to test. Unauthorized testing is illegal.
 """
 
+from __future__ import annotations
+
 from .base import (
     AttackConfig,
     AttackContext,
diff --git a/src/ciberwebscan/core/client/__init__.py b/src/ciberwebscan/core/client/__init__.py
index 7bb1d8a..727e7ce 100644
--- a/src/ciberwebscan/core/client/__init__.py
+++ b/src/ciberwebscan/core/client/__init__.py
@@ -4,6 +4,8 @@
 Provides HTTP client with retry, rate limiting, proxy and user-agent support.
 """
 
+from __future__ import annotations
+
 from ciberwebscan.core.client.http_client import HTTPClient, RateLimiter
 from ciberwebscan.core.client.proxy import (
     ProxyConfig,
diff --git a/src/ciberwebscan/core/client/http_client.py b/src/ciberwebscan/core/client/http_client.py
index 3fd42bc..a0fa3a7 100644
--- a/src/ciberwebscan/core/client/http_client.py
+++ b/src/ciberwebscan/core/client/http_client.py
@@ -12,6 +12,8 @@
 of a full compatibility layer while centralizing cross-cutting concerns.
 """
 
+from __future__ import annotations
+
 import logging
 import random
 import threading
@@ -613,7 +615,7 @@ def close(self) -> None:
         """Close the underlying HTTP client."""
         self._client.close()
 
-    def __enter__(self) -> "HTTPClient":
+    def __enter__(self) -> HTTPClient:
         return self
 
     def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
diff --git a/src/ciberwebscan/core/scraping/__init__.py b/src/ciberwebscan/core/scraping/__init__.py
index 8b2d720..fdbf9e6 100644
--- a/src/ciberwebscan/core/scraping/__init__.py
+++ b/src/ciberwebscan/core/scraping/__init__.py
@@ -61,6 +61,8 @@ async def scrape_spa():
         })
 """
 
+from __future__ import annotations
+
 from typing import TYPE_CHECKING, Any
 
 from .extractor import (
diff --git a/src/ciberwebscan/export/__init__.py b/src/ciberwebscan/export/__init__.py
index dc842f8..63a2376 100644
--- a/src/ciberwebscan/export/__init__.py
+++ b/src/ciberwebscan/export/__init__.py
@@ -27,6 +27,8 @@
     exporter.export_report(analysis_report)
 """
 
+from __future__ import annotations
+
 # Base classes and utilities
 from ciberwebscan.export.base import (
     BaseExporter,
diff --git a/src/ciberwebscan/services/__init__.py b/src/ciberwebscan/services/__init__.py
index 3fd41ac..79df551 100644
--- a/src/ciberwebscan/services/__init__.py
+++ b/src/ciberwebscan/services/__init__.py
@@ -14,6 +14,8 @@
 Each service that produces results supports an optional export flag.
 """
 
+from __future__ import annotations
+
 from ciberwebscan.services.analyze_service import AnalyzeOptions, AnalyzeService
 from ciberwebscan.services.attack_service import AttackOptions, AttackService
 from ciberwebscan.services.base import (
diff --git a/src/ciberwebscan/utils/__init__.py b/src/ciberwebscan/utils/__init__.py
index 38dcd54..a38767d 100644
--- a/src/ciberwebscan/utils/__init__.py
+++ b/src/ciberwebscan/utils/__init__.py
@@ -1,3 +1,5 @@
 """
 This package contains utility functions and classes used across the CiberWebScan project.
 """
+
+from __future__ import annotations
diff --git a/tests/__init__.py b/tests/__init__.py
index e608044..da75bb5 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1 +1,3 @@
 """Tests for tests package."""
+
+from __future__ import annotations
diff --git a/tests/conftest.py b/tests/conftest.py
index 53c6329..0657f53 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2,6 +2,8 @@
 Shared pytest fixtures for CiberWebScan tests.
 """
 
+from __future__ import annotations
+
 import pytest
 
 
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
index ef9233b..92853b4 100644
--- a/tests/integration/__init__.py
+++ b/tests/integration/__init__.py
@@ -1 +1,3 @@
 """Tests for integration package."""
+
+from __future__ import annotations
diff --git a/tests/integration/api/__init__.py b/tests/integration/api/__init__.py
index e69de29..a67e9f2 100644
--- a/tests/integration/api/__init__.py
+++ b/tests/integration/api/__init__.py
@@ -0,0 +1,3 @@
+"""Integration tests for API module."""
+
+from __future__ import annotations
diff --git a/tests/integration/cli/__init__.py b/tests/integration/cli/__init__.py
index 2ee0e40..448c6e8 100644
--- a/tests/integration/cli/__init__.py
+++ b/tests/integration/cli/__init__.py
@@ -1 +1,3 @@
 """Tests for CLI package."""
+
+from __future__ import annotations
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
index 1f96131..81956e5 100644
--- a/tests/unit/__init__.py
+++ b/tests/unit/__init__.py
@@ -1 +1,3 @@
 """Tests for unit package."""
+
+from __future__ import annotations
diff --git a/tests/unit/api/__init__.py b/tests/unit/api/__init__.py
index 455d0c6..e989151 100644
--- a/tests/unit/api/__init__.py
+++ b/tests/unit/api/__init__.py
@@ -1 +1,3 @@
 """Unit tests for API module."""
+
+from __future__ import annotations
diff --git a/tests/unit/api/routes/__init__.py b/tests/unit/api/routes/__init__.py
index abe297f..9155043 100644
--- a/tests/unit/api/routes/__init__.py
+++ b/tests/unit/api/routes/__init__.py
@@ -1 +1,3 @@
 """Unit tests for API routes."""
+
+from __future__ import annotations
diff --git a/tests/unit/cli/__init__.py b/tests/unit/cli/__init__.py
index 2d9e5e6..a22ca35 100644
--- a/tests/unit/cli/__init__.py
+++ b/tests/unit/cli/__init__.py
@@ -1 +1,3 @@
 """Tests for CiberWebScan CLI."""
+
+from __future__ import annotations
diff --git a/tests/unit/config/__init__.py b/tests/unit/config/__init__.py
index 0be9424..867e6af 100644
--- a/tests/unit/config/__init__.py
+++ b/tests/unit/config/__init__.py
@@ -1 +1,3 @@
 """Tests for config package."""
+
+from __future__ import annotations
diff --git a/tests/unit/core/__init__.py b/tests/unit/core/__init__.py
index e69de29..4df1f8f 100644
--- a/tests/unit/core/__init__.py
+++ b/tests/unit/core/__init__.py
@@ -0,0 +1,3 @@
+"""Tests for core package."""
+
+from __future__ import annotations
diff --git a/tests/unit/core/analyzers/__init__.py b/tests/unit/core/analyzers/__init__.py
index 80dc97a..ac75392 100644
--- a/tests/unit/core/analyzers/__init__.py
+++ b/tests/unit/core/analyzers/__init__.py
@@ -1 +1,3 @@
 """Analyzers test package."""
+
+from __future__ import annotations
diff --git a/tests/unit/core/analyzers/cve/__init__.py b/tests/unit/core/analyzers/cve/__init__.py
index e69de29..76dcd22 100644
--- a/tests/unit/core/analyzers/cve/__init__.py
+++ b/tests/unit/core/analyzers/cve/__init__.py
@@ -0,0 +1,3 @@
+"""CVE analyzer test package."""
+
+from __future__ import annotations
diff --git a/tests/unit/core/analyzers/fingerprint/__init__.py b/tests/unit/core/analyzers/fingerprint/__init__.py
index 780d399..dd2db5b 100644
--- a/tests/unit/core/analyzers/fingerprint/__init__.py
+++ b/tests/unit/core/analyzers/fingerprint/__init__.py
@@ -1 +1,3 @@
 """Unit tests for fingerprint module."""
+
+from __future__ import annotations
diff --git a/tests/unit/core/analyzers/headers/__init__.py b/tests/unit/core/analyzers/headers/__init__.py
index ec6293c..932d856 100644
--- a/tests/unit/core/analyzers/headers/__init__.py
+++ b/tests/unit/core/analyzers/headers/__init__.py
@@ -1,3 +1,5 @@
 """
 Unit tests for header analyzers.
 """
+
+from __future__ import annotations
diff --git a/tests/unit/core/analyzers/ssl/__init__.py b/tests/unit/core/analyzers/ssl/__init__.py
index 00e7f6a..eba83b4 100644
--- a/tests/unit/core/analyzers/ssl/__init__.py
+++ b/tests/unit/core/analyzers/ssl/__init__.py
@@ -1 +1,3 @@
 """SSL analyzer test package."""
+
+from __future__ import annotations
diff --git a/tests/unit/core/attacks/__init__.py b/tests/unit/core/attacks/__init__.py
index 412e3ce..84ca661 100644
--- a/tests/unit/core/attacks/__init__.py
+++ b/tests/unit/core/attacks/__init__.py
@@ -1 +1,3 @@
 """Tests for attack simulation modules."""
+
+from __future__ import annotations
diff --git a/tests/unit/core/attacks/conftest.py b/tests/unit/core/attacks/conftest.py
index 4f546a2..3d2dd98 100644
--- a/tests/unit/core/attacks/conftest.py
+++ b/tests/unit/core/attacks/conftest.py
@@ -2,6 +2,8 @@
 Pytest configuration and shared fixtures for attack module tests.
 """
 
+from __future__ import annotations
+
 from pathlib import Path
 from unittest.mock import Mock
 
diff --git a/tests/unit/core/client/__init__.py b/tests/unit/core/client/__init__.py
index 4573a2c..5497811 100644
--- a/tests/unit/core/client/__init__.py
+++ b/tests/unit/core/client/__init__.py
@@ -1,3 +1,5 @@
 """
 Unit tests for ciberwebscan.core.client module.
 """
+
+from __future__ import annotations
diff --git a/tests/unit/core/scraping/__init__.py b/tests/unit/core/scraping/__init__.py
index 81da8fb..dea4f61 100644
--- a/tests/unit/core/scraping/__init__.py
+++ b/tests/unit/core/scraping/__init__.py
@@ -1 +1,3 @@
 """Unit tests for scraping module."""
+
+from __future__ import annotations
diff --git a/tests/unit/export/__init__.py b/tests/unit/export/__init__.py
index c0e166c..ed6a0c3 100644
--- a/tests/unit/export/__init__.py
+++ b/tests/unit/export/__init__.py
@@ -1,3 +1,5 @@
 """
 Docstring para tests.unit.export
 """
+
+from __future__ import annotations
diff --git a/tests/unit/services/__init__.py b/tests/unit/services/__init__.py
index 44b4876..4fef46b 100644
--- a/tests/unit/services/__init__.py
+++ b/tests/unit/services/__init__.py
@@ -1 +1,3 @@
 """Tests for services package."""
+
+from __future__ import annotations
diff --git a/tests/unit/utils/__init__.py b/tests/unit/utils/__init__.py
index 6a44794..2af7a4c 100644
--- a/tests/unit/utils/__init__.py
+++ b/tests/unit/utils/__init__.py
@@ -1 +1,2 @@
 # Tests for utils module
+from __future__ import annotations