diff --git a/client/ayon_core/pipeline/create/creator_plugins.py b/client/ayon_core/pipeline/create/creator_plugins.py
index b6ba5011f6..ce1c1dfe85 100644
--- a/client/ayon_core/pipeline/create/creator_plugins.py
+++ b/client/ayon_core/pipeline/create/creator_plugins.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import copy
 import collections
+import typing
 
 from abc import ABCMeta, abstractmethod
 
@@ -21,6 +22,10 @@ from .product_name import get_product_name
 from .utils import get_next_versions_for_instances
 from .legacy_create import LegacyCreator
 
+if typing.TYPE_CHECKING:
+    # Avoid cyclic imports
+    from .context import CreateContext, UpdateData
+
 
 class CreatorError(Exception):
     """Should be raised when creator failed because of known issue.
@@ -441,7 +446,7 @@ class BaseCreator:
         """Store changes of existing instances so they can be recollected.
 
         Args:
-            update_list(List[UpdateData]): Gets list of tuples. Each item
+            update_list (list[UpdateData]): Gets list of tuples. Each item
                 contain changed instance and it's changes.
         """