diff --git a/src/CmsExtension.php b/src/CmsExtension.php
index ca3d33a..ba23eba 100644
--- a/src/CmsExtension.php
+++ b/src/CmsExtension.php
@@ -53,9 +53,9 @@ public function getConfigSchema(): Schema
 
 	public function beforeCompile(): void
 	{
-		OrmAnnotationsExtension::addAnnotationPath('Baraja\Cms\User\Entity', __DIR__ . '/User/Entity');
-		OrmAnnotationsExtension::addAnnotationPath('Baraja\DoctrineConfiguration', __DIR__ . '/Settings/Entity');
 		PluginComponentExtension::defineBasicServices($builder = $this->getContainerBuilder());
+		OrmAnnotationsExtension::addAnnotationPathToManager($builder, 'Baraja\Cms\User\Entity', __DIR__ . '/User/Entity');
+		OrmAnnotationsExtension::addAnnotationPathToManager($builder, 'Baraja\DoctrineConfiguration', __DIR__ . '/Settings/Entity');
 
 		// linkGenerator
 		$builder->addDefinition($this->prefix('linkGenerator'))