diff --git a/bundle/Controller/Admin/Export/Export.php b/bundle/Controller/Admin/Export/Export.php
index fc442760..79d98382 100644
--- a/bundle/Controller/Admin/Export/Export.php
+++ b/bundle/Controller/Admin/Export/Export.php
@@ -3,12 +3,12 @@
 namespace Netgen\Bundle\InformationCollectionBundle\Controller\Admin\Export;
 
 use eZ\Publish\Core\MVC\Symfony\Security\Authorization\Attribute;
+use Netgen\Bundle\InformationCollectionBundle\Form\ExportType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Netgen\InformationCollection\API\Value\Export\ExportCriteria;
 use Netgen\InformationCollection\API\Service\Exporter;
 use Netgen\InformationCollection\Core\Export\ExportResponseFormatterRegistry;
 use Symfony\Component\HttpFoundation\Request;
-use Netgen\InformationCollection\Form\Type\ExportType;
 use eZ\Publish\API\Repository\ContentService;
 
 final class Export extends AbstractController
diff --git a/bundle/Controller/Admin/TreeController.php b/bundle/Controller/Admin/TreeController.php
index 575e9cec..afba5da5 100644
--- a/bundle/Controller/Admin/TreeController.php
+++ b/bundle/Controller/Admin/TreeController.php
@@ -120,7 +120,7 @@ protected function getCollections(Content $content, $isRoot = false)
         return array(
             'id' => $content->getContent()->id,
             'parent' => $isRoot ? '#' : '0',
-            'text' => $content->getContent()->getName($languages[0]) . ' (' . strval($count->getCount()) . ')',
+            'text' => $content->getContent()->getName(in_array($languages[0], $content->getContent()->getVersionInfo()->languageCodes) ? $languages[0] : null) . ' (' . strval($count->getCount()) . ')',
             'children' => false,
             'a_attr' => array(
                 'href' => $this->router->generate('netgen_information_collection.route.admin.collection_list', ['contentId' => $content->getContent()->id]),
diff --git a/bundle/DependencyInjection/NetgenInformationCollectionExtension.php b/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
index f36e19d5..ef4c0d24 100644
--- a/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
+++ b/bundle/DependencyInjection/NetgenInformationCollectionExtension.php
@@ -42,6 +42,8 @@ public function load(array $configs, ContainerBuilder $container)
         $libResourceLoader->load('services.yml');
         $libResourceLoader->load('parameters.yml');
         $libResourceLoader->load('default_settings.yml');
+        $libResourceLoader->load('email_data_providers.yml');
+        $libResourceLoader->load('mailers.yml');
 
 
         $this->processSemanticConfig($container, $config);
diff --git a/bundle/EzPlatform/RepositoryForms/InformationCollectionMapper.php b/bundle/EzPlatform/RepositoryForms/InformationCollectionMapper.php
index 9cb45293..e3800cfb 100644
--- a/bundle/EzPlatform/RepositoryForms/InformationCollectionMapper.php
+++ b/bundle/EzPlatform/RepositoryForms/InformationCollectionMapper.php
@@ -26,7 +26,7 @@ final class InformationCollectionMapper
      */
     public function mapToFormData(Content $content, Location $location, ContentType $contentType)
     {
-        $fields = $content->getFieldsByLanguage($content->contentInfo->mainLanguageCode);
+        $fields = $content->getFieldsByLanguage();
 
         $informationCollectionFields = [];
 
diff --git a/bundle/EzPlatform/RepositoryForms/InformationCollectionType.php b/bundle/EzPlatform/RepositoryForms/InformationCollectionType.php
index ad00102e..815ac2cc 100644
--- a/bundle/EzPlatform/RepositoryForms/InformationCollectionType.php
+++ b/bundle/EzPlatform/RepositoryForms/InformationCollectionType.php
@@ -48,6 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         foreach ($struct->getFieldsData() as $fieldsDatum) {
             $builder->add($fieldsDatum->fieldDefinition->identifier, InformationCollectionFieldType::class, [
+                //'label' => false,
                 'languageCode' => $options['languageCode'],
                 'mainLanguageCode' => $options['mainLanguageCode'],
             ]);
diff --git a/bundle/Listener/CaptchaValidationListener.php b/bundle/Listener/CaptchaValidationListener.php
index 2e93b1ad..f147ec63 100644
--- a/bundle/Listener/CaptchaValidationListener.php
+++ b/bundle/Listener/CaptchaValidationListener.php
@@ -50,8 +50,11 @@ public function onPostSubmit(FormEvent $event)
             ->getConfig()
             ->getOption('captcha_value');
 
-//        $request = $this->requestStack->getCurrentRequest();
-        $request = Request::createFromGlobals();
+        $request = $this->requestStack->getCurrentRequest();
+//        $request = Request::createFromGlobals();
+
+        $submittedHostName = $request->getHost();
+        $captchaValue->getInnerCaptcha()->setExpectedHostname($submittedHostName);
 
         $text = 'The captcha is invalid. Please try again.';
 
diff --git a/bundle/Resources/config/services.yml b/bundle/Resources/config/services.yml
index b637a4ec..6b97e252 100644
--- a/bundle/Resources/config/services.yml
+++ b/bundle/Resources/config/services.yml
@@ -32,3 +32,9 @@ services:
             - '@request_stack'
             - '@netgen_information_collection.captcha.service'
             - '@translator'
+
+    Netgen\InformationCollection\API\Service\CaptchaService:
+        alias: Netgen\InformationCollection\Core\Service\CaptchaService
+
+    eZ\Publish\Core\Helper\TranslationHelper:
+        alias: ezpublish.translation_helper
diff --git a/bundle/Resources/views/admin/content_fields.html.twig b/bundle/Resources/views/admin/content_fields.html.twig
index a35f67be..1d9b0006 100644
--- a/bundle/Resources/views/admin/content_fields.html.twig
+++ b/bundle/Resources/views/admin/content_fields.html.twig
@@ -10,7 +10,7 @@
 {% block ezboolean_field %}
     {% apply spaceless %}
         {% set field_value = attribute.value %}
-        {% if field_value %}
+        {% if field_value.dataInt %}
             {{ 'field_value.yes'|trans }}
         {% else %}
             {{ 'field_value.no'|trans }}
@@ -18,6 +18,14 @@
     {% endapply %}
 {% endblock %}
 
+{% block enhancedezbinaryfile_field %}
+    {% apply spaceless %}
+        <a href={{ path('netgen_enhancedezbinaryfile.route.download_binary_file', {infocollectionAttributeId: attribute.id}) }}>
+            Download
+        </a>
+    {% endapply %}
+{% endblock %}
+
 {% block default_field %}
     {% apply spaceless %}
         {{ attribute.value }}
diff --git a/bundle/Resources/views/admin/view.html.twig b/bundle/Resources/views/admin/view.html.twig
index fad83a99..a1d0eddb 100644
--- a/bundle/Resources/views/admin/view.html.twig
+++ b/bundle/Resources/views/admin/view.html.twig
@@ -32,7 +32,7 @@
                     <input id="{{ attribute.fieldDefinition.id }}" name="FieldId[]" value="{{ attribute.fieldDefinition.id }}" title="Select collections for removal." type="checkbox" data-enable="Item">
                     <label for="{{ attribute.fieldDefinition.id }}">
                         <span class="attribute-name">
-                            {{ ez_field_name(content, attribute.field.fieldDefIdentifier) }}:
+                            {{ ez_field_name(content, attribute.fieldDefinition.identifier) }}:
                         </span>
                         <span class="attribute-value">
                             {{ info_collection_render_field(collection, attribute) }}
diff --git a/bundle/Resources/views/email/default.html.twig b/bundle/Resources/views/email/default.html.twig
index 271a3f00..116dbba0 100644
--- a/bundle/Resources/views/email/default.html.twig
+++ b/bundle/Resources/views/email/default.html.twig
@@ -1,5 +1,6 @@
-{# event \Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected #}
-{# content \eZ\Publish\API\Repository\Values\Content\Content #}
+{# @var event \Netgen\InformationCollection\API\Value\Event\InformationCollected #}
+{# @var content \eZ\Publish\API\Repository\Values\Content\Content #}
+{# @var content_type \eZ\Publish\API\Repository\Values\ContentType\ContentType #}
 
 {% block email %}
 
@@ -12,19 +13,19 @@
                 {{ ez_field_name(content, field_name) }}:
             </div>
             <div class="value">
-                {% if content_type.fieldDefinitionsByIdentifier[field_name].fieldTypeIdentifier == 'ezselection' %}
-                    {% set selectionArray=field_value|split('-') %}
+                {% if content_type.fieldDefinitions.get(field_name).fieldTypeIdentifier == 'ezselection' %}
+                    {% set selectionArray=field_value.value|split('-') %}
                     {% if selectionArray|length > 1 %}<ul>{% endif %}
                     {% for selected_key, selected_value in selectionArray %}
                         {% if loop.length == 1 %}
-                            {{ content_type.fieldDefinitionsByIdentifier[field_name].fieldSettings.options[selected_value] }}<br>
+                            {{ content_type.fieldDefinitions.get(field_name).fieldSettings.options[selected_value] }}<br>
                         {% else %}
-                            <li>{{ content_type.fieldDefinitionsByIdentifier[field_name].fieldSettings.options[selected_value] }}</li><br>
+                            <li>{{ content_type.fieldDefinitions.get(field_name).fieldSettings.options[selected_value] }}</li><br>
                         {% endif %}
                     {% endfor %}
                     {% if selectionArray|length > 1 %}</ul>{% endif %}
                 {% else %}
-                    {{ field_value }}
+                    {{ field_value.value }}
                 {% endif %}
             </div><br>
         </div>
diff --git a/composer.json b/composer.json
index 4443ad91..a53d3fea 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         }
     ],
     "require": {
-        "php": "^7.3",
+        "php": ">=7.3",
         "ext-pdo": "*",
         "doctrine/orm": "^2.5",
         "ezsystems/ezplatform-admin-ui": "^2.0",
diff --git a/lib/API/Value/Captcha/ReCaptcha.php b/lib/API/Value/Captcha/ReCaptcha.php
index 399c6d03..a4324924 100644
--- a/lib/API/Value/Captcha/ReCaptcha.php
+++ b/lib/API/Value/Captcha/ReCaptcha.php
@@ -37,8 +37,6 @@ public function isValid(Request $request): bool
             $clientIp
         );
 
-        dump($response);
-
         return $response->isSuccess();
     }
 
diff --git a/lib/API/Value/InformationCollectionStruct.php b/lib/API/Value/InformationCollectionStruct.php
index 56b795d1..daa7300c 100644
--- a/lib/API/Value/InformationCollectionStruct.php
+++ b/lib/API/Value/InformationCollectionStruct.php
@@ -7,7 +7,7 @@
 use eZ\Publish\API\Repository\Values\Content\Content;
 use eZ\Publish\API\Repository\Values\Content\Location;
 use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use EzSystems\RepositoryForms\Data\Content\FieldData;
+use EzSystems\EzPlatformContentForms\Data\Content\FieldData;
 
 final class InformationCollectionStruct extends ValueObject
 {
@@ -82,7 +82,7 @@ public function getContentType(): ContentType
     }
 
     /**
-     * @return \EzSystems\RepositoryForms\Data\Content\FieldData[]
+     * @return FieldData[]
      */
     public function getFieldsData(): array
     {
@@ -90,7 +90,7 @@ public function getFieldsData(): array
     }
 
     /**
-     * @return \EzSystems\RepositoryForms\Data\Content\FieldData[]
+     * @return FieldData[]
      */
     public function getCollectedFields(): array
     {
diff --git a/lib/Core/Action/BaseEmailAction.php b/lib/Core/Action/BaseEmailAction.php
index 64605f5f..b4643cd2 100644
--- a/lib/Core/Action/BaseEmailAction.php
+++ b/lib/Core/Action/BaseEmailAction.php
@@ -8,6 +8,7 @@
 use Netgen\InformationCollection\API\Exception\EmailNotSentException;
 use Netgen\InformationCollection\API\MailerInterface;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
+use Netgen\InformationCollection\Core\EmailDataProvider\DefaultProvider;
 use Netgen\InformationCollection\Core\Factory\BaseEmailDataFactory;
 
 abstract class BaseEmailAction implements ActionInterface
@@ -18,20 +19,15 @@ abstract class BaseEmailAction implements ActionInterface
     protected $mailer;
 
     /**
-     * @var \Netgen\InformationCollection\Core\Factory\BaseEmailDataFactory
+     * @var DefaultProvider
      */
-    protected $factory;
+    protected $emailDataProvider;
 
-    /**
-     * EmailAction constructor.
-     *
-     * @param \Netgen\InformationCollection\API\MailerInterface $mailer
-     * @param \Netgen\InformationCollection\Core\Factory\BaseEmailDataFactory $factory
-     */
-    public function __construct(MailerInterface $mailer, BaseEmailDataFactory $factory)
+
+    public function __construct(MailerInterface $mailer, DefaultProvider $emailDataProvider)
     {
         $this->mailer = $mailer;
-        $this->factory = $factory;
+        $this->emailDataProvider = $emailDataProvider;
     }
 
     /**
@@ -39,10 +35,10 @@ public function __construct(MailerInterface $mailer, BaseEmailDataFactory $facto
      */
     public function act(InformationCollected $event): void
     {
-        $emailData = $this->factory->build($event);
+        $emailData = $this->emailDataProvider->provide($event);
 
         try {
-            $this->mailer->createAndSendMessage($emailData);
+            $this->mailer->sendEmail($emailData);
         } catch (EmailNotSentException $e) {
             $this->throwException($e);
         }
diff --git a/lib/Core/EmailDataProvider/AutoResponderProvider.php b/lib/Core/EmailDataProvider/AutoResponderProvider.php
index 33a3c238..cf8a4fea 100644
--- a/lib/Core/EmailDataProvider/AutoResponderProvider.php
+++ b/lib/Core/EmailDataProvider/AutoResponderProvider.php
@@ -3,21 +3,14 @@
 
 namespace Netgen\InformationCollection\Core\EmailDataProvider;
 
-use Netgen\InformationCollection\API\Action\EmailDataProviderInterface;
-use Netgen\InformationCollection\API\Value\Event\InformationCollected;
-use Symfony\Component\Mime\Email;
+use Netgen\InformationCollection\Core\Factory\AutoResponderDataFactory;
 
-class AutoResponderProvider implements EmailDataProviderInterface
+class AutoResponderProvider extends DefaultProvider
 {
-    public function provide(InformationCollected $value): Email
-    {
-        $email = new Email();
-
-        $headers = $email->getHeaders();
-
-        $header = new Header
-        $headers->add('Content-Type', '');
-
-        return $email;
+    // could be replaced by pure service configuration
+    public function __construct(
+        AutoResponderDataFactory $emailDataFactory
+    ) {
+        parent::__construct($emailDataFactory);
     }
 }
diff --git a/lib/Core/EmailDataProvider/DefaultProvider.php b/lib/Core/EmailDataProvider/DefaultProvider.php
index 61dae1e4..aadb945c 100644
--- a/lib/Core/EmailDataProvider/DefaultProvider.php
+++ b/lib/Core/EmailDataProvider/DefaultProvider.php
@@ -2,97 +2,46 @@
 
 namespace Netgen\InformationCollection\Core\EmailDataProvider;
 
+use EzSystems\EzPlatformContentForms\Data\Content\FieldData;
 use Netgen\InformationCollection\API\Action\EmailDataProviderInterface;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
+use Netgen\InformationCollection\Core\Factory\EmailDataFactory;
 use Symfony\Component\Mime\Email;
-use eZ\Publish\Core\MVC\ConfigResolverInterface;
-use Netgen\InformationCollection\Core\Action\EmailAction;
-use function array_key_exists;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\BinaryFile\Value as BinaryFile;
-use eZ\Publish\Core\Helper\FieldHelper;
-use eZ\Publish\Core\Helper\TranslationHelper;
-use Netgen\InformationCollection\API\Value\DataTransfer\EmailContent;
-use Netgen\InformationCollection\API\Constants;
-use Netgen\InformationCollection\API\ConfigurationConstants;
-use Netgen\InformationCollection\API\Exception\MissingEmailBlockException;
-use Netgen\InformationCollection\API\Exception\MissingValueException;
-use Netgen\InformationCollection\API\Value\DataTransfer\TemplateContent;
-use function trim;
-use Twig\Environment;
 
 class DefaultProvider implements EmailDataProviderInterface
 {
-    /**
-     * @var array
-     */
-    protected $configResolver;
+    protected $emailDataFactory;
 
-    /**
-     * @var \eZ\Publish\Core\Helper\TranslationHelper
-     */
-    protected $translationHelper;
-
-    /**
-     * @var \eZ\Publish\Core\Helper\FieldHelper
-     */
-    protected $fieldHelper;
-
-    /**
-     * @var \Twig\Environment
-     */
-    protected $twig;
-
-    /**
-     * EmailDataFactory constructor.
-     *
-     * @param array $config
-     * @param \eZ\Publish\Core\Helper\TranslationHelper $translationHelper
-     * @param \eZ\Publish\Core\Helper\FieldHelper $fieldHelper
-     * @param \Twig\Environment $twig
-     */
     public function __construct(
-        ConfigResolverInterface $configResolver,
-        TranslationHelper $translationHelper,
-        FieldHelper $fieldHelper,
-        Environment $twig
+        EmailDataFactory $emailDataFactory
     ) {
-        $this->configResolver = $configResolver;
-        $this->config = $this->configResolver->getParameter('action_config', 'netgen_information_collection')[EmailAction::$defaultName];
-        $this->translationHelper = $translationHelper;
-        $this->fieldHelper = $fieldHelper;
-        $this->twig = $twig;
+        $this->emailDataFactory = $emailDataFactory;
     }
 
-    /**
-     * Factory method.
-     *
-     * @param InformationCollected $value
-     *
-     * @return EmailContent
-     */
-    public function build(InformationCollected $value): EmailContent
+    public function provide(InformationCollected $value): Email
     {
-        $contentType = $value->getContentType();
-
-        $template = $this->resolveTemplate($contentType->identifier);
-
-        $templateWrapper = $this->twig->load($template);
-        $data = new TemplateContent($value, $templateWrapper);
-
-        $body = $this->resolveBody($data);
-
-        return new EmailContent(
-            $this->resolveEmail($data, Constants::FIELD_RECIPIENT),
-            $this->resolveEmail($data, Constants::FIELD_SENDER),
-            $this->resolve($data, Constants::FIELD_SUBJECT),
-            $body,
-            $this->resolveAttachments($contentType->identifier, $value->getInformationCollectionStruct()->getFieldsData())
+        $emailContent = $this->emailDataFactory->build($value);
+
+        $email = (new Email())
+            ->from(...$emailContent->getSender())
+            ->to(...$emailContent->getRecipients())
+            ->subject($emailContent->getSubject())
+            ->html($emailContent->getBody())
+            ->text($emailContent->getBody());
+
+        array_map(
+            function (FieldData $fieldData) use ($email) {
+                $binaryFileValue = $fieldData->value;
+
+                $email->attachFromPath(
+                    $binaryFileValue->inputUri,
+                    $binaryFileValue->fileName,
+                    $binaryFileValue->mimeType
+                );
+            },
+            $emailContent->getAttachments()
         );
-    }
 
-    public function provide(InformationCollected $value): Email
-    {
-        return new Email();
+        return $email;
     }
 }
diff --git a/lib/Core/Factory/AutoResponderDataFactory.php b/lib/Core/Factory/AutoResponderDataFactory.php
index 48894ae5..b915de54 100644
--- a/lib/Core/Factory/AutoResponderDataFactory.php
+++ b/lib/Core/Factory/AutoResponderDataFactory.php
@@ -4,6 +4,12 @@
 
 namespace Netgen\InformationCollection\Core\Factory;
 
+use eZ\Publish\Core\Helper\FieldHelper;
+use eZ\Publish\Core\Helper\TranslationHelper;
+use eZ\Publish\Core\MVC\ConfigResolverInterface;
+use Netgen\InformationCollection\Core\Action\AutoResponderAction;
+use Netgen\InformationCollection\Core\Action\EmailAction;
+use Twig\Environment;
 use function array_key_exists;
 use eZ\Publish\API\Repository\Values\Content\Field;
 use Netgen\InformationCollection\API\Constants;
@@ -16,6 +22,12 @@
 
 class AutoResponderDataFactory extends EmailDataFactory
 {
+    public function __construct(ConfigResolverInterface $configResolver, TranslationHelper $translationHelper, FieldHelper $fieldHelper, Environment $twig)
+    {
+        parent::__construct($configResolver, $translationHelper, $fieldHelper, $twig);
+        $this->config = $this->configResolver->getParameter('action_config', 'netgen_information_collection')[AutoResponderAction::$defaultName];
+    }
+
     /**
      * Factory method.
      *
@@ -85,7 +97,7 @@ protected function resolveRecipient(TemplateContent $data)
         }
 
         if (array_key_exists($field, $fields)) {
-            return [$fields[$field]->email];
+            return [$fields[$field]->value->email];
         }
 
         throw new MissingValueException($field);
diff --git a/lib/Core/Factory/EmailDataFactory.php b/lib/Core/Factory/EmailDataFactory.php
index d9b86c61..438fde38 100644
--- a/lib/Core/Factory/EmailDataFactory.php
+++ b/lib/Core/Factory/EmailDataFactory.php
@@ -182,7 +182,7 @@ protected function resolveEmail(TemplateContent $data, $field)
             $fieldValue = $this->translationHelper->getTranslatedField($content, $field);
 
             if ($fieldValue instanceof Field) {
-                return [$fieldValue->value->email];
+                return [(string)$fieldValue->value];
             }
 
         }
@@ -256,7 +256,7 @@ protected function resolveAttachments(string $contentTypeIdentifier, array $coll
         if (array_key_exists($contentTypeIdentifier, $this->config[ConfigurationConstants::ATTACHMENTS][ConfigurationConstants::CONTENT_TYPES])) {
             $send = $this->config[ConfigurationConstants::ATTACHMENTS][ConfigurationConstants::CONTENT_TYPES][$contentTypeIdentifier];
         } else {
-            $send = $this->config[ConfigurationConstants::ATTACHMENTS][ConfigurationConstants::SETTINGS_DEFAULT];
+            $send = $this->config[ConfigurationConstants::ATTACHMENTS]['enabled'];
         }
 
         if (!$send) {
@@ -274,9 +274,13 @@ protected function resolveAttachments(string $contentTypeIdentifier, array $coll
     protected function getBinaryFileFields(array $collectedFields)
     {
         $filtered = [];
-        foreach ($collectedFields as $identifier => $value) {
-            if ($value instanceof BinaryFile) {
-                $filtered[] = $value;
+
+        /**
+         * @var $collectedField \EzSystems\EzPlatformContentForms\Data\Content\FieldData
+         */
+        foreach ($collectedFields as $identifier => $collectedField) {
+            if ($collectedField->value instanceof BinaryFile) {
+                $filtered[] = $collectedField;
             }
         }
 
diff --git a/lib/Core/Mailer/SwiftMailerBasedMailer.php b/lib/Core/Mailer/SwiftMailerBasedMailer.php
index 964e4e48..a810617d 100644
--- a/lib/Core/Mailer/SwiftMailerBasedMailer.php
+++ b/lib/Core/Mailer/SwiftMailerBasedMailer.php
@@ -6,6 +6,7 @@
 
 use Netgen\InformationCollection\API\Exception\EmailNotSentException;
 use Netgen\InformationCollection\API\MailerInterface;
+use Swift_Message;
 use Symfony\Component\Mime\Email;
 
 class SwiftMailerBasedMailer implements MailerInterface
@@ -30,31 +31,59 @@ public function __construct(\Swift_Mailer $internalMailer)
      */
     public function sendEmail(Email $content): void
     {
-        $message = new \Swift_Message();
+        $message = new Swift_Message();
 
         try {
-            $message->setTo($content->getFrom());
+            $message->setTo(
+                array_map(
+                    function(\Symfony\Component\Mime\Address $address) {
+                        return $address->getAddress();
+                    },
+                    $content->getTo()
+                )
+            );
         } catch (\Swift_RfcComplianceException $e) {
             throw new EmailNotSentException('recipients', $e->getMessage());
         }
 
-        try {
-            $message->setFrom($data->getSender());
-        } catch (\Swift_RfcComplianceException $e) {
-            throw new EmailNotSentException('sender', $e->getMessage());
+        if (!$content->getFrom())
+        {
+            throw new EmailNotSentException('sender', "No sender has been set for the email.");
         }
 
-        $message->setSubject($data->getSubject());
+        $message->setFrom(
+            array_map(
+                function(\Symfony\Component\Mime\Address $address) {
+                    return $address->getAddress();
+                },
+                $content->getFrom()
+            )
+        );
+
+        $message->setSubject($content->getSubject());
+
+        // attachments still todo
+
+        if (!empty($content->getAttachments())) {
+            foreach ($content->getAttachments() as $attachment) {
+                $body = $attachment->getBody();
+                $preparedHeaders = $attachment->getPreparedHeaders();
+
+                $filename = $preparedHeaders->get('content-disposition')->getParameter('filename');
+                $contentType = $preparedHeaders->get('content-type')->getBody();
 
-        if ($data->hasAttachments()) {
-            foreach ($data->getAttachments() as $attachment) {
                 $message->attach(
-                    \Swift_Attachment::fromPath($attachment->inputUri, $attachment->mimeType)
-                        ->setFilename($attachment->fileName)
+                    new \Swift_Attachment($body, $filename, $contentType)
                 );
+
             }
         }
 
+        $message->setBody(
+            $content->getHtmlBody(),
+            'text/html'
+        );
+
         if (!$this->internalMailer->send($message)) {
             throw new EmailNotSentException('send', 'invalid mailer configuration?');
         }
diff --git a/lib/Core/Mailer/SymfonyMailerBasedMailer.php b/lib/Core/Mailer/SymfonyMailerBasedMailer.php
index 0c92fad5..a178f550 100644
--- a/lib/Core/Mailer/SymfonyMailerBasedMailer.php
+++ b/lib/Core/Mailer/SymfonyMailerBasedMailer.php
@@ -3,6 +3,7 @@
 namespace Netgen\InformationCollection\Core\Mailer;
 
 use Netgen\InformationCollection\API\MailerInterface;
+use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\MailerInterface as SfMailerInterface;
 use Symfony\Component\Mime\Email;
 
@@ -18,12 +19,11 @@ public function __construct(SfMailerInterface $mailer)
         $this->mailer = $mailer;
     }
 
+    /**
+     * @throws TransportExceptionInterface
+     */
     public function sendEmail(Email $content): void
     {
-        try {
-            $this->mailer->send($content);
-        } catch () {
-
-        }
+        $this->mailer->send($content);
     }
 }
diff --git a/lib/Doctrine/mappings/EzInfoCollection.orm.xml b/lib/Doctrine/mappings/EzInfoCollection.orm.xml
index 3d3e8068..385e739d 100644
--- a/lib/Doctrine/mappings/EzInfoCollection.orm.xml
+++ b/lib/Doctrine/mappings/EzInfoCollection.orm.xml
@@ -10,7 +10,7 @@
             table="ezinfocollection"
     >
         <indexes>
-            <index name="ezinfocollection_co_id_created" columns="contentobject_id, created" />
+            <index name="ezinfocollection_co_id_created" columns="contentobject_id,created" />
         </indexes>
 
         <id name="id" type="integer" column="id">
diff --git a/lib/Handler.php b/lib/Handler.php
index b5840d84..63d757c8 100644
--- a/lib/Handler.php
+++ b/lib/Handler.php
@@ -5,6 +5,7 @@
 use eZ\Publish\API\Repository\ContentTypeService;
 use eZ\Publish\API\Repository\Values\Content\Content;
 use eZ\Publish\API\Repository\Values\Content\Location;
+use eZ\Publish\Core\MVC\ConfigResolverInterface;
 use Netgen\InformationCollection\API\Events;
 use Netgen\InformationCollection\API\Value\Event\InformationCollected;
 use Netgen\InformationCollection\API\Value\InformationCollectionStruct;
@@ -31,11 +32,19 @@ final class Handler
      */
     private $eventDispatcher;
 
-    public function __construct(FormFactoryInterface $formFactory, ContentTypeService $contentTypeService, EventDispatcherInterface $eventDispatcher)
+    private ConfigResolverInterface $configResolver;
+
+    public function __construct(
+        FormFactoryInterface $formFactory,
+        ContentTypeService $contentTypeService,
+        EventDispatcherInterface $eventDispatcher,
+        ConfigResolverInterface $configResolver
+    )
     {
         $this->formFactory = $formFactory;
         $this->contentTypeService = $contentTypeService;
         $this->eventDispatcher = $eventDispatcher;
+        $this->configResolver = $configResolver;
     }
 
     public function getForm(Content $content, Location $location): FormInterface
@@ -47,11 +56,31 @@ public function getForm(Content $content, Location $location): FormInterface
         $data = $informationCollectionMapper->mapToFormData($content, $location, $contentType);
 
         return $this->formFactory->create(InformationCollectionType::class, $data, [
-            'languageCode' => $content->contentInfo->mainLanguageCode,
+            'languageCode' => $this->determineLanguageToLoad($content),
             'mainLanguageCode' => $content->contentInfo->mainLanguageCode,
         ]);
     }
 
+    /**
+     * @param Content $content
+     * @return string
+     */
+    private function determineLanguageToLoad(Content $content)
+    {
+        $versionInfo = $content->getVersionInfo();
+
+        $siteAccessLanguagesCodes = (array)$this->configResolver->getParameter('languages');
+        foreach($siteAccessLanguagesCodes as $languageCode)
+        {
+            if (in_array($languageCode, $versionInfo->languageCodes))
+            {
+                return $languageCode;
+            }
+        }
+
+        return $content->contentInfo->mainLanguageCode;
+    }
+
     public function handle(InformationCollectionStruct $struct, array $options): void
     {
         $event = new InformationCollected($struct, $options);
diff --git a/lib/Resources/config/actions.yml b/lib/Resources/config/actions.yml
index 45a206f9..fdb1d3c2 100644
--- a/lib/Resources/config/actions.yml
+++ b/lib/Resources/config/actions.yml
@@ -3,36 +3,32 @@ services:
         class: Netgen\InformationCollection\Core\Action\ActionRegistry
         arguments:
             - !tagged_iterator netgen_information_collection.action
-            - "@netgen_information_collection.action.config_utility"
+            - '@Netgen\InformationCollection\Core\Action\ConfigurationUtility'
             - "@logger"
             - "@event_dispatcher"
         calls:
             - [setDebug, ['%kernel.debug%']]
 
-    netgen_information_collection.action.config_utility:
-        class: Netgen\InformationCollection\Core\Action\ConfigurationUtility
+    Netgen\InformationCollection\Core\Action\ConfigurationUtility:
         arguments:
             - "@ezpublish.config.resolver"
 
-    netgen_information_collection.action.db:
-        class: Netgen\InformationCollection\Core\Action\DatabaseAction
+    Netgen\InformationCollection\Core\Action\DatabaseAction:
         arguments:
             - '@netgen_information_collection.api.service'
         tags:
             - { name: netgen_information_collection.action, priority: 300 }
 
-    netgen_information_collection.action.email:
-        class: Netgen\InformationCollection\Core\Action\EmailAction
+    Netgen\InformationCollection\Core\Action\EmailAction:
         arguments:
-            - '@netgen_information_collection.mailer'
-            - '@netgen_information_collection.factory.email_data'
+            - '@Netgen\InformationCollection\API\MailerInterface'
+            - '@Netgen\InformationCollection\Core\EmailDataProvider\DefaultProvider'
         tags:
             - { name: netgen_information_collection.action }
 
-#    netgen_information_collection.action.auto_responder:
-#        class: Netgen\InformationCollection\Core\Action\AutoResponderAction
-#        arguments:
-#            - '@netgen_information_collection.factory.auto_responder_data'
-#            - '@netgen_information_collection.mailer'
-#        tags:
-#            - { name: netgen_information_collection.action, alias: auto_responder }
+    Netgen\InformationCollection\Core\Action\AutoResponderAction:
+        arguments:
+            - '@Netgen\InformationCollection\API\MailerInterface'
+            - '@Netgen\InformationCollection\Core\EmailDataProvider\AutoResponderProvider'
+        tags:
+            - { name: netgen_information_collection.action }
diff --git a/lib/Resources/config/email_data_providers.yml b/lib/Resources/config/email_data_providers.yml
new file mode 100644
index 00000000..37e41f26
--- /dev/null
+++ b/lib/Resources/config/email_data_providers.yml
@@ -0,0 +1,8 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Netgen\InformationCollection\Core\EmailDataProvider\:
+        resource: '../../Core/EmailDataProvider/'
+        exclude: '../../Core/EmailDataProvider/AbstractProvider.php'
\ No newline at end of file
diff --git a/lib/Resources/config/factories.yml b/lib/Resources/config/factories.yml
index 598ef3fa..72fa41ee 100644
--- a/lib/Resources/config/factories.yml
+++ b/lib/Resources/config/factories.yml
@@ -1,16 +1,14 @@
 services:
-    netgen_information_collection.factory.email_data:
-        class: Netgen\InformationCollection\Core\Factory\EmailDataFactory
+    Netgen\InformationCollection\Core\Factory\EmailDataFactory:
         arguments:
             - '@ezpublish.config.resolver'
             - '@ezpublish.translation_helper'
             - '@ezpublish.field_helper'
             - '@twig'
 
-    netgen_information_collection.factory.auto_responder_data:
-        class: Netgen\InformationCollection\Core\Factory\AutoResponderDataFactory
+    Netgen\InformationCollection\Core\Factory\AutoResponderDataFactory:
         arguments:
-            - "$action_config.auto_responder;netgen_information_collection$"
+            - '@ezpublish.config.resolver'
             - '@ezpublish.translation_helper'
             - '@ezpublish.field_helper'
             - '@twig'
diff --git a/lib/Resources/config/mailers.yml b/lib/Resources/config/mailers.yml
new file mode 100644
index 00000000..fc3bcb78
--- /dev/null
+++ b/lib/Resources/config/mailers.yml
@@ -0,0 +1,9 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Netgen\InformationCollection\Core\Mailer\:
+        resource: '../../Core/Mailer/'
+
+    Netgen\InformationCollection\API\MailerInterface: '@Netgen\InformationCollection\Core\Mailer\SymfonyMailerBasedMailer'
diff --git a/lib/Resources/config/services.yml b/lib/Resources/config/services.yml
index 399266dc..7c7d7173 100644
--- a/lib/Resources/config/services.yml
+++ b/lib/Resources/config/services.yml
@@ -25,7 +25,7 @@ services:
     netgen_information_collection.mailer:
         class: Netgen\InformationCollection\Core\Mailer\Mailer
         arguments:
-            - '@mailer'
+            - 'Netgen\InformationCollection\API\MailerInterface'
 
     netgen_information_collection.form.extension.field_definition:
         class: Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\FieldDefinitionTypeExtension
@@ -53,6 +53,16 @@ services:
         tags:
             - { name: twig.runtime }
 
+    Netgen\Bundle\InformationCollectionBundle\Templating\Twig\Extensions\CaptchaExtension:
+        autowire: true
+        autoconfigure: true
+
+    Netgen\Bundle\InformationCollectionBundle\Templating\Twig\Extensions\CaptchaRuntime:
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: twig.runtime }
+
     netgen_information_collection.form.information_collection_type:
         class: Netgen\Bundle\InformationCollectionBundle\EzPlatform\RepositoryForms\InformationCollectionType
         arguments:
@@ -74,21 +84,26 @@ services:
             - "@form.factory"
             - "@ezpublish.api.service.content_type"
             - "@event_dispatcher"
+            - "@ezpublish.config.resolver"
+
+    Netgen\InformationCollection\Core\Service\CaptchaService:
+        autowire: true
 
     netgen_information_collection.captcha.service:
-        class: Netgen\InformationCollection\Core\Service\CaptchaService
-        arguments:
-            - '@ezpublish.api.service.content_type'
-            - '@ezpublish.config.resolver'
+        alias: Netgen\InformationCollection\Core\Service\CaptchaService
 
-    netgen_information_collection.export.json:
-        class: Netgen\InformationCollection\Core\Export\JsonExportResponseFormatter
+    Netgen\InformationCollection\Core\Export\JsonExportResponseFormatter:
         tags:
             - { name: netgen_information_collection.export.formatter }
 
+    netgen_information_collection.export.json:
+        alias: Netgen\InformationCollection\Core\Export\JsonExportResponseFormatter
+
     netgen_information_collection.form.captcha_type:
         class: Netgen\Bundle\InformationCollectionBundle\Form\CaptchaType
         arguments:
             - '@netgen_information_collection.listener.captcha_validation'
         tags:
             - { name: form.type }
+
+    # Autowire the providers