diff --git a/src/WebformSubmissionListBuilder.php b/src/WebformSubmissionListBuilder.php
index 8cac508..f06fbc8 100644
--- a/src/WebformSubmissionListBuilder.php
+++ b/src/WebformSubmissionListBuilder.php
@@ -2,25 +2,16 @@
 
 namespace Drupal\academic_applications;
 
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
-use Drupal\webform\Plugin\WebformElementManagerInterface;
-use Drupal\webform\WebformMessageManagerInterface;
-use Drupal\webform\WebformRequestInterface;
-use Drupal\webform\WebformSubmissionListBuilder as OriginalWebformSubmissionListBuilder;
+use Drupal\webform\WebformSubmissionListBuilder as DefaultWebformSubmissionListBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Overrides the WebformSubmissionListBuilder.
  */
-class WebformSubmissionListBuilder extends OriginalWebformSubmissionListBuilder {
+class WebformSubmissionListBuilder extends DefaultWebformSubmissionListBuilder {
 
   /**
    * The submission bundler.
@@ -33,7 +24,7 @@ class WebformSubmissionListBuilder extends OriginalWebformSubmissionListBuilder
    * {@inheritdoc}
    */
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
+    $instance =  new static(
       $entity_type,
       $container->get('entity_type.manager')->getStorage($entity_type->id()),
       $container->get('entity.manager'),
@@ -43,44 +34,14 @@ class WebformSubmissionListBuilder extends OriginalWebformSubmissionListBuilder
       $container->get('config.factory'),
       $container->get('webform.request'),
       $container->get('plugin.manager.webform.element'),
-      $container->get('webform.message_manager'),
-      $container->get('academic_applications.submission_bundler')
+      $container->get('webform.message_manager')
     );
+    $instance->addReferencesColumn();
+    $instance->submissionBundler = $container->get('academic_applications.submission_bundler');
+    return $instance;
   }
 
-  /**
-   * Constructs a new WebformSubmissionListBuilder object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
-   *   The entity storage class.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *   The current route match.
-   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *   The request stack.
-   * @param \Drupal\Core\Session\AccountInterface $current_user
-   *   The current user.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The configuration factory.
-   * @param \Drupal\webform\WebformRequestInterface $webform_request
-   *   The webform request handler.
-   * @param \Drupal\webform\Plugin\WebformElementManagerInterface $element_manager
-   *   The webform element manager.
-   * @param \Drupal\webform\WebformMessageManagerInterface $message_manager
-   *   The webform message manager.
-   * @param \Drupal\academic_applications\SubmissionBundler $bundler
-   *   The submission bundler.
-   */
-  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, EntityTypeManagerInterface $entity_type_manager, RouteMatchInterface $route_match, RequestStack $request_stack, AccountInterface $current_user, ConfigFactoryInterface $config_factory, WebformRequestInterface $webform_request, WebformElementManagerInterface $element_manager, WebformMessageManagerInterface $message_manager, SubmissionBundler $bundler) {
-    parent::__construct($entity_type, $storage, $entity_type_manager, $route_match, $request_stack, $current_user, $config_factory, $webform_request, $element_manager, $message_manager);
-    $this->addUploadsColumn();
-    $this->submissionBundler = $bundler;
-  }
-
-  protected function addUploadsColumn() {
+  protected function addReferencesColumn() {
     $column = [
       'title' => 'References',
       'name' => 'academic_applications_uploads',