diff --git a/src/Plugin/Block/BlockGroup.php b/src/Plugin/Block/BlockGroup.php
index deb197e..48623e0 100755
--- a/src/Plugin/Block/BlockGroup.php
+++ b/src/Plugin/Block/BlockGroup.php
@@ -3,7 +3,7 @@
 namespace Drupal\blockgroup\Plugin\Block;
 
 use Drupal\Core\Block\BlockBase;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\EntityRepository;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Render\Renderer;
@@ -21,11 +21,11 @@ use Drupal\Core\Block\MainContentBlockPluginInterface;
 class BlockGroup extends BlockBase implements ContainerFactoryPluginInterface, MainContentBlockPluginInterface {
 
   /**
-   * The entity manager service.
+   * The entity repository service.
    *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   * @var \Drupal\Core\Entity\EntityRepository
    */
-  protected $entityManager;
+  protected $entityRepository;
 
   /**
    * The entity renderer.
@@ -57,13 +57,13 @@ class BlockGroup extends BlockBase implements ContainerFactoryPluginInterface, M
    *   The plugin ID for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityRepository $entity_repository
    *   The entity manager service.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_manager, Renderer $renderer) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityRepository $entity_repository, Renderer $renderer) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
-    $this->entityManager = $entity_manager;
+    $this->entityRepository = $entity_repository;
     $this->renderer = $renderer;
   }
 
@@ -72,7 +72,7 @@ class BlockGroup extends BlockBase implements ContainerFactoryPluginInterface, M
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
     return new static(
-        $configuration, $plugin_id, $plugin_definition, $container->get('entity_type.manager'), $container->get('renderer')
+        $configuration, $plugin_id, $plugin_definition, $container->get('entity.repository'), $container->get('renderer')
     );
   }
 
@@ -83,7 +83,7 @@ class BlockGroup extends BlockBase implements ContainerFactoryPluginInterface, M
 
     $block_content = array();
     $uuid = $this->getDerivativeId();
-    $block_data = $this->entityManager->loadEntityByUuid('block_group_content', $uuid);
+    $block_data = $this->entityRepository->loadEntityByUuid('block_group_content', $uuid);
     $blocks = \Drupal::entityTypeManager()
       ->getStorage('block')
       ->loadByProperties(