diff --git a/odoo-stubs/__init__.pyi b/odoo-stubs/__init__.pyi
index bc1e04c..1b39dde 100644
--- a/odoo-stubs/__init__.pyi
+++ b/odoo-stubs/__init__.pyi
@@ -1,5 +1,5 @@
 from . import addons as addons, api as api, cli as cli, conf as conf, fields as fields, http as http, loglevels as loglevels, models as models, netsvc as netsvc, osv as osv, release as release, service as service, sql_db as sql_db, tools as tools
-from odoo.tools.translate import _ as _
+from .tools.translate import _ as _
 from typing import Any, Optional
 
 __path__: Any
diff --git a/odoo-stubs/api.pyi b/odoo-stubs/api.pyi
index c833058..91a53d1 100644
--- a/odoo-stubs/api.pyi
+++ b/odoo-stubs/api.pyi
@@ -1,7 +1,10 @@
 from collections import Mapping
+from weakref import WeakSet
+
 from typing import Any, Optional
 
-from odoo.sql_db import Cursor
+from .modules.registry import Registry
+from .sql_db import Cursor
 
 __all__: Any
 _logger: Any
@@ -63,27 +66,26 @@ class Environment(Mapping):
     uid: int = ...
     context: dict = ...
     _local: Any = ...
-    @property
-    def envs(cls) -> Environments: ...
+    envs: Environments = ...
     @classmethod
     def manage(cls) -> None: ...
     @classmethod
     def reset(cls) -> None: ...
-    registry: Any = ...
-    cache: Any = ...
+    registry: Registry = ...
+    cache: Cache = ...
     _cache_key: Any = ...
     _protected: Any = ...
     dirty: Any = ...
-    all: Any = ...
-    def __new__(cls, cr: Any, uid: Any, context: Any) -> Environment: ...
-    def __contains__(self, model_name: Any): ...
+    all: Environments = ...
+    def __new__(cls, cr: Cursor, uid: Any, context: Any) -> Environment: ...
+    def __contains__(self, model_name: Any) -> bool: ...
     def __getitem__(self, model_name: Any): ...
     def __iter__(self) -> Any: ...
-    def __len__(self): ...
-    def __eq__(self, other: Any) -> Any: ...
-    def __ne__(self, other: Any) -> Any: ...
-    def __hash__(self) -> Any: ...
-    def __call__(self, cr: Optional[Any] = ..., user: Optional[Any] = ..., context: Optional[Any] = ...) -> Environment: ...
+    def __len__(self) -> int: ...
+    def __eq__(self, other: Any) -> bool: ...
+    def __ne__(self, other: Any) -> bool: ...
+    def __hash__(self) -> int: ...
+    def __call__(self, cr: Optional[Cursor] = ..., user: Optional[Any] = ..., context: Optional[Any] = ...) -> Environment: ...
     def ref(self, xml_id: Any, raise_if_not_found: bool = ...): ...
     @property
     def user(self):
@@ -113,8 +115,8 @@ class Environment(Mapping):
     def cache_key(self, field: Any): ...
 
 class Environments:
-    envs: Any = ...
-    cache: Any = ...
+    envs: WeakSet = ...
+    cache: Cache = ...
     todo: Any = ...
     mode: bool = ...
     recompute: bool = ...
diff --git a/odoo-stubs/fields.pyi b/odoo-stubs/fields.pyi
index 3574334..bb470ae 100644
--- a/odoo-stubs/fields.pyi
+++ b/odoo-stubs/fields.pyi
@@ -1,9 +1,7 @@
 import datetime
-
-from dateutil.relativedelta import relativedelta as relativedelta
 from typing import Any, Optional
 
-from odoo.tools import date_utils
+from .tools import date_utils
 
 DATE_LENGTH: Any
 DATETIME_LENGTH: Any
diff --git a/odoo-stubs/http.pyi b/odoo-stubs/http.pyi
index 18f5dc0..4a976be 100644
--- a/odoo-stubs/http.pyi
+++ b/odoo-stubs/http.pyi
@@ -1,11 +1,9 @@
-import werkzeug.wsgi
 import werkzeug.contrib.sessions
-from datetime import date as date
-from odoo import fields as fields
+import werkzeug.wsgi
 from typing import Any, Optional, Union
 
-from odoo.api import Environment
-from odoo.sql_db import Cursor
+from .api import Environment
+from .sql_db import Cursor
 
 _logger: Any
 rpc_request: Any
diff --git a/odoo-stubs/models.pyi b/odoo-stubs/models.pyi
index 416640c..3ccf298 100644
--- a/odoo-stubs/models.pyi
+++ b/odoo-stubs/models.pyi
@@ -1,10 +1,11 @@
+from collections import MutableMapping
+
+from typing import Any, Optional, List, Dict, Generator
+
 from . import api, fields
 from .api import Environment
 from .modules.registry import Registry
 from .sql_db import Cursor
-from .tools.safe_eval import safe_eval as safe_eval
-from collections import MutableMapping
-from typing import Any, Optional, List, Dict, Generator
 
 _logger: Any
 _schema: Any
diff --git a/odoo-stubs/tests/common.pyi b/odoo-stubs/tests/common.pyi
index 2b9a3e7..4565e2e 100644
--- a/odoo-stubs/tests/common.pyi
+++ b/odoo-stubs/tests/common.pyi
@@ -2,9 +2,9 @@ import collections
 import unittest
 from typing import Any, Optional
 
-from odoo.api import Environment
-from odoo.modules.registry import Registry
-from odoo.sql_db import Cursor
+from ..api import Environment
+from ..modules.registry import Registry
+from ..sql_db import Cursor
 
 _logger: Any
 ADDONS_PATH: Any