diff --git a/odoo-stubs/models.pyi b/odoo-stubs/models.pyi
index 47a9dad..0754890 100644
--- a/odoo-stubs/models.pyi
+++ b/odoo-stubs/models.pyi
@@ -8,8 +8,8 @@ from . import api, fields
 from .api import Environment
 from .fields import Field
 from .modules.registry import Registry
-from .osv.query import Query
 from .sql_db import Cursor
+from .tools.query import Query
 
 _T = TypeVar('_T')
 _ModelT = TypeVar('_ModelT', bound=BaseModel)
diff --git a/odoo-stubs/osv/expression.pyi b/odoo-stubs/osv/expression.pyi
index 5242a93..2d822df 100644
--- a/odoo-stubs/osv/expression.pyi
+++ b/odoo-stubs/osv/expression.pyi
@@ -1,9 +1,9 @@
 from typing import Any, Callable
 
-from .query import Query
 from ..fields import Field
 from ..models import BaseModel, MAGIC_COLUMNS as MAGIC_COLUMNS
 from ..sql_db import Cursor
+from ..tools.query import Query
 
 _Domain = list
 
diff --git a/odoo-stubs/service/model.pyi b/odoo-stubs/service/model.pyi
index d3bc428..6895e1b 100644
--- a/odoo-stubs/service/model.pyi
+++ b/odoo-stubs/service/model.pyi
@@ -1,5 +1,9 @@
-from typing import Any, Callable, TypeVar
+from typing import Any, Callable, Iterator, TypeVar
 
+from psycopg2 import IntegrityError
+
+from ..api import Environment
+from ..exceptions import ValidationError
 from ..sql_db import Cursor
 
 PG_CONCURRENCY_ERRORS_TO_RETRY: tuple[str, str, str]
@@ -8,7 +12,9 @@ MAX_TRIES_ON_CONCURRENCY_FAILURE: int
 _CallableT = TypeVar('_CallableT', bound=Callable)
 
 def dispatch(method: str, params): ...
-def check(f: _CallableT) -> _CallableT: ...
 def execute_cr(cr: Cursor, uid: int, obj: str, method: str, *args, **kw): ...
 def execute_kw(db: str, uid: int, obj: str, method: str, args, kw: dict | None = ...): ...
 def execute(db: str, uid: int, obj: str, method: str, *args, **kw): ...
+def _as_validation_error(env: Environment, exc: IntegrityError) -> ValidationError: ...
+def retrying(func: Callable[[], Any], env: Environment): ...
+def _traverse_containers(val, type_) -> Iterator: ...