Fixing imports after refactory
(cherry picked from commit 155af74a5962e86d846b36b30dc9c6b6f8ec651f)