diff --git a/agent_eyes/reader.py b/agent_eyes/reader.py
index 813a432..f1f7c16 100644
--- a/agent_eyes/reader.py
+++ b/agent_eyes/reader.py
@@ -51,7 +51,7 @@ class UniversalReader:
             return "reddit"
         if "github.com" in domain:
             return "github"
-        if url.endswith(".xml") or "/rss" in url or "/feed" in url or "/atom" in url:
+        if url.endswith(".xml") or "/rss" in url or "/feed" in url or "/atom" in url or "rss" in domain:
             return "rss"
         return "generic"
 
@@ -131,9 +131,8 @@ class UniversalReader:
                 title=data["title"],
                 content=data.get("content", ""),
                 url=data["url"],
-                author=data.get("author", ""),
                 media_type=MediaType.TEXT,
-                metadata={"score": data.get("score", 0), "num_comments": data.get("num_comments", 0)},
+                extra={"author": data.get("author", ""), "score": data.get("score", 0), "num_comments": data.get("num_comments", 0)},
             )
 
         if platform == "github":
@@ -145,9 +144,8 @@ class UniversalReader:
                 title=data["title"],
                 content=data.get("content", ""),
                 url=data["url"],
-                author=data.get("author", ""),
                 media_type=MediaType.TEXT,
-                metadata={k: v for k, v in data.items() if k not in ("title", "content", "url", "author", "platform")},
+                extra={k: v for k, v in data.items() if k not in ("title", "content", "url", "platform")},
             )
 
         if platform == "telegram":
diff --git a/agent_eyes/readers/twitter.py b/agent_eyes/readers/twitter.py
index 476f089..f9d508a 100644
--- a/agent_eyes/readers/twitter.py
+++ b/agent_eyes/readers/twitter.py
@@ -15,7 +15,7 @@ import requests
 from loguru import logger
 from typing import Dict, Any
 
-from agent_eyes.fetchers.jina import fetch_via_jina
+from agent_eyes.readers.jina import fetch_via_jina
 
 
 OEMBED_URL = "https://publish.twitter.com/oembed"
@@ -75,7 +75,7 @@ async def _fetch_via_playwright(url: str) -> Dict[str, Any]:
             "  playwright install chromium"
         )
 
-    from agent_eyes.fetchers.browser import get_session_path
+    from agent_eyes.readers.browser import get_session_path
     from pathlib import Path
 
     session_path = get_session_path("twitter")
diff --git a/agent_eyes/readers/wechat.py b/agent_eyes/readers/wechat.py
index e41e5d6..def6d36 100644
--- a/agent_eyes/readers/wechat.py
+++ b/agent_eyes/readers/wechat.py
@@ -23,7 +23,7 @@ async def fetch_wechat(url: str) -> Dict[str, Any]:
     # Tier 1: Jina Reader
     try:
         logger.info(f"[WeChat] Tier 1 — Jina: {url}")
-        from agent_eyes.fetchers.jina import fetch_via_jina
+        from agent_eyes.readers.jina import fetch_via_jina
 
         data = fetch_via_jina(url)
         if data.get("content"):
@@ -41,7 +41,7 @@ async def fetch_wechat(url: str) -> Dict[str, Any]:
     # Tier 2: Playwright headless (no session needed)
     try:
         logger.info(f"[WeChat] Tier 2 — Playwright headless: {url}")
-        from agent_eyes.fetchers.browser import fetch_via_browser
+        from agent_eyes.readers.browser import fetch_via_browser
 
         data = await fetch_via_browser(url)
         return {
diff --git a/agent_eyes/readers/xhs.py b/agent_eyes/readers/xhs.py
index 12faceb..da720b5 100644
--- a/agent_eyes/readers/xhs.py
+++ b/agent_eyes/readers/xhs.py
@@ -13,7 +13,7 @@ from loguru import logger
 from typing import Dict, Any
 from pathlib import Path
 
-from agent_eyes.fetchers.jina import fetch_via_jina
+from agent_eyes.readers.jina import fetch_via_jina
 
 
 async def fetch_xhs(url: str) -> Dict[str, Any]:
@@ -43,7 +43,7 @@ async def fetch_xhs(url: str) -> Dict[str, Any]:
         logger.warning(f"[XHS] Jina failed ({e}), falling back to browser")
 
     # Tier 2: Playwright with session
-    from agent_eyes.fetchers.browser import get_session_path, SESSION_DIR
+    from agent_eyes.readers.browser import get_session_path, SESSION_DIR
 
     session_path = get_session_path("xhs")
     if not Path(session_path).exists():
@@ -56,7 +56,7 @@ async def fetch_xhs(url: str) -> Dict[str, Any]:
 
     try:
         logger.info(f"[XHS] Tier 2 — Playwright with session: {url}")
-        from agent_eyes.fetchers.browser import fetch_via_browser
+        from agent_eyes.readers.browser import fetch_via_browser
 
         data = await fetch_via_browser(url, storage_state=session_path)
         return {
diff --git a/agent_eyes/readers/youtube.py b/agent_eyes/readers/youtube.py
index 257911c..f32f565 100644
--- a/agent_eyes/readers/youtube.py
+++ b/agent_eyes/readers/youtube.py
@@ -17,7 +17,7 @@ import tempfile
 from loguru import logger
 from typing import Dict, Any
 
-from agent_eyes.fetchers.jina import fetch_via_jina
+from agent_eyes.readers.jina import fetch_via_jina
 
 
 def _extract_video_id(url: str) -> str: