diff --git a/CHANGELOG.md b/CHANGELOG.md
index de01026..67b46fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## [Unreleased]
 
-## 1.1.0 - 2023-12-01
+## [1.2.0] - 2024-04-04
+### Added
+- Added integration of the new AMP API fields `mode` and `dimensions`.
+- Added possibility to render embed banners.
+- Added new rendering mode `embed` (`EmbedRenderingMode`) for the Latte bridge.
+
+### Changed
+- Updated docs
+
+## [1.1.0] - 2023-12-01
 ### Added
 - Added ability to provide custom options for each banner through Renderer or Latte macro.
 - Added support for native lazy loading. Feature can be enabled through banner options `'loading' => 'lazy'` and `'loading-offset' => <offset>` (for multiple positions only).
@@ -20,3 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Initial release.
+
+[Unreleased]: https://github.com/68publishers/amp-client-js/compare/v1.2.0...HEAD
+[1.2.0]: https://github.com/68publishers/amp-client-php/compare/v1.1.0...v1.2.0
+[1.1.0]: https://github.com/68publishers/amp-client-php/compare/v1.0.0...v1.1.0
diff --git a/README.md b/README.md
index 19d27ac..c71aecc 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,11 @@ $ composer require 68publishers/amp-client
 
 ## Versions compatibility matrix
 
-| PHP client version | JS client version | PHP version  | AMP version | API version |
-|:------------------:|:-----------------:|:------------:|:-----------:|:-----------:|
-|     `>=1.0.0`      |     `>=1.4.0`     |   `>=7.4`    | `>=2.12.0`  |     `1`     |
+| PHP client version | JS client version | AMP version | API version |
+|:------------------:|:-----------------:|:-----------:|:-----------:|
+|      `~1.0.0`      |     `~1.4.0`      |  `2.12.0`   |     `1`     |
+|      `~1.1.0`      |     `~1.4.0`      |  `2.12.0`   |     `1`     |
+|      `~1.2.0`      |     `~1.5.0`      | `>=2.13.0`  |     `1`     |
 
 ## Integration without a framework
 
diff --git a/docs/integration-with-nette-framework.md b/docs/integration-with-nette-framework.md
index 63be7ce..3e79d4f 100644
--- a/docs/integration-with-nette-framework.md
+++ b/docs/integration-with-nette-framework.md
@@ -146,6 +146,7 @@ The following rendering modes are available:
 
 - **direct** ([DirectRenderingMode](../src/Bridge/Latte/RenderingMode/DirectRenderingMode.php)) - The default mode, API is requested separately for each banner.
 - **client_side** ([ClientSideRenderingMode](../src/Bridge/Latte/RenderingMode/ClientSideRenderingMode.php)) - Renders only a wrapper element and leaves loading banners on the JavaScript client. Banners are loaded by calling the `attachBanners()` function.
+- **embed** ([EmbedRenderingMode](../src/Bridge/Latte/RenderingMode/EmbedRenderingMode.php)) - Same behavior as `client_side`, but passes the information to the JavaScript client that the banner should be rendered as `embed`.
 - **queued_in_presenter_context** ([QueuedRenderingInPresenterContextMode](../src/Bridge/Latte/RenderingMode/QueuedRenderingInPresenterContextMode.php)) - Renders only HTML comments as placeholders and stores requested positions in a queue. It will request, render and place all banners to them positions at once before the presenter returns a response.
 - **queued** ([QueuedRenderingMode](../src/Bridge/Latte/RenderingMode/QueuedRenderingMode.php)) - Same behavior as `queued_in_presenter_context`, but it doesn't take into account whether the website template is currently being rendered through the Nette application. It is more suited for an integration without a framework.
 
diff --git a/docs/integration-without-framework.md b/docs/integration-without-framework.md
index b22e703..d42c828 100644
--- a/docs/integration-without-framework.md
+++ b/docs/integration-without-framework.md
@@ -10,6 +10,7 @@
 * [Fetching banners](#fetching-banners)
 * [Rendering banners](#rendering-banners)
   * [Rendering banners on the client side](#rendering-banners-on-the-client-side)
+  * [Rendering embed (iframe) banners](#rendering-embed-iframe-banners)
   * [Lazy loading of image banners](#lazy-loading-of-image-banners)
   * [Templates overwriting](#templates-overwriting)
   * [Rendering banners using Latte](#rendering-banners-using-latte)
@@ -192,6 +193,56 @@ echo $renderer->renderClientSide(new Position('homepage.promo'), ['class' => 'my
 
 Banners rendered in this way will be loaded by the JavaScript client when its `attachBanners()` function is called.
 
+### Rendering embed (iframe) banners
+
+Banners can be rendered in "embed" mode, which means they are inside the `<iframe>` tag.
+This rendering mode is again controlled by the JavaScript client.
+
+```php
+use SixtyEightPublishers\AmpClient\Renderer\Renderer;
+use SixtyEightPublishers\AmpClient\Request\ValueObject\Position;
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
+
+$renderer = Renderer::create();
+
+echo $renderer->renderClientSide(
+    position: new Position('homepage.top'),
+    mode: ClientSideMode::embed(),
+);
+```
+
+The information that the banner should be rendered in the `<iframe>` tag can also be returned by AMP.
+If we want to follow this behavior, we need to condition the rendering ourselves.
+
+```php
+use SixtyEightPublishers\AmpClient\AmpClientInterface;
+use SixtyEightPublishers\AmpClient\Renderer\RendererInterface;
+use SixtyEightPublishers\AmpClient\Request\BannersRequest;
+use SixtyEightPublishers\AmpClient\Request\ValueObject\Position;
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
+
+/** @var AmpClientInterface $client */
+/** @var RendererInterface $renderer */
+
+$request = new BannersRequest([
+    new Position('homepage.top'),
+]);
+
+$response = $client->fetchBanners($request);
+$position = $response->getPosition('homepage.top');
+
+if ($position::ModeEmbed === $position->getMode()) {
+    echo $renderer->renderClientSide(
+        position: $request->getPosition('homepage.top'),
+        mode: ClientSideMode::embed(),
+    );
+} else {
+    echo $renderer->render($position);
+}
+```
+
+⚠️ Only image banners on `single` and `random` positions are now fully compatible with `embed` mode. Rendering other types via `embed` mode is not recommended.
+
 ### Lazy loading of image banners
 
 The default client templates support [native lazy loading](https://developer.mozilla.org/en-US/docs/Web/Performance/Lazy_loading#images_and_iframes) of images.
@@ -367,6 +418,7 @@ The following rendering modes are available:
 
 - **direct** ([DirectRenderingMode](../src/Bridge/Latte/RenderingMode/DirectRenderingMode.php)) - The default mode, API is requested separately for each banner.
 - **client_side** ([ClientSideRenderingMode](../src/Bridge/Latte/RenderingMode/ClientSideRenderingMode.php)) - Renders only a wrapper element and leaves loading banners on the JavaScript client. Banners are loaded by calling the `attachBanners()` function.
+- **embed** ([EmbedRenderingMode](../src/Bridge/Latte/RenderingMode/EmbedRenderingMode.php)) - Same behavior as `client_side`, but passes the information to the JavaScript client that the banner should be rendered as `embed`.
 - **queued** ([QueuedRenderingMode](../src/Bridge/Latte/RenderingMode/QueuedRenderingMode.php)) - Renders only HTML comments as placeholders and stores requested positions in a queue. It will request and render all banners at once when the `RendererProvider::renderQueuedPositions()` method is called.
 - **queued_in_presenter_context** ([QueuedRenderingInPresenterContextMode](../src/Bridge/Latte/RenderingMode/QueuedRenderingInPresenterContextMode.php)) - Same behavior as `queued` but in the context of a Presenter only. Usable with Nette applications only.
 
diff --git a/src/Bridge/Latte/RendererProvider.php b/src/Bridge/Latte/RendererProvider.php
index 2120040..fc7441a 100644
--- a/src/Bridge/Latte/RendererProvider.php
+++ b/src/Bridge/Latte/RendererProvider.php
@@ -10,9 +10,11 @@
 use SixtyEightPublishers\AmpClient\Bridge\Latte\Event\ConfigureClientEvent;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\Event\ConfigureClientEventHandlerInterface;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\DirectRenderingMode;
+use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\EmbedRenderingMode;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\RenderingModeInterface;
 use SixtyEightPublishers\AmpClient\Exception\AmpExceptionInterface;
 use SixtyEightPublishers\AmpClient\Exception\RendererException;
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
 use SixtyEightPublishers\AmpClient\Renderer\RendererInterface;
 use SixtyEightPublishers\AmpClient\Request\BannersRequest;
 use SixtyEightPublishers\AmpClient\Request\ValueObject\BannerResource;
@@ -88,7 +90,11 @@ public function __invoke(object $globals, string $positionCode, array $options =
         $position = $this->createPosition($positionCode, $options);
 
         if ($renderingMode->shouldBePositionRenderedClientSide($position)) {
-            return $this->renderClientSidePosition($position, $options);
+            return $this->renderClientSidePosition(
+                $position,
+                $options,
+                $renderingMode instanceof EmbedRenderingMode ? ClientSideMode::embed() : ClientSideMode::managed(),
+            );
         }
 
         if ($renderingMode->shouldBePositionQueued($position, $globals)) {
@@ -101,7 +107,17 @@ public function __invoke(object $globals, string $positionCode, array $options =
             return '';
         }
 
-        return $this->renderPosition($response->getPosition($positionCode), $options);
+        $responsePosition = $response->getPosition($positionCode);
+
+        if ($responsePosition::ModeEmbed === $responsePosition->getMode()) {
+            return $this->renderClientSidePosition(
+                $position,
+                $options,
+                ClientSideMode::embed(),
+            );
+        }
+
+        return $this->renderPosition($responsePosition, $options);
     }
 
     public function setDebugMode(bool $debugMode): self
@@ -202,13 +218,23 @@ public function renderQueuedPositions($output)
         $replacements = array_filter(
             array_map(
                 function (array $item) use ($response): ?string {
-                    $responsePosition = $response->getPosition($item[0]->getCode());
+                    $requestPosition = $item[0];
+                    $options = $item[1];
+                    $responsePosition = $response->getPosition($requestPosition->getCode());
 
                     if (null === $responsePosition) {
                         return null;
                     }
 
-                    return $this->renderPosition($responsePosition, $item[1]);
+                    if ($responsePosition::ModeEmbed === $responsePosition->getMode()) {
+                        return $this->renderClientSidePosition(
+                            $requestPosition,
+                            $options,
+                            ClientSideMode::embed(),
+                        );
+                    }
+
+                    return $this->renderPosition($responsePosition, $options);
                 },
                 $this->queue,
             ),
@@ -301,13 +327,13 @@ private function renderPosition(ResponsePosition $position, array $options): str
     /**
      * @param array<string, mixed> $options
      */
-    private function renderClientSidePosition(RequestPosition $position, array $options): string
+    private function renderClientSidePosition(RequestPosition $position, array $options, ClientSideMode $mode): string
     {
         try {
             $elementAttributes = (array) ($options[self::OptionAttributes] ?? []);
             $bannerOptions = (array) ($options[self::OptionOptions] ?? []);
 
-            return $this->renderer->renderClientSide($position, $elementAttributes, $bannerOptions);
+            return $this->renderer->renderClientSide($position, $elementAttributes, $bannerOptions, $mode);
         } catch (RendererException $e) {
             if ($this->debugMode) {
                 throw $e;
diff --git a/src/Bridge/Latte/RenderingMode/EmbedRenderingMode.php b/src/Bridge/Latte/RenderingMode/EmbedRenderingMode.php
new file mode 100644
index 0000000..4e931e9
--- /dev/null
+++ b/src/Bridge/Latte/RenderingMode/EmbedRenderingMode.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode;
+
+use SixtyEightPublishers\AmpClient\Request\ValueObject\Position;
+
+final class EmbedRenderingMode implements RenderingModeInterface
+{
+    public const Name = 'embed';
+
+    public function getName(): string
+    {
+        return self::Name;
+    }
+
+    public function supportsQueues(): bool
+    {
+        return false;
+    }
+
+    public function shouldBePositionQueued(Position $position, object $globals): bool
+    {
+        return false;
+    }
+
+    public function shouldBePositionRenderedClientSide(Position $position): bool
+    {
+        return true;
+    }
+}
diff --git a/src/Bridge/Nette/DI/AmpClientLatteExtension.php b/src/Bridge/Nette/DI/AmpClientLatteExtension.php
index 77115dd..5b4fe41 100644
--- a/src/Bridge/Nette/DI/AmpClientLatteExtension.php
+++ b/src/Bridge/Nette/DI/AmpClientLatteExtension.php
@@ -22,6 +22,7 @@
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RendererProvider;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\ClientSideRenderingMode;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\DirectRenderingMode;
+use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\EmbedRenderingMode;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\QueuedRenderingInPresenterContextMode;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\QueuedRenderingMode;
 use SixtyEightPublishers\AmpClient\Bridge\Nette\Application\AttachPresenterHandlersOnApplicationHandler;
@@ -38,6 +39,7 @@ final class AmpClientLatteExtension extends CompilerExtension
         QueuedRenderingMode::Name => QueuedRenderingMode::class,
         QueuedRenderingInPresenterContextMode::Name => QueuedRenderingInPresenterContextMode::class,
         ClientSideRenderingMode::Name => ClientSideRenderingMode::class,
+        EmbedRenderingMode::Name => EmbedRenderingMode::class,
     ];
 
     private bool $debugMode;
diff --git a/src/Renderer/AmpBannerExternalAttribute.php b/src/Renderer/AmpBannerExternalAttribute.php
index eb4573a..548832c 100644
--- a/src/Renderer/AmpBannerExternalAttribute.php
+++ b/src/Renderer/AmpBannerExternalAttribute.php
@@ -43,6 +43,10 @@ public function __toString(): string
                 'rotationSeconds' => $this->position->getRotationSeconds(),
                 'displayType' => $this->position->getDisplayType(),
                 'breakpointType' => $this->position->getBreakpointType(),
+                'dimensions' => [
+                    'width' => $this->position->getDimensions()->getWidth(),
+                    'height' => $this->position->getDimensions()->getHeight(),
+                ],
             ],
             'state' => [
                 'value' => $this->state,
diff --git a/src/Renderer/ClientSideMode.php b/src/Renderer/ClientSideMode.php
new file mode 100644
index 0000000..29ade34
--- /dev/null
+++ b/src/Renderer/ClientSideMode.php
@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SixtyEightPublishers\AmpClient\Renderer;
+
+use InvalidArgumentException;
+use function in_array;
+use function sprintf;
+
+final class ClientSideMode
+{
+    public const Modes = [
+        self::Managed,
+        self::Embed,
+    ];
+
+    private const Managed = 'managed';
+    private const Embed = 'embed';
+
+    private string $value;
+
+    private function __construct(string $value)
+    {
+        $this->value = $value;
+    }
+
+    public static function managed(): self
+    {
+        return new self(self::Managed);
+    }
+
+    public static function embed(): self
+    {
+        return new self(self::Embed);
+    }
+
+    public static function fromValue(string $value): self
+    {
+        if (!in_array($value, self::Modes, true)) {
+            throw new InvalidArgumentException(sprintf(
+                'Value "%s" is not valid client side mode.',
+                $value,
+            ));
+        }
+
+        return new self($value);
+    }
+
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    public function isManaged(): bool
+    {
+        return self::Managed === $this->value;
+    }
+
+    public function isEmbed(): bool
+    {
+        return self::Embed === $this->value;
+    }
+}
diff --git a/src/Renderer/Latte/LatteRendererBridge.php b/src/Renderer/Latte/LatteRendererBridge.php
index 7fce64a..f5028ef 100644
--- a/src/Renderer/Latte/LatteRendererBridge.php
+++ b/src/Renderer/Latte/LatteRendererBridge.php
@@ -5,6 +5,7 @@
 namespace SixtyEightPublishers\AmpClient\Renderer\Latte;
 
 use Latte\Engine;
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
 use SixtyEightPublishers\AmpClient\Renderer\Latte\Templates\ClientSideTemplate;
 use SixtyEightPublishers\AmpClient\Renderer\Latte\Templates\MultipleTemplate;
 use SixtyEightPublishers\AmpClient\Renderer\Latte\Templates\NotFoundTemplate;
@@ -83,11 +84,11 @@ public function renderMultiple(ResponsePosition $position, array $banners, array
         );
     }
 
-    public function renderClientSide(RequestPosition $position, array $elementAttributes = [], array $options = []): string
+    public function renderClientSide(RequestPosition $position, ClientSideMode $mode, array $elementAttributes = [], array $options = []): string
     {
         return $this->getLatte()->renderToString(
             $this->templates->getTemplateFile(Templates::ClientSide),
-            new ClientSideTemplate($position, $elementAttributes, $options),
+            new ClientSideTemplate($position, $mode, $elementAttributes, $options),
         );
     }
 
diff --git a/src/Renderer/Latte/Templates/ClientSideTemplate.php b/src/Renderer/Latte/Templates/ClientSideTemplate.php
index 3609592..1c65041 100644
--- a/src/Renderer/Latte/Templates/ClientSideTemplate.php
+++ b/src/Renderer/Latte/Templates/ClientSideTemplate.php
@@ -4,12 +4,15 @@
 
 namespace SixtyEightPublishers\AmpClient\Renderer\Latte\Templates;
 
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
 use SixtyEightPublishers\AmpClient\Request\ValueObject\Position;
 
 final class ClientSideTemplate
 {
     public Position $position;
 
+    public ClientSideMode $mode;
+
     /** @var array<string, scalar|null> */
     public array $elementAttributes;
 
@@ -22,10 +25,12 @@ final class ClientSideTemplate
      */
     public function __construct(
         Position $position,
+        ClientSideMode $mode,
         array $elementAttributes,
         array $options
     ) {
         $this->position = $position;
+        $this->mode = $mode;
         $this->elementAttributes = $elementAttributes;
         $this->options = $options;
     }
diff --git a/src/Renderer/Latte/Templates/clientSide.latte b/src/Renderer/Latte/Templates/clientSide.latte
index c9a91d9..765f378 100644
--- a/src/Renderer/Latte/Templates/clientSide.latte
+++ b/src/Renderer/Latte/Templates/clientSide.latte
@@ -3,5 +3,5 @@
 {var $helpers = SixtyEightPublishers\AmpClient\Renderer\Latte\Helpers::class}
 
 <div data-amp-banner="{$position->getCode()}"
-     n:attr="array_merge($helpers::createResourceAttributes($position), $helpers::createOptionAttributes($options), $elementAttributes)">
+     n:attr="array_merge(['data-amp-mode' => $mode->isEmbed() ? $mode->getValue() : null], $helpers::createResourceAttributes($position), $helpers::createOptionAttributes($options), $elementAttributes)">
 </div>
diff --git a/src/Renderer/Latte/Templates/contents.fragment.latte b/src/Renderer/Latte/Templates/contents.fragment.latte
index 7122925..a849788 100644
--- a/src/Renderer/Latte/Templates/contents.fragment.latte
+++ b/src/Renderer/Latte/Templates/contents.fragment.latte
@@ -20,7 +20,12 @@
                     src="{$content->getSrc()}"
                     sizes="{$content->getSizes()}"
                     alt="{$content->getAlt()}"
-                    n:attr="title => '' !== $content->getTitle() ? $content->getTitle() : null, loading => $options['loading'] ?? null">
+                    n:attr="
+                        width => null !== $position->getDimensions()->getWidth() ? $position->getDimensions()->getWidth() : null,
+                        height => null !== $position->getDimensions()->getHeight() ? $position->getDimensions()->getHeight() : null,
+                        title => '' !== $content->getTitle() ? $content->getTitle() : null,
+                        loading => $options['loading'] ?? null
+                    ">
            </picture>
         </a>
     {elseif $content instanceof SixtyEightPublishers\AmpClient\Response\ValueObject\HtmlContent}
diff --git a/src/Renderer/Phtml/PhtmlRendererBridge.php b/src/Renderer/Phtml/PhtmlRendererBridge.php
index 4b60b47..b27d540 100644
--- a/src/Renderer/Phtml/PhtmlRendererBridge.php
+++ b/src/Renderer/Phtml/PhtmlRendererBridge.php
@@ -4,6 +4,7 @@
 
 namespace SixtyEightPublishers\AmpClient\Renderer\Phtml;
 
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
 use SixtyEightPublishers\AmpClient\Renderer\OutputBuffer;
 use SixtyEightPublishers\AmpClient\Renderer\RendererBridgeInterface;
 use SixtyEightPublishers\AmpClient\Renderer\Templates;
@@ -86,11 +87,11 @@ public function renderMultiple(ResponsePosition $position, array $banners, array
     /**
      * @throws Throwable
      */
-    public function renderClientSide(RequestPosition $position, array $elementAttributes = [], array $options = []): string
+    public function renderClientSide(RequestPosition $position, ClientSideMode $mode, array $elementAttributes = [], array $options = []): string
     {
         $filename = $this->templates->getTemplateFile(Templates::ClientSide);
 
-        return OutputBuffer::capture(function () use ($filename, $position, $elementAttributes, $options) {
+        return OutputBuffer::capture(function () use ($filename, $position, $elementAttributes, $options, $mode) {
             require $filename;
         });
     }
diff --git a/src/Renderer/Phtml/Templates/clientSide.phtml b/src/Renderer/Phtml/Templates/clientSide.phtml
index 9ad1016..a994749 100644
--- a/src/Renderer/Phtml/Templates/clientSide.phtml
+++ b/src/Renderer/Phtml/Templates/clientSide.phtml
@@ -4,13 +4,20 @@ declare(strict_types=1);
 
 namespace SixtyEightPublishers\AmpClient\Renderer\Phtml;
 
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
 use SixtyEightPublishers\AmpClient\Request\ValueObject\Position;
+use SixtyEightPublishers\AmpClient\Request\ValueObject\BannerResource;
 
 /** @var Position $position */
 /** @var array<string, scalar|null> $elementAttributes */
 /** @var array<string, scalar> $options */
+/** @var ClientSideMode $mode */
 ?>
 <div data-amp-banner="<?= Helpers::escapeHtmlAttr($position->getCode()) ?>"
-    <?php foreach ($position->getResources() as $resource) : ?><?= 'data-amp-resource-' . $resource->getCode() . '="' . implode(',', $resource->getValues()) . '"' ?><?php endforeach ?>
-    <?= Helpers::printAttributes(array_merge(Helpers::prefixKeys($options, 'data-amp-option-'), $elementAttributes)) ?>>
+    <?= Helpers::printAttributes(array_merge(
+            ['data-amp-mode' => $mode->isEmbed() ? $mode->getValue() : null],
+            array_map(static fn (BannerResource $resource): string => implode(',', $resource->getValues()), Helpers::prefixKeys($position->getResources(), 'data-amp-resource-')),
+            Helpers::prefixKeys($options, 'data-amp-option-'),
+            $elementAttributes
+    )) ?>>
 </div>
diff --git a/src/Renderer/Phtml/Templates/contents.fragment.phtml b/src/Renderer/Phtml/Templates/contents.fragment.phtml
index 98168c7..ff87cd6 100644
--- a/src/Renderer/Phtml/Templates/contents.fragment.phtml
+++ b/src/Renderer/Phtml/Templates/contents.fragment.phtml
@@ -14,7 +14,7 @@ use SixtyEightPublishers\AmpClient\Renderer\BreakpointStyle\BreakpointStyle;
 /** @var ?Banner $banner */
 /** @var array<string, scalar> $options */
 ?>
-<?php foreach ($banner->getContents() as $index => $content) : ?>
+<?php foreach ($banner->getContents() as $content) : ?>
     <?php if ($content instanceof ImageContent) : ?>
         <a data-amp-content-breakpoint="<?= Helpers::escapeHtmlAttr($content->getBreakpoint() ?? 'default') ?>"
            class="amp-banner__content amp-banner__content--img"
@@ -30,6 +30,8 @@ use SixtyEightPublishers\AmpClient\Renderer\BreakpointStyle\BreakpointStyle;
                      src="<?= Helpers::escapeHtmlAttr($content->getSrc()) ?>"
                      sizes="<?= Helpers::escapeHtmlAttr($content->getSizes()) ?>"
                      alt="<?= Helpers::escapeHtmlAttr($content->getAlt()) ?>"
+                     <?php if (null !== $position->getDimensions()->getWidth()) : ?>width="<?= Helpers::escapeHtmlAttr($position->getDimensions()->getWidth()) ?>"<?php endif ?>
+                     <?php if (null !== $position->getDimensions()->getHeight()) : ?>height="<?= Helpers::escapeHtmlAttr($position->getDimensions()->getHeight()) ?>"<?php endif ?>
                      <?php if ('' !== $content->getTitle()) : ?>title="<?= Helpers::escapeHtmlAttr($content->getTitle()) ?>"<?php endif ?>
                      <?php if (isset($options['loading'])) : ?>loading="<?= Helpers::escapeHtmlAttr($options['loading']) ?>"<?php endif ?>>
             </picture>
diff --git a/src/Renderer/Renderer.php b/src/Renderer/Renderer.php
index 1cc9700..cee2c52 100644
--- a/src/Renderer/Renderer.php
+++ b/src/Renderer/Renderer.php
@@ -79,11 +79,18 @@ public function render(ResponsePosition $position, array $elementAttributes = []
         }
     }
 
-    public function renderClientSide(RequestPosition $position, array $elementAttributes = [], array $options = []): string
+    public function renderClientSide(RequestPosition $position, array $elementAttributes = [], array $options = [], ?ClientSideMode $mode = null): string
     {
+        $mode = $mode ?? ClientSideMode::managed();
+
+        if ($mode->isEmbed()) {
+            $options['omit-default-resources'] = '1';
+        }
+
         try {
             return $this->rendererBridge->renderClientSide(
                 $position,
+                $mode,
                 $elementAttributes,
                 $options,
             );
diff --git a/src/Renderer/RendererBridgeInterface.php b/src/Renderer/RendererBridgeInterface.php
index 9e5233a..8febf94 100644
--- a/src/Renderer/RendererBridgeInterface.php
+++ b/src/Renderer/RendererBridgeInterface.php
@@ -41,5 +41,5 @@ public function renderMultiple(ResponsePosition $position, array $banners, array
      * @param array<string, scalar|null> $elementAttributes
      * @param array<string, scalar>      $options
      */
-    public function renderClientSide(RequestPosition $position, array $elementAttributes = [], array $options = []): string;
+    public function renderClientSide(RequestPosition $position, ClientSideMode $mode, array $elementAttributes = [], array $options = []): string;
 }
diff --git a/src/Renderer/RendererInterface.php b/src/Renderer/RendererInterface.php
index ba51951..c7f3bdd 100644
--- a/src/Renderer/RendererInterface.php
+++ b/src/Renderer/RendererInterface.php
@@ -24,5 +24,5 @@ public function render(ResponsePosition $position, array $elementAttributes = []
      *
      * @throws RendererException
      */
-    public function renderClientSide(RequestPosition $position, array $elementAttributes = [], array $options = []): string;
+    public function renderClientSide(RequestPosition $position, array $elementAttributes = [], array $options = [], ?ClientSideMode $mode = null): string;
 }
diff --git a/src/Request/BannersRequest.php b/src/Request/BannersRequest.php
index af2ffc5..85f0e6e 100644
--- a/src/Request/BannersRequest.php
+++ b/src/Request/BannersRequest.php
@@ -55,6 +55,11 @@ public function getPositions(): array
         return $this->positions;
     }
 
+    public function getPosition(string $name): ?Position
+    {
+        return $this->positions[$name] ?? null;
+    }
+
     public function getLocale(): ?string
     {
         return $this->locale;
diff --git a/src/Response/Hydrator/BannersResponseHydratorHandler.php b/src/Response/Hydrator/BannersResponseHydratorHandler.php
index 5ccf145..ae3cda1 100644
--- a/src/Response/Hydrator/BannersResponseHydratorHandler.php
+++ b/src/Response/Hydrator/BannersResponseHydratorHandler.php
@@ -7,6 +7,7 @@
 use SixtyEightPublishers\AmpClient\Response\BannersResponse;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Banner;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\ContentInterface;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Dimensions;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\HtmlContent;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\ImageContent;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Position;
@@ -46,12 +47,19 @@
  *     contents: array<int, HtmlContentData|ImageContentData>,
  * }
  *
+ * @phpstan-type DimensionsData = array{
+ *     width: int|null,
+ *     height: int|null,
+ * }
+ *
  * @phpstan-type PositionData = array{
  *     position_id?: string|null,
  *     position_name?: string|null,
  *     rotation_seconds: int,
  *     display_type: string|null,
  *     breakpoint_type: string,
+ *     mode?: string,
+ *     dimensions?: DimensionsData,
  *     banners: array<int, BannerData>,
  * }
  *
@@ -83,6 +91,8 @@ public function hydrate($responseBody): BannersResponse
                 $positionData['rotation_seconds'],
                 $positionData['display_type'] ?? null,
                 $positionData['breakpoint_type'],
+                $positionData['mode'] ?? Position::ModeManaged,
+                $this->hydrateDimensions($positionData['dimensions'] ?? null),
                 $this->hydrateBanners($positionData['banners']),
             );
         }
@@ -159,4 +169,19 @@ private function hydrateContents(array $contentsData): array
 
         return $contents;
     }
+
+    /**
+     * @param DimensionsData|null $dimensions
+     */
+    private function hydrateDimensions(?array $dimensions): Dimensions
+    {
+        if (null === $dimensions) {
+            return new Dimensions(null, null);
+        }
+
+        return new Dimensions(
+            $dimensions['width'] ?? null,
+            $dimensions['height'] ?? null,
+        );
+    }
 }
diff --git a/src/Response/ValueObject/Dimensions.php b/src/Response/ValueObject/Dimensions.php
new file mode 100644
index 0000000..6f0426a
--- /dev/null
+++ b/src/Response/ValueObject/Dimensions.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SixtyEightPublishers\AmpClient\Response\ValueObject;
+
+final class Dimensions
+{
+    private ?int $width;
+
+    private ?int $height;
+
+    public function __construct(
+        ?int $width,
+        ?int $height
+    ) {
+        $this->width = $width;
+        $this->height = $height;
+    }
+
+    public function getWidth(): ?int
+    {
+        return $this->width;
+    }
+
+    public function getHeight(): ?int
+    {
+        return $this->height;
+    }
+}
diff --git a/src/Response/ValueObject/Position.php b/src/Response/ValueObject/Position.php
index d5d53d4..5fd7dd7 100644
--- a/src/Response/ValueObject/Position.php
+++ b/src/Response/ValueObject/Position.php
@@ -13,6 +13,9 @@ final class Position
     public const BreakpointTypeMin = 'min';
     public const BreakpointTypeMax = 'max';
 
+    public const ModeManaged = 'managed';
+    public const ModeEmbed = 'embed';
+
     private ?string $id;
 
     private string $code;
@@ -25,6 +28,10 @@ final class Position
 
     private string $breakpointType;
 
+    private string $mode;
+
+    private Dimensions $dimensions;
+
     /** @var array<int, Banner> */
     private array $banners;
 
@@ -38,6 +45,8 @@ public function __construct(
         int $rotationSeconds,
         ?string $displayType,
         string $breakpointType,
+        string $mode,
+        Dimensions $dimensions,
         array $banners
     ) {
         $this->id = $id;
@@ -46,6 +55,8 @@ public function __construct(
         $this->rotationSeconds = $rotationSeconds;
         $this->displayType = $displayType;
         $this->breakpointType = $breakpointType;
+        $this->mode = $mode;
+        $this->dimensions = $dimensions;
         $this->banners = $banners;
     }
 
@@ -79,6 +90,16 @@ public function getBreakpointType(): string
         return $this->breakpointType;
     }
 
+    public function getMode(): string
+    {
+        return $this->mode;
+    }
+
+    public function getDimensions(): Dimensions
+    {
+        return $this->dimensions;
+    }
+
     /**
      * @return array<int, Banner>
      */
diff --git a/tests/Bridge/Latte/RendererProviderTest.php b/tests/Bridge/Latte/RendererProviderTest.php
index fd1a935..91ec645 100644
--- a/tests/Bridge/Latte/RendererProviderTest.php
+++ b/tests/Bridge/Latte/RendererProviderTest.php
@@ -4,19 +4,23 @@
 
 namespace SixtyEightPublishers\AmpClient\Tests\Bridge\Latte;
 
+use Hamcrest\Matchers;
 use InvalidArgumentException;
 use Mockery;
 use Psr\Log\LoggerInterface;
 use SixtyEightPublishers\AmpClient\AmpClientInterface;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\Event\ConfigureClientEvent;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RendererProvider;
+use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\EmbedRenderingMode;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\RenderingModeInterface;
 use SixtyEightPublishers\AmpClient\Exception\RendererException;
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
 use SixtyEightPublishers\AmpClient\Renderer\RendererInterface;
 use SixtyEightPublishers\AmpClient\Request\BannersRequest;
 use SixtyEightPublishers\AmpClient\Request\ValueObject\BannerResource;
 use SixtyEightPublishers\AmpClient\Request\ValueObject\Position as RequestPosition;
 use SixtyEightPublishers\AmpClient\Response\BannersResponse;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Dimensions;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Position as ResponsePosition;
 use SixtyEightPublishers\AmpClient\Tests\Bridge\Latte\Event\ConfigureClientEventHandlerFixture;
 use SixtyEightPublishers\AmpClient\Tests\Exception\AmpExceptionFixture;
@@ -34,7 +38,17 @@ public function testInvokingDefaultInstanceWithoutResources(): void
         $renderer = Mockery::mock(RendererInterface::class);
         $provider = new RendererProvider($client, $renderer);
 
-        $responsePosition = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
+        $responsePosition = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
         $response = new BannersResponse([
             'homepage.top' => $responsePosition,
         ]);
@@ -69,7 +83,17 @@ public function testInvokingDefaultInstanceWithSameModeAsDefault(): void
         $renderer = Mockery::mock(RendererInterface::class);
         $provider = new RendererProvider($client, $renderer);
 
-        $responsePosition = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
+        $responsePosition = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
         $response = new BannersResponse([
             'homepage.top' => $responsePosition,
         ]);
@@ -104,7 +128,17 @@ public function testInvokingDefaultInstanceWithAttributes(): void
         $renderer = Mockery::mock(RendererInterface::class);
         $provider = new RendererProvider($client, $renderer);
 
-        $responsePosition = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
+        $responsePosition = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
         $response = new BannersResponse([
             'homepage.top' => $responsePosition,
         ]);
@@ -139,7 +173,17 @@ public function testInvokingDefaultInstanceWithOptions(): void
         $renderer = Mockery::mock(RendererInterface::class);
         $provider = new RendererProvider($client, $renderer);
 
-        $responsePosition = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
+        $responsePosition = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
         $response = new BannersResponse([
             'homepage.top' => $responsePosition,
         ]);
@@ -174,7 +218,17 @@ public function testInvokingDefaultInstanceWithResources(): void
         $renderer = Mockery::mock(RendererInterface::class);
         $provider = new RendererProvider($client, $renderer);
 
-        $responsePosition = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
+        $responsePosition = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
         $response = new BannersResponse([
             'homepage.top' => $responsePosition,
         ]);
@@ -218,6 +272,52 @@ public function testInvokingDefaultInstanceWithResources(): void
         );
     }
 
+    public function testInvokingDefaultInstanceWithPositionInEmbedMode(): void
+    {
+        $client = Mockery::mock(AmpClientInterface::class);
+        $renderer = Mockery::mock(RendererInterface::class);
+        $provider = new RendererProvider($client, $renderer);
+
+        $positionMode = ResponsePosition::ModeEmbed;
+        $responsePosition = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            $positionMode,
+            new Dimensions(null, null),
+            [],
+        );
+        $response = new BannersResponse([
+            'homepage.top' => $responsePosition,
+        ]);
+
+        $client
+            ->shouldReceive('fetchBanners')
+            ->once()
+            ->with(Mockery::type(BannersRequest::class))
+            ->andReturnUsing(static function (BannersRequest $request) use ($response): BannersResponse {
+                Assert::equal(
+                    new BannersRequest([
+                        new RequestPosition('homepage.top'),
+                    ]),
+                    $request,
+                );
+
+                return $response;
+            });
+
+        $renderer
+            ->shouldReceive('renderClientSide')
+            ->once()
+            ->with(Matchers::equalTo(new RequestPosition('homepage.top')), [], [], Matchers::equalTo(ClientSideMode::embed()))
+            ->andReturn('<homepage.top>');
+
+        Assert::same('<homepage.top>', $provider(new stdClass(), 'homepage.top'));
+    }
+
     public function testClientConfigurationEventsShouldBeInvokedBeforeFirstFetch(): void
     {
         $client = Mockery::mock(AmpClientInterface::class);
@@ -225,7 +325,17 @@ public function testClientConfigurationEventsShouldBeInvokedBeforeFirstFetch():
         $renderer = Mockery::mock(RendererInterface::class);
         $provider = new RendererProvider($client, $renderer);
 
-        $responsePosition = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
+        $responsePosition = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
 
         $handler = new ConfigureClientEventHandlerFixture(static function (ConfigureClientEvent $event) use ($client, $modifiedClient) {
             Assert::same($client, $event->getClient());
@@ -335,7 +445,17 @@ public function testExceptionShouldBeThrownWhenRendererThrowsExceptionInDebugMod
 
         $provider->setDebugMode(true);
 
-        $responsePosition = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
+        $responsePosition = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
 
         $client
             ->shouldReceive('fetchBanners')
@@ -364,7 +484,17 @@ public function testEmptyStringShouldBeReturnedWhenRendererThrowsExceptionInNonD
         $renderer = Mockery::mock(RendererInterface::class);
         $provider = new RendererProvider($client, $renderer);
 
-        $responsePosition = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
+        $responsePosition = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
 
         $client
             ->shouldReceive('fetchBanners')
@@ -391,7 +521,17 @@ public function testExceptionShouldBeLoggedWhenRendererThrowsExceptionInNonDebug
         $exception = new RendererException('Test renderer exception');
         $provider = new RendererProvider($client, $renderer, $logger);
 
-        $responsePosition = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
+        $responsePosition = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
 
         $client
             ->shouldReceive('fetchBanners')
@@ -468,8 +608,28 @@ public function testPositionsShouldBeQueuedAndReplacedInStringOutput(): void
         Assert::same('<!--AMP_POSITION:homepage.bottom-->', $provider($globals, 'homepage.bottom', ['resources' => ['resource' => ['a']]]));
         Assert::true($provider->isAnythingQueued());
 
-        $responsePosition1 = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
-        $responsePosition2 = new ResponsePosition('1235', 'homepage.bottom', 'Homepage bottom', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
+        $responsePosition1 = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
+        $responsePosition2 = new ResponsePosition(
+            '1235',
+            'homepage.bottom',
+            'Homepage bottom',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
         $response = new BannersResponse([
             'homepage.top' => $responsePosition1,
             'homepage.bottom' => $responsePosition2,
@@ -560,8 +720,28 @@ public function testPositionsShouldBeQueuedAndReplacedInArrayOutput(): void
         Assert::same('<!--AMP_POSITION:homepage.bottom-->', $provider($globals, 'homepage.bottom', ['resources' => ['resource' => ['a']]]));
         Assert::true($provider->isAnythingQueued());
 
-        $responsePosition1 = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
-        $responsePosition2 = new ResponsePosition('1235', 'homepage.bottom', 'Homepage bottom', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, []);
+        $responsePosition1 = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
+        $responsePosition2 = new ResponsePosition(
+            '1235',
+            'homepage.bottom',
+            'Homepage bottom',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
         $response = new BannersResponse([
             'homepage.top' => $responsePosition1,
             'homepage.bottom' => $responsePosition2,
@@ -607,6 +787,83 @@ public function testPositionsShouldBeQueuedAndReplacedInArrayOutput(): void
         );
     }
 
+    public function testEmbedPositionReturnedFromApiShouldBeQueuedAndReplacedInStringOutput(): void
+    {
+        $client = Mockery::mock(AmpClientInterface::class);
+        $renderer = Mockery::mock(RendererInterface::class);
+        $renderingMode = Mockery::mock(RenderingModeInterface::class);
+        $globals = new stdClass();
+        $requestPosition1 = new RequestPosition('homepage.bottom', [
+            new BannerResource('resource', 'a'),
+        ]);
+
+        $provider = new RendererProvider($client, $renderer);
+
+        $provider->setRenderingMode($renderingMode);
+
+        $renderingMode
+            ->shouldReceive('shouldBePositionRenderedClientSide')
+            ->once()
+            ->with(Mockery::type(RequestPosition::class))
+            ->andReturnUsing(static function (RequestPosition $position) use ($requestPosition1): bool {
+                Assert::equal($requestPosition1, $position);
+
+                return false;
+            })
+            ->shouldReceive('shouldBePositionQueued')
+            ->once()
+            ->with(Mockery::type(RequestPosition::class), $globals)
+            ->andReturnUsing(static function (RequestPosition $position) use ($requestPosition1): bool {
+                Assert::equal($requestPosition1, $position);
+
+                return true;
+            });
+
+        Assert::same('<!--AMP_POSITION:homepage.bottom-->', $provider($globals, 'homepage.bottom', ['resources' => ['resource' => ['a']]]));
+        Assert::true($provider->isAnythingQueued());
+
+        $responsePosition1 = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeEmbed,
+            new Dimensions(null, null),
+            [],
+        );
+        $response = new BannersResponse([
+            'homepage.bottom' => $responsePosition1,
+        ]);
+
+        $client
+            ->shouldReceive('fetchBanners')
+            ->once()
+            ->with(Mockery::type(BannersRequest::class))
+            ->andReturnUsing(static function (BannersRequest $request) use ($response, $requestPosition1): BannersResponse {
+                Assert::equal(
+                    new BannersRequest([
+                        $requestPosition1,
+                    ]),
+                    $request,
+                );
+
+                return $response;
+            });
+
+        $renderer
+            ->shouldReceive('renderClientSide')
+            ->once()
+            ->with(Matchers::equalTo($requestPosition1), [], [], Matchers::equalTo(ClientSideMode::embed()))
+            ->andReturn('<homepage.bottom>');
+
+        Assert::same(
+            '<div><homepage.bottom></div>',
+            $provider->renderQueuedPositions('<div><!--AMP_POSITION:homepage.bottom--></div>'),
+        );
+    }
+
     public function testPositionShouldBeRenderedClientSide(): void
     {
         $client = Mockery::mock(AmpClientInterface::class);
@@ -631,7 +888,7 @@ public function testPositionShouldBeRenderedClientSide(): void
         $renderer
             ->shouldReceive('renderClientSide')
             ->once()
-            ->with(Mockery::type(RequestPosition::class), [], [])
+            ->with(Mockery::type(RequestPosition::class), [], [], Matchers::equalTo(ClientSideMode::managed()))
             ->andReturnUsing(static function (RequestPosition $position) use ($requestPosition): string {
                 Assert::equal($requestPosition, $position);
 
@@ -669,7 +926,7 @@ public function testPositionShouldBeRenderedClientSideWithAlternativeMode(): voi
         $renderer
             ->shouldReceive('renderClientSide')
             ->once()
-            ->with(Mockery::type(RequestPosition::class), [], [])
+            ->with(Mockery::type(RequestPosition::class), [], [], Matchers::equalTo(ClientSideMode::managed()))
             ->andReturnUsing(static function (RequestPosition $position) use ($requestPosition): string {
                 Assert::equal($requestPosition, $position);
 
@@ -681,6 +938,54 @@ public function testPositionShouldBeRenderedClientSideWithAlternativeMode(): voi
         Assert::same('<homepage.top>', $provider(new stdClass(), 'homepage.top', ['mode' => 'client_side']));
     }
 
+    public function testPositionShouldBeRenderedEmbed(): void
+    {
+        $client = Mockery::mock(AmpClientInterface::class);
+        $renderer = Mockery::mock(RendererInterface::class);
+        $clientSideRenderingMode = new EmbedRenderingMode();
+        $requestPosition = new RequestPosition('homepage.top');
+
+        $provider = new RendererProvider($client, $renderer);
+
+        $provider->setRenderingMode($clientSideRenderingMode);
+
+        $renderer
+            ->shouldReceive('renderClientSide')
+            ->once()
+            ->with(Mockery::type(RequestPosition::class), [], [], Matchers::equalTo(ClientSideMode::embed()))
+            ->andReturnUsing(static function (RequestPosition $position) use ($requestPosition): string {
+                Assert::equal($requestPosition, $position);
+
+                return '<homepage.top>';
+            });
+
+        Assert::same('<homepage.top>', $provider(new stdClass(), 'homepage.top'));
+    }
+
+    public function testPositionShouldBeRenderedEmbedWithAlternativeMode(): void
+    {
+        $client = Mockery::mock(AmpClientInterface::class);
+        $renderer = Mockery::mock(RendererInterface::class);
+        $clientSideRenderingMode = new EmbedRenderingMode();
+        $requestPosition = new RequestPosition('homepage.top');
+
+        $provider = new RendererProvider($client, $renderer);
+
+        $renderer
+            ->shouldReceive('renderClientSide')
+            ->once()
+            ->with(Mockery::type(RequestPosition::class), [], [], Matchers::equalTo(ClientSideMode::embed()))
+            ->andReturnUsing(static function (RequestPosition $position) use ($requestPosition): string {
+                Assert::equal($requestPosition, $position);
+
+                return '<homepage.top>';
+            });
+
+        $provider->setAlternativeRenderingModes([$clientSideRenderingMode]);
+
+        Assert::same('<homepage.top>', $provider(new stdClass(), 'homepage.top', ['mode' => EmbedRenderingMode::Name]));
+    }
+
     public function testExceptionShouldBeThrownWhenProviderIsInvokedWithModeThatIsNotRegisteredBetweenAlternativeModes(): void
     {
         $client = Mockery::mock(AmpClientInterface::class);
diff --git a/tests/Bridge/Latte/RenderingMode/EmbedRenderingModeTest.php b/tests/Bridge/Latte/RenderingMode/EmbedRenderingModeTest.php
new file mode 100644
index 0000000..23901d0
--- /dev/null
+++ b/tests/Bridge/Latte/RenderingMode/EmbedRenderingModeTest.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SixtyEightPublishers\AmpClient\Tests\Bridge\Latte\RenderingMode;
+
+use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\EmbedRenderingMode;
+use SixtyEightPublishers\AmpClient\Request\ValueObject\Position;
+use Tester\Assert;
+use Tester\TestCase;
+
+require __DIR__ . '/../../../bootstrap.php';
+
+final class EmbedRenderingModeTest extends TestCase
+{
+    public static function testModeBehaviour(): void
+    {
+        $mode = new EmbedRenderingMode();
+
+        $position = new Position('homepage.top');
+
+        Assert::same('embed', $mode->getName());
+        Assert::false($mode->supportsQueues());
+        Assert::true($mode->shouldBePositionRenderedClientSide($position));
+        Assert::false($mode->shouldBePositionQueued($position, (object) []));
+    }
+}
+
+(new EmbedRenderingModeTest())->run();
diff --git a/tests/Bridge/Nette/DI/AmpClientLatteExtensionTest.php b/tests/Bridge/Nette/DI/AmpClientLatteExtensionTest.php
index 123cda2..d2019a8 100644
--- a/tests/Bridge/Nette/DI/AmpClientLatteExtensionTest.php
+++ b/tests/Bridge/Nette/DI/AmpClientLatteExtensionTest.php
@@ -14,6 +14,7 @@
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RendererProvider;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\ClientSideRenderingMode;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\DirectRenderingMode;
+use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\EmbedRenderingMode;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\QueuedRenderingInPresenterContextMode;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\QueuedRenderingMode;
 use SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\RenderingModeInterface;
@@ -180,7 +181,7 @@ public function testContainerWithQueuedRenderingInPresenterModeModeAsStatement()
         );
     }
 
-    public function testContainerWithClientSideRenderingInPresenterModeModeAsString(): void
+    public function testContainerWithClientSideRenderingModeAsString(): void
     {
         $container = ContainerFactory::create(__DIR__ . '/Config/AmpClientLatteExtension/config.withClientSideRenderingModeAsString.neon', ['latte']);
 
@@ -191,7 +192,7 @@ public function testContainerWithClientSideRenderingInPresenterModeModeAsString(
         );
     }
 
-    public function testContainerWithClientSideRenderingInPresenterModeModeAsClassname(): void
+    public function testContainerWithClientSideRenderingModeAsClassname(): void
     {
         $container = ContainerFactory::create(__DIR__ . '/Config/AmpClientLatteExtension/config.withClientSideRenderingModeAsClassname.neon', ['latte']);
 
@@ -202,7 +203,7 @@ public function testContainerWithClientSideRenderingInPresenterModeModeAsClassna
         );
     }
 
-    public function testContainerWithClientSideRenderingInPresenterModeModeAsStatement(): void
+    public function testContainerWithClientSideRenderingModeAsStatement(): void
     {
         $container = ContainerFactory::create(__DIR__ . '/Config/AmpClientLatteExtension/config.withClientSideRenderingModeAsStatement.neon', ['latte']);
 
@@ -213,6 +214,39 @@ public function testContainerWithClientSideRenderingInPresenterModeModeAsStateme
         );
     }
 
+    public function testContainerWithEmbedRenderingModeAsString(): void
+    {
+        $container = ContainerFactory::create(__DIR__ . '/Config/AmpClientLatteExtension/config.withEmbedRenderingModeAsString.neon', ['latte']);
+
+        $this->assertLatteExtension(
+            $container,
+            false,
+            new EmbedRenderingMode(),
+        );
+    }
+
+    public function testContainerWithEmbedRenderingModeAsClassname(): void
+    {
+        $container = ContainerFactory::create(__DIR__ . '/Config/AmpClientLatteExtension/config.withEmbedRenderingModeAsClassname.neon', ['latte']);
+
+        $this->assertLatteExtension(
+            $container,
+            false,
+            new EmbedRenderingMode(),
+        );
+    }
+
+    public function testContainerWithEmbedRenderingModeAsStatement(): void
+    {
+        $container = ContainerFactory::create(__DIR__ . '/Config/AmpClientLatteExtension/config.withEmbedRenderingModeAsStatement.neon', ['latte']);
+
+        $this->assertLatteExtension(
+            $container,
+            false,
+            new EmbedRenderingMode(),
+        );
+    }
+
     public function testContainerWithAlternativeRenderingModes(): void
     {
         $container = ContainerFactory::create(__DIR__ . '/Config/AmpClientLatteExtension/config.withAlternativeRenderingModes.neon', ['latte']);
@@ -223,6 +257,7 @@ public function testContainerWithAlternativeRenderingModes(): void
             new DirectRenderingMode(),
             [
                 ClientSideRenderingMode::Name => new ClientSideRenderingMode(),
+                EmbedRenderingMode::Name => new EmbedRenderingMode(),
                 QueuedRenderingMode::Name => new QueuedRenderingMode(),
                 QueuedRenderingInPresenterContextMode::Name => new QueuedRenderingInPresenterContextMode(),
             ],
diff --git a/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withAlternativeRenderingModes.neon b/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withAlternativeRenderingModes.neon
index 13d52f5..0844069 100644
--- a/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withAlternativeRenderingModes.neon
+++ b/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withAlternativeRenderingModes.neon
@@ -9,5 +9,6 @@ amp_client:
 amp_client.latte:
     alternative_rendering_modes:
         - client_side
+        - embed
         - SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\QueuedRenderingMode
         - SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\QueuedRenderingInPresenterContextMode()
diff --git a/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withEmbedRenderingModeAsClassname.neon b/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withEmbedRenderingModeAsClassname.neon
new file mode 100644
index 0000000..08837b6
--- /dev/null
+++ b/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withEmbedRenderingModeAsClassname.neon
@@ -0,0 +1,10 @@
+extensions:
+    amp_client: SixtyEightPublishers\AmpClient\Bridge\Nette\DI\AmpClientExtension
+    amp_client.latte: SixtyEightPublishers\AmpClient\Bridge\Nette\DI\AmpClientLatteExtension
+
+amp_client:
+    url: https://www.example.com
+    channel: test
+
+amp_client.latte:
+    rendering_mode: SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\EmbedRenderingMode
diff --git a/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withEmbedRenderingModeAsStatement.neon b/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withEmbedRenderingModeAsStatement.neon
new file mode 100644
index 0000000..1f3ce06
--- /dev/null
+++ b/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withEmbedRenderingModeAsStatement.neon
@@ -0,0 +1,10 @@
+extensions:
+    amp_client: SixtyEightPublishers\AmpClient\Bridge\Nette\DI\AmpClientExtension
+    amp_client.latte: SixtyEightPublishers\AmpClient\Bridge\Nette\DI\AmpClientLatteExtension
+
+amp_client:
+    url: https://www.example.com
+    channel: test
+
+amp_client.latte:
+    rendering_mode: SixtyEightPublishers\AmpClient\Bridge\Latte\RenderingMode\EmbedRenderingMode()
diff --git a/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withEmbedRenderingModeAsString.neon b/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withEmbedRenderingModeAsString.neon
new file mode 100644
index 0000000..e2f9654
--- /dev/null
+++ b/tests/Bridge/Nette/DI/Config/AmpClientLatteExtension/config.withEmbedRenderingModeAsString.neon
@@ -0,0 +1,10 @@
+extensions:
+    amp_client: SixtyEightPublishers\AmpClient\Bridge\Nette\DI\AmpClientExtension
+    amp_client.latte: SixtyEightPublishers\AmpClient\Bridge\Nette\DI\AmpClientLatteExtension
+
+amp_client:
+    url: https://www.example.com
+    channel: test
+
+amp_client.latte:
+    rendering_mode: embed
diff --git a/tests/Renderer/BannersResolverTest.php b/tests/Renderer/BannersResolverTest.php
index f38882c..3f26f7d 100644
--- a/tests/Renderer/BannersResolverTest.php
+++ b/tests/Renderer/BannersResolverTest.php
@@ -6,6 +6,7 @@
 
 use SixtyEightPublishers\AmpClient\Renderer\BannersResolver;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Banner;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Dimensions;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Position;
 use Tester\Assert;
 use Tester\TestCase;
@@ -16,7 +17,17 @@ final class BannersResolverTest extends TestCase
 {
     public function testNullShouldBeReturnedWhenResolvingSinglePositionWithoutBanners(): void
     {
-        $position = new Position('1234', 'homepage.top', 'Homepage top', 0, Position::DisplayTypeSingle, Position::BreakpointTypeMin, []);
+        $position = new Position(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            Position::DisplayTypeSingle,
+            Position::BreakpointTypeMin,
+            Position::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
         $resolver = new BannersResolver();
 
         Assert::null($resolver->resolveSingle($position));
@@ -28,7 +39,17 @@ public function testFirstBannerWithHighestScoreShouldBeReturnedWhenResolvingSing
         $banner2 = new Banner('2', '2', 2, null, null, null, []);
         $banner3 = new Banner('3', '3', 1, null, null, null, []);
         $banner4 = new Banner('4', '4', 2, null, null, null, []);
-        $position = new Position('1234', 'homepage.top', 'Homepage top', 0, Position::DisplayTypeSingle, Position::BreakpointTypeMin, [$banner1, $banner2, $banner3, $banner4]);
+        $position = new Position(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            Position::DisplayTypeSingle,
+            Position::BreakpointTypeMin,
+            Position::ModeManaged,
+            new Dimensions(null, null),
+            [$banner1, $banner2, $banner3, $banner4],
+        );
         $resolver = new BannersResolver();
 
         Assert::same($banner2, $resolver->resolveSingle($position));
@@ -36,7 +57,17 @@ public function testFirstBannerWithHighestScoreShouldBeReturnedWhenResolvingSing
 
     public function testEmptyArrayShouldBeReturnedWhenResolvingMultiplePositionWithoutBanners(): void
     {
-        $position = new Position('1234', 'homepage.top', 'Homepage top', 0, Position::DisplayTypeMultiple, Position::BreakpointTypeMin, []);
+        $position = new Position(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            Position::DisplayTypeMultiple,
+            Position::BreakpointTypeMin,
+            Position::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
         $resolver = new BannersResolver();
 
         Assert::same([], $resolver->resolveMultiple($position));
@@ -48,7 +79,17 @@ public function testSortedBannersShouldBeReturnedWhenResolvingMultiplePosition()
         $banner2 = new Banner('2', '2', 2, null, null, null, []);
         $banner3 = new Banner('3', '3', 1, null, null, null, []);
         $banner4 = new Banner('4', '4', 2, null, null, null, []);
-        $position = new Position('1234', 'homepage.top', 'Homepage top', 0, Position::DisplayTypeMultiple, Position::BreakpointTypeMin, [$banner1, $banner2, $banner3, $banner4]);
+        $position = new Position(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            Position::DisplayTypeMultiple,
+            Position::BreakpointTypeMin,
+            Position::ModeManaged,
+            new Dimensions(null, null),
+            [$banner1, $banner2, $banner3, $banner4],
+        );
         $resolver = new BannersResolver();
 
         Assert::same([
@@ -61,7 +102,17 @@ public function testSortedBannersShouldBeReturnedWhenResolvingMultiplePosition()
 
     public function testNullShouldBeReturnedWhenResolvingRandomPositionWithoutBanners(): void
     {
-        $position = new Position('1234', 'homepage.top', 'Homepage top', 0, Position::DisplayTypeRandom, Position::BreakpointTypeMin, []);
+        $position = new Position(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            Position::DisplayTypeRandom,
+            Position::BreakpointTypeMin,
+            Position::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
         $resolver = new BannersResolver();
 
         Assert::null($resolver->resolveRandom($position));
@@ -73,7 +124,17 @@ public function testRandomBannerShouldBeReturnedWhenResolvingRandomPosition(): v
         $banner2 = new Banner('2', '2', 3, null, null, null, []);
         $banner3 = new Banner('3', '3', 2, null, null, null, []);
         $banner4 = new Banner('4', '4', 3, null, null, null, []);
-        $position = new Position('1234', 'homepage.top', 'Homepage top', 0, Position::DisplayTypeRandom, Position::BreakpointTypeMin, [$banner1, $banner2, $banner3, $banner4]);
+        $position = new Position(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            Position::DisplayTypeRandom,
+            Position::BreakpointTypeMin,
+            Position::ModeManaged,
+            new Dimensions(null, null),
+            [$banner1, $banner2, $banner3, $banner4],
+        );
         $resolver = new BannersResolver();
 
         Assert::type(Banner::class, $resolver->resolveRandom($position)); # @todo: Mock mt_rand() ?
diff --git a/tests/Renderer/BreakpointStyle/BreakpointStyleTest.php b/tests/Renderer/BreakpointStyle/BreakpointStyleTest.php
index 9c864e8..e430c0a 100644
--- a/tests/Renderer/BreakpointStyle/BreakpointStyleTest.php
+++ b/tests/Renderer/BreakpointStyle/BreakpointStyleTest.php
@@ -6,8 +6,10 @@
 
 use SixtyEightPublishers\AmpClient\Renderer\BreakpointStyle\BreakpointStyle;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Banner;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Dimensions;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\HtmlContent;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Position;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Position as ResponsePosition;
 use Tester\Assert;
 use Tester\TestCase;
 
@@ -130,6 +132,8 @@ private function createBreakpointStyle(string $breakpointType, array $contents):
             5,
             Position::DisplayTypeSingle,
             $breakpointType,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
             [$banner],
         );
 
diff --git a/tests/Renderer/ClientSideModeTest.php b/tests/Renderer/ClientSideModeTest.php
new file mode 100644
index 0000000..0a26077
--- /dev/null
+++ b/tests/Renderer/ClientSideModeTest.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SixtyEightPublishers\AmpClient\Tests\Renderer;
+
+use InvalidArgumentException;
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
+use Tester\Assert;
+use Tester\TestCase;
+
+require __DIR__ . '/../bootstrap.php';
+
+final class ClientSideModeTest extends TestCase
+{
+    public function testManagedModeShouldBeCreated(): void
+    {
+        $mode = ClientSideMode::managed();
+
+        Assert::same('managed', $mode->getValue());
+        Assert::true($mode->isManaged());
+        Assert::false($mode->isEmbed());
+    }
+
+    public function testManagedModeFromValueShouldBeCreated(): void
+    {
+        $mode = ClientSideMode::fromValue('managed');
+
+        Assert::same('managed', $mode->getValue());
+        Assert::true($mode->isManaged());
+        Assert::false($mode->isEmbed());
+    }
+
+    public function testEmbedModeShouldBeCreated(): void
+    {
+        $mode = ClientSideMode::embed();
+
+        Assert::same('embed', $mode->getValue());
+        Assert::false($mode->isManaged());
+        Assert::true($mode->isEmbed());
+    }
+
+    public function testEmbedModeFromValueShouldBeCreated(): void
+    {
+        $mode = ClientSideMode::fromValue('embed');
+
+        Assert::same('embed', $mode->getValue());
+        Assert::false($mode->isManaged());
+        Assert::true($mode->isEmbed());
+    }
+
+    public function testExceptionShouldBeThrownWhenModeIsCreatedFromInvalidValue(): void
+    {
+        Assert::exception(
+            static fn () => ClientSideMode::fromValue('test'),
+            InvalidArgumentException::class,
+            'Value "test" is not valid client side mode.',
+        );
+    }
+}
+
+(new ClientSideModeTest())->run();
diff --git a/tests/Renderer/Latte/LatteRendererBridgeTest.php b/tests/Renderer/Latte/LatteRendererBridgeTest.php
index ccd9082..5fdc4be 100644
--- a/tests/Renderer/Latte/LatteRendererBridgeTest.php
+++ b/tests/Renderer/Latte/LatteRendererBridgeTest.php
@@ -6,6 +6,7 @@
 
 use Closure;
 use Latte\Engine;
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
 use SixtyEightPublishers\AmpClient\Renderer\Latte\LatteRendererBridge;
 use SixtyEightPublishers\AmpClient\Renderer\Templates;
 use SixtyEightPublishers\AmpClient\Request\ValueObject\Position as RequestPosition;
@@ -100,11 +101,12 @@ public function testClientSideTemplateRendering(
         RequestPosition $position,
         array $elementAttributes,
         array $options,
+        ClientSideMode $mode,
         string $expectationFile
     ): void {
         $renderer = $this->createRendererBridge();
 
-        AssertHtml::assert($expectationFile, $renderer->renderClientSide($position, $elementAttributes, $options));
+        AssertHtml::assert($expectationFile, $renderer->renderClientSide($position, $mode, $elementAttributes, $options));
     }
 
     public function notFoundTemplateDataProvider(): array
diff --git a/tests/Renderer/Phtml/PhtmlRendererBridgeTest.php b/tests/Renderer/Phtml/PhtmlRendererBridgeTest.php
index cd5e0a9..73100f1 100644
--- a/tests/Renderer/Phtml/PhtmlRendererBridgeTest.php
+++ b/tests/Renderer/Phtml/PhtmlRendererBridgeTest.php
@@ -5,6 +5,7 @@
 namespace SixtyEightPublishers\AmpClient\Tests\Renderer\Phtml;
 
 use Closure;
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
 use SixtyEightPublishers\AmpClient\Renderer\Phtml\PhtmlRendererBridge;
 use SixtyEightPublishers\AmpClient\Renderer\Templates;
 use SixtyEightPublishers\AmpClient\Request\ValueObject\Position as RequestPosition;
@@ -99,11 +100,12 @@ public function testClientSideTemplateRendering(
         RequestPosition $position,
         array $elementAttributes,
         array $options,
+        ClientSideMode $mode,
         string $expectationFile
     ): void {
         $renderer = new PhtmlRendererBridge();
 
-        AssertHtml::assert($expectationFile, $renderer->renderClientSide($position, $elementAttributes, $options));
+        AssertHtml::assert($expectationFile, $renderer->renderClientSide($position, $mode, $elementAttributes, $options));
     }
 
     public function notFoundTemplateDataProvider(): array
diff --git a/tests/Renderer/RendererTest.php b/tests/Renderer/RendererTest.php
index a3bbe9a..33a092d 100644
--- a/tests/Renderer/RendererTest.php
+++ b/tests/Renderer/RendererTest.php
@@ -6,16 +6,19 @@
 
 use Closure;
 use Exception;
+use Hamcrest\Matchers;
 use Mockery;
 use SixtyEightPublishers\AmpClient\Exception\RendererException;
 use SixtyEightPublishers\AmpClient\Renderer\BannersResolver;
 use SixtyEightPublishers\AmpClient\Renderer\BannersResolverInterface;
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
 use SixtyEightPublishers\AmpClient\Renderer\Phtml\PhtmlRendererBridge;
 use SixtyEightPublishers\AmpClient\Renderer\Renderer;
 use SixtyEightPublishers\AmpClient\Renderer\RendererBridgeInterface;
 use SixtyEightPublishers\AmpClient\Request\ValueObject\BannerResource;
 use SixtyEightPublishers\AmpClient\Request\ValueObject\Position as RequestPosition;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Banner;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Dimensions;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Position as ResponsePosition;
 use Tester\Assert;
 use Tester\TestCase;
@@ -46,7 +49,17 @@ public function testNotFoundTemplateShouldBeRendered(): void
         $rendererBridge = Mockery::mock(RendererBridgeInterface::class);
         $renderer = new Renderer($bannersResolver, $rendererBridge);
 
-        $position = new ResponsePosition(null, 'homepage.top', null, 0, null, ResponsePosition::BreakpointTypeMin, []);
+        $position = new ResponsePosition(
+            null,
+            'homepage.top',
+            null,
+            0,
+            null,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
 
         $rendererBridge
             ->shouldReceive('renderNotFound')
@@ -64,7 +77,17 @@ public function testSingleTemplateShouldBeRendered(): void
         $renderer = new Renderer($bannersResolver, $rendererBridge);
 
         $banner = new Banner('1234', 'Main', 0, null, null, null, []);
-        $position = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeSingle, ResponsePosition::BreakpointTypeMin, [$banner]);
+        $position = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeSingle,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [$banner],
+        );
 
         $bannersResolver
             ->shouldReceive('resolveSingle')
@@ -88,7 +111,17 @@ public function testRandomTemplateShouldBeRendered(): void
         $renderer = new Renderer($bannersResolver, $rendererBridge);
 
         $banner = new Banner('1234', 'Main', 0, null, null, null, []);
-        $position = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeRandom, ResponsePosition::BreakpointTypeMin, [$banner]);
+        $position = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeRandom,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [$banner],
+        );
 
         $bannersResolver
             ->shouldReceive('resolveRandom')
@@ -115,7 +148,17 @@ public function testMultipleTemplateShouldBeRendered(): void
             new Banner('1234', 'Main', 0, null, null, null, []),
             new Banner('1235', 'Secondary', 0, null, null, null, []),
         ];
-        $position = new ResponsePosition('1234', 'homepage.top', 'Homepage top', 0, ResponsePosition::DisplayTypeMultiple, ResponsePosition::BreakpointTypeMin, $banners);
+        $position = new ResponsePosition(
+            '1234',
+            'homepage.top',
+            'Homepage top',
+            0,
+            ResponsePosition::DisplayTypeMultiple,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            $banners,
+        );
 
         $bannersResolver
             ->shouldReceive('resolveMultiple')
@@ -145,19 +188,48 @@ public function testClientSideTemplateShouldBeRendered(): void
         $rendererBridge
             ->shouldReceive('renderClientSide')
             ->once()
-            ->with($position, [], [])
+            ->with($position, Matchers::equalTo(ClientSideMode::managed()), [], [])
             ->andReturn('client-side');
 
         Assert::same('client-side', $renderer->renderClientSide($position));
     }
 
+    public function testClientSideTemplateWithEmbedModeShouldBeRendered(): void
+    {
+        $bannersResolver = Mockery::mock(BannersResolverInterface::class);
+        $rendererBridge = Mockery::mock(RendererBridgeInterface::class);
+        $renderer = new Renderer($bannersResolver, $rendererBridge);
+
+        $position = new RequestPosition('homepage.top', [
+            new BannerResource('role', 'vip'),
+        ]);
+
+        $rendererBridge
+            ->shouldReceive('renderClientSide')
+            ->once()
+            ->with($position, Matchers::equalTo(ClientSideMode::embed()), [], ['omit-default-resources' => '1'])
+            ->andReturn('client-side');
+
+        Assert::same('client-side', $renderer->renderClientSide($position, [], [], ClientSideMode::embed()));
+    }
+
     public function testRendererExceptionShouldBeThrownOnRenderingWhenBridgeThrowsTheException(): void
     {
         $bannersResolver = Mockery::mock(BannersResolverInterface::class);
         $rendererBridge = Mockery::mock(RendererBridgeInterface::class);
         $renderer = new Renderer($bannersResolver, $rendererBridge);
 
-        $position = new ResponsePosition(null, 'homepage.top', null, 0, null, ResponsePosition::BreakpointTypeMin, []);
+        $position = new ResponsePosition(
+            null,
+            'homepage.top',
+            null,
+            0,
+            null,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
 
         $rendererBridge
             ->shouldReceive('renderNotFound')
@@ -183,7 +255,7 @@ public function testRendererExceptionShouldBeThrownOnClientSideRenderingWhenBrid
         $rendererBridge
             ->shouldReceive('renderClientSide')
             ->once()
-            ->with($position, [], [])
+            ->with($position, Matchers::equalTo(ClientSideMode::managed()), [], [])
             ->andThrow(new RendererException('Test exception'));
 
         Assert::exception(
@@ -199,7 +271,17 @@ public function testRendererExceptionShouldBeThrownOnRenderingWhenBridgeThrowsAn
         $rendererBridge = Mockery::mock(RendererBridgeInterface::class);
         $renderer = new Renderer($bannersResolver, $rendererBridge);
 
-        $position = new ResponsePosition(null, 'homepage.top', null, 0, null, ResponsePosition::BreakpointTypeMin, []);
+        $position = new ResponsePosition(
+            null,
+            'homepage.top',
+            null,
+            0,
+            null,
+            ResponsePosition::BreakpointTypeMin,
+            ResponsePosition::ModeManaged,
+            new Dimensions(null, null),
+            [],
+        );
 
         $rendererBridge
             ->shouldReceive('renderNotFound')
@@ -225,7 +307,7 @@ public function testRendererExceptionShouldBeThrownOnClientSideRenderingWhenBrid
         $rendererBridge
             ->shouldReceive('renderClientSide')
             ->once()
-            ->with($position, [], [])
+            ->with($position, Matchers::equalTo(ClientSideMode::managed()), [], [])
             ->andThrow(new Exception('Test exception'));
 
         Assert::exception(
diff --git a/tests/Request/BannersRequestTest.php b/tests/Request/BannersRequestTest.php
index e922484..d5522aa 100644
--- a/tests/Request/BannersRequestTest.php
+++ b/tests/Request/BannersRequestTest.php
@@ -40,6 +40,26 @@ public function testRequestImmutability(): void
         Assert::same(['a' => $positionA, 'b' => $positionB, 'c' => $positionC], $request3->getPositions());
         Assert::same(['a' => $positionA, 'b' => $positionB, 'c' => $positionC, 'd' => $positionD], $request4->getPositions());
 
+        Assert::same($positionA, $request->getPosition('a'));
+        Assert::same($positionB, $request->getPosition('b'));
+        Assert::null($request->getPosition('c'));
+        Assert::null($request->getPosition('d'));
+
+        Assert::same($positionA, $request2->getPosition('a'));
+        Assert::same($positionB, $request2->getPosition('b'));
+        Assert::same($positionC, $request2->getPosition('c'));
+        Assert::null($request2->getPosition('d'));
+
+        Assert::same($positionA, $request3->getPosition('a'));
+        Assert::same($positionB, $request3->getPosition('b'));
+        Assert::same($positionC, $request3->getPosition('c'));
+        Assert::null($request3->getPosition('d'));
+
+        Assert::same($positionA, $request4->getPosition('a'));
+        Assert::same($positionB, $request4->getPosition('b'));
+        Assert::same($positionC, $request4->getPosition('c'));
+        Assert::same($positionD, $request4->getPosition('d'));
+
         Assert::null($request->getLocale());
         Assert::null($request2->getLocale());
         Assert::same('cs', $request3->getLocale());
diff --git a/tests/resources/renderer/client-side/data-provider.php b/tests/resources/renderer/client-side/data-provider.php
index 0f5736c..e77adfc 100644
--- a/tests/resources/renderer/client-side/data-provider.php
+++ b/tests/resources/renderer/client-side/data-provider.php
@@ -2,26 +2,46 @@
 
 declare(strict_types=1);
 
+use SixtyEightPublishers\AmpClient\Renderer\ClientSideMode;
 use SixtyEightPublishers\AmpClient\Request\ValueObject\BannerResource;
 use SixtyEightPublishers\AmpClient\Request\ValueObject\Position;
 
 return [
-    'Position only' => [
+    'Position only (managed)' => [
         new Position('homepage.top'),
         [],
         [],
-        __DIR__ . '/positionOnly.html',
+        ClientSideMode::managed(),
+        __DIR__ . '/managed.positionOnly.html',
     ],
-    'With resources' => [
+    'Position only (embed)' => [
+        new Position('homepage.top'),
+        [],
+        [],
+        ClientSideMode::embed(),
+        __DIR__ . '/embed.positionOnly.html',
+    ],
+    'With resources (managed)' => [
+        new Position('homepage.top', [
+            new BannerResource('role', 'vip'),
+            new BannerResource('category', [123, 456]),
+        ]),
+        [],
+        [],
+        ClientSideMode::managed(),
+        __DIR__ . '/managed.withResources.html',
+    ],
+    'With resources (embed)' => [
         new Position('homepage.top', [
             new BannerResource('role', 'vip'),
             new BannerResource('category', [123, 456]),
         ]),
         [],
         [],
-        __DIR__ . '/withResources.html',
+        ClientSideMode::embed(),
+        __DIR__ . '/embed.withResources.html',
     ],
-    'With attributes' => [
+    'With attributes (managed)' => [
         new Position('homepage.top'),
         [
             'class' => 'custom-class',
@@ -30,17 +50,58 @@
             'data-custom3' => null,
         ],
         [],
-        __DIR__ . '/withAttributes.html',
+        ClientSideMode::managed(),
+        __DIR__ . '/managed.withAttributes.html',
     ],
-    'With lazy loading' => [
+    'With attributes (embed)' => [
+        new Position('homepage.top'),
+        [
+            'class' => 'custom-class',
+            'data-custom' => true,
+            'data-custom2' => false,
+            'data-custom3' => null,
+        ],
+        [],
+        ClientSideMode::embed(),
+        __DIR__ . '/embed.withAttributes.html',
+    ],
+    'With lazy loading (managed)' => [
         new Position('homepage.top'),
         [],
         [
             'loading' => 'lazy',
         ],
-        __DIR__ . '/withLazyLoading.html',
+        ClientSideMode::managed(),
+        __DIR__ . '/managed.withLazyLoading.html',
+    ],
+    'With lazy loading (embed)' => [
+        new Position('homepage.top'),
+        [],
+        [
+            'loading' => 'lazy',
+        ],
+        ClientSideMode::embed(),
+        __DIR__ . '/embed.withLazyLoading.html',
+    ],
+    'Full featured (managed)' => [
+        new Position('homepage.top', [
+            new BannerResource('role', 'vip'),
+            new BannerResource('category', [123, 456]),
+        ]),
+        [
+            'class' => 'custom-class',
+            'data-custom' => true,
+            'data-custom2' => false,
+            'data-custom3' => null,
+        ],
+        [
+            'loading' => 'lazy',
+            'custom' => 'value',
+        ],
+        ClientSideMode::managed(),
+        __DIR__ . '/managed.fullFeatured.html',
     ],
-    'Full featured' => [
+    'Full featured (embed)' => [
         new Position('homepage.top', [
             new BannerResource('role', 'vip'),
             new BannerResource('category', [123, 456]),
@@ -55,6 +116,7 @@
             'loading' => 'lazy',
             'custom' => 'value',
         ],
-        __DIR__ . '/fullFeatured.html',
+        ClientSideMode::embed(),
+        __DIR__ . '/embed.fullFeatured.html',
     ],
 ];
diff --git a/tests/resources/renderer/client-side/embed.fullFeatured.html b/tests/resources/renderer/client-side/embed.fullFeatured.html
new file mode 100644
index 0000000..023d082
--- /dev/null
+++ b/tests/resources/renderer/client-side/embed.fullFeatured.html
@@ -0,0 +1 @@
+<div data-amp-banner="homepage.top" data-amp-mode="embed" data-amp-resource-category="123,456" data-amp-resource-role="vip" data-amp-option-loading="lazy" data-amp-option-custom="value" class="custom-class" data-custom></div>
diff --git a/tests/resources/renderer/client-side/embed.positionOnly.html b/tests/resources/renderer/client-side/embed.positionOnly.html
new file mode 100644
index 0000000..3c21bd0
--- /dev/null
+++ b/tests/resources/renderer/client-side/embed.positionOnly.html
@@ -0,0 +1 @@
+<div data-amp-banner="homepage.top" data-amp-mode="embed"></div>
diff --git a/tests/resources/renderer/client-side/embed.withAttributes.html b/tests/resources/renderer/client-side/embed.withAttributes.html
new file mode 100644
index 0000000..fb4dfb5
--- /dev/null
+++ b/tests/resources/renderer/client-side/embed.withAttributes.html
@@ -0,0 +1 @@
+<div data-amp-banner="homepage.top" data-amp-mode="embed" class="custom-class" data-custom></div>
diff --git a/tests/resources/renderer/client-side/embed.withLazyLoading.html b/tests/resources/renderer/client-side/embed.withLazyLoading.html
new file mode 100644
index 0000000..39169ae
--- /dev/null
+++ b/tests/resources/renderer/client-side/embed.withLazyLoading.html
@@ -0,0 +1 @@
+<div data-amp-banner="homepage.top" data-amp-mode="embed" data-amp-option-loading="lazy"></div>
diff --git a/tests/resources/renderer/client-side/embed.withResources.html b/tests/resources/renderer/client-side/embed.withResources.html
new file mode 100644
index 0000000..a7c3315
--- /dev/null
+++ b/tests/resources/renderer/client-side/embed.withResources.html
@@ -0,0 +1 @@
+<div data-amp-banner="homepage.top" data-amp-mode="embed" data-amp-resource-category="123,456" data-amp-resource-role="vip"></div>
diff --git a/tests/resources/renderer/client-side/fullFeatured.html b/tests/resources/renderer/client-side/managed.fullFeatured.html
similarity index 100%
rename from tests/resources/renderer/client-side/fullFeatured.html
rename to tests/resources/renderer/client-side/managed.fullFeatured.html
diff --git a/tests/resources/renderer/client-side/positionOnly.html b/tests/resources/renderer/client-side/managed.positionOnly.html
similarity index 100%
rename from tests/resources/renderer/client-side/positionOnly.html
rename to tests/resources/renderer/client-side/managed.positionOnly.html
diff --git a/tests/resources/renderer/client-side/withAttributes.html b/tests/resources/renderer/client-side/managed.withAttributes.html
similarity index 100%
rename from tests/resources/renderer/client-side/withAttributes.html
rename to tests/resources/renderer/client-side/managed.withAttributes.html
diff --git a/tests/resources/renderer/client-side/withLazyLoading.html b/tests/resources/renderer/client-side/managed.withLazyLoading.html
similarity index 100%
rename from tests/resources/renderer/client-side/withLazyLoading.html
rename to tests/resources/renderer/client-side/managed.withLazyLoading.html
diff --git a/tests/resources/renderer/client-side/withResources.html b/tests/resources/renderer/client-side/managed.withResources.html
similarity index 100%
rename from tests/resources/renderer/client-side/withResources.html
rename to tests/resources/renderer/client-side/managed.withResources.html
diff --git a/tests/resources/renderer/multiple/data-provider.php b/tests/resources/renderer/multiple/data-provider.php
index 0696d9f..d80cec4 100644
--- a/tests/resources/renderer/multiple/data-provider.php
+++ b/tests/resources/renderer/multiple/data-provider.php
@@ -3,12 +3,36 @@
 declare(strict_types=1);
 
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Banner;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Dimensions;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\HtmlContent;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\ImageContent;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Position;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Position as ResponsePosition;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Source;
 
-$position = new Position('1234', 'homepage.top', 'Homepage top', 0, Position::DisplayTypeMultiple, Position::BreakpointTypeMin, []);
+$position = new Position(
+    '1234',
+    'homepage.top',
+    'Homepage top',
+    0,
+    Position::DisplayTypeMultiple,
+    Position::BreakpointTypeMin,
+    ResponsePosition::ModeManaged,
+    new Dimensions(800, 300),
+    [],
+);
+
+$positionWithoutDimensions = new Position(
+    '1234',
+    'homepage.top',
+    'Homepage top',
+    0,
+    Position::DisplayTypeMultiple,
+    Position::BreakpointTypeMin,
+    ResponsePosition::ModeManaged,
+    new Dimensions(null, null),
+    [],
+);
 
 $fullFeaturedBanners = [
     new Banner('1234', 'Main', 0, null, null, null, [
@@ -126,4 +150,11 @@
         ],
         __DIR__ . '/multipleBannersFullFeatured.withLazyLoadingFromOffset1.html',
     ],
+    'Multiple banners - full featured without dimensions' => [
+        $positionWithoutDimensions,
+        $fullFeaturedBanners,
+        [],
+        [],
+        __DIR__ . '/multipleBannersFullFeatured.withoutDimensions.html',
+    ],
 ];
diff --git a/tests/resources/renderer/multiple/multipleBannersFullFeatured.html b/tests/resources/renderer/multiple/multipleBannersFullFeatured.html
index e094660..0a1ac31 100644
--- a/tests/resources/renderer/multiple/multipleBannersFullFeatured.html
+++ b/tests/resources/renderer/multiple/multipleBannersFullFeatured.html
@@ -1,4 +1,4 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q=">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlMkMlMjJkaW1lbnNpb25zJTIyJTNBJTdCJTIyd2lkdGglMjIlM0E4MDAlMkMlMjJoZWlnaHQlMjIlM0EzMDAlN0QlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q=">
     <div class="amp-banner amp-banner--multiple">
         <div class="amp-banner__list">
             <div class="amp-banner__item" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
@@ -9,14 +9,14 @@
                     <picture>
                         <source type="image/avif" srcset="https://img.example.com/800/main1.avif 800w, https://img.example.com/1000/main1.avif 1000w" sizes="(min-width: 1000px) 1000px, 100vw">
                         <source type="image/webp" srcset="https://img.example.com/800/main1.webp 800w, https://img.example.com/1000/main1.webp 1000w" sizes="(min-width: 1000px) 1000px, 100vw">
-                        <img srcset="https://img.example.com/800/main1.png 800w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Main 1" title="Main 1">
+                        <img srcset="https://img.example.com/800/main1.png 800w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Main 1" width="800" height="300" title="Main 1">
                     </picture>
                 </a>
                 <a data-amp-content-breakpoint="400" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main2" target="_blank">
                     <picture>
                         <source type="image/avif" srcset="https://img.example.com/600/main2.avif 600w" sizes="100vw">
                         <source type="image/webp" srcset="https://img.example.com/600/main2.webp 600w" sizes="100vw">
-                        <img srcset="https://img.example.com/600/main2.png 600w" src="https://img.example.com/600/main2.png" sizes="100vw" alt="Main 2" title="Main 2">
+                        <img srcset="https://img.example.com/600/main2.png 600w" src="https://img.example.com/600/main2.png" sizes="100vw" alt="Main 2" width="800" height="300" title="Main 2">
                     </picture>
                 </a>
                 <style>[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:none}@media(min-width: 400px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="default"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:block}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:none}}@media(min-width: 600px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="default"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:block}}</style>
@@ -24,7 +24,7 @@
             <div class="amp-banner__item" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM1JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMlNlY29uZGFyeSUyMiUyQyUyMnBvc2l0aW9uSWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIycG9zaXRpb25Db2RlJTIyJTNBJTIyaG9tZXBhZ2UudG9wJTIyJTJDJTIycG9zaXRpb25OYW1lJTIyJTNBJTIySG9tZXBhZ2UlMjB0b3AlMjIlMkMlMjJjYW1wYWlnbklkJTIyJTNBbnVsbCUyQyUyMmNhbXBhaWduQ29kZSUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbk5hbWUlMjIlM0FudWxsJTdE" data-amp-banner-id="1235">
                 <a data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/secondary1">
                     <picture>
-                        <img srcset="https://img.example.com/800/secondary1.png 800w, https://img.example.com/1000/secondary1.png 1000w" src="https://img.example.com/1000/secondary1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Secondary 1" title="Secondary 1">
+                        <img srcset="https://img.example.com/800/secondary1.png 800w, https://img.example.com/1000/secondary1.png 1000w" src="https://img.example.com/1000/secondary1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Secondary 1" width="800" height="300" title="Secondary 1">
                     </picture>
                 </a>
             </div>
diff --git a/tests/resources/renderer/multiple/multipleBannersFullFeatured.withLazyLoading.html b/tests/resources/renderer/multiple/multipleBannersFullFeatured.withLazyLoading.html
index 0fb847f..a4ccefa 100644
--- a/tests/resources/renderer/multiple/multipleBannersFullFeatured.withLazyLoading.html
+++ b/tests/resources/renderer/multiple/multipleBannersFullFeatured.withLazyLoading.html
@@ -1,4 +1,4 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q=" data-amp-option-loading="lazy">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlMkMlMjJkaW1lbnNpb25zJTIyJTNBJTdCJTIyd2lkdGglMjIlM0E4MDAlMkMlMjJoZWlnaHQlMjIlM0EzMDAlN0QlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q=" data-amp-option-loading="lazy">
     <div class="amp-banner amp-banner--multiple">
         <div class="amp-banner__list">
             <div class="amp-banner__item" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
@@ -9,14 +9,14 @@
                     <picture>
                         <source type="image/avif" srcset="https://img.example.com/800/main1.avif 800w, https://img.example.com/1000/main1.avif 1000w" sizes="(min-width: 1000px) 1000px, 100vw">
                         <source type="image/webp" srcset="https://img.example.com/800/main1.webp 800w, https://img.example.com/1000/main1.webp 1000w" sizes="(min-width: 1000px) 1000px, 100vw">
-                        <img srcset="https://img.example.com/800/main1.png 800w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Main 1" title="Main 1" loading="lazy">
+                        <img srcset="https://img.example.com/800/main1.png 800w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Main 1" width="800" height="300" title="Main 1" loading="lazy">
                     </picture>
                 </a>
                 <a data-amp-content-breakpoint="400" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main2" target="_blank">
                     <picture>
                         <source type="image/avif" srcset="https://img.example.com/600/main2.avif 600w" sizes="100vw">
                         <source type="image/webp" srcset="https://img.example.com/600/main2.webp 600w" sizes="100vw">
-                        <img srcset="https://img.example.com/600/main2.png 600w" src="https://img.example.com/600/main2.png" sizes="100vw" alt="Main 2" title="Main 2" loading="lazy">
+                        <img srcset="https://img.example.com/600/main2.png 600w" src="https://img.example.com/600/main2.png" sizes="100vw" alt="Main 2" width="800" height="300" title="Main 2" loading="lazy">
                     </picture>
                 </a>
                 <style>[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:none}@media(min-width: 400px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="default"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:block}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:none}}@media(min-width: 600px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="default"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:block}}</style>
@@ -24,7 +24,7 @@
             <div class="amp-banner__item" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM1JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMlNlY29uZGFyeSUyMiUyQyUyMnBvc2l0aW9uSWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIycG9zaXRpb25Db2RlJTIyJTNBJTIyaG9tZXBhZ2UudG9wJTIyJTJDJTIycG9zaXRpb25OYW1lJTIyJTNBJTIySG9tZXBhZ2UlMjB0b3AlMjIlMkMlMjJjYW1wYWlnbklkJTIyJTNBbnVsbCUyQyUyMmNhbXBhaWduQ29kZSUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbk5hbWUlMjIlM0FudWxsJTdE" data-amp-banner-id="1235">
                 <a data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/secondary1">
                     <picture>
-                        <img srcset="https://img.example.com/800/secondary1.png 800w, https://img.example.com/1000/secondary1.png 1000w" src="https://img.example.com/1000/secondary1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Secondary 1" title="Secondary 1" loading="lazy">
+                        <img srcset="https://img.example.com/800/secondary1.png 800w, https://img.example.com/1000/secondary1.png 1000w" src="https://img.example.com/1000/secondary1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Secondary 1" width="800" height="300" title="Secondary 1" loading="lazy">
                     </picture>
                 </a>
             </div>
diff --git a/tests/resources/renderer/multiple/multipleBannersFullFeatured.withLazyLoadingFromOffset1.html b/tests/resources/renderer/multiple/multipleBannersFullFeatured.withLazyLoadingFromOffset1.html
index 2ae6200..eb76863 100644
--- a/tests/resources/renderer/multiple/multipleBannersFullFeatured.withLazyLoadingFromOffset1.html
+++ b/tests/resources/renderer/multiple/multipleBannersFullFeatured.withLazyLoadingFromOffset1.html
@@ -1,4 +1,4 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q=" data-amp-option-loading="lazy" data-amp-option-loading-offset="1">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlMkMlMjJkaW1lbnNpb25zJTIyJTNBJTdCJTIyd2lkdGglMjIlM0E4MDAlMkMlMjJoZWlnaHQlMjIlM0EzMDAlN0QlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q=" data-amp-option-loading="lazy" data-amp-option-loading-offset="1">
     <div class="amp-banner amp-banner--multiple">
         <div class="amp-banner__list">
             <div class="amp-banner__item" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
@@ -9,14 +9,14 @@
                     <picture>
                         <source type="image/avif" srcset="https://img.example.com/800/main1.avif 800w, https://img.example.com/1000/main1.avif 1000w" sizes="(min-width: 1000px) 1000px, 100vw">
                         <source type="image/webp" srcset="https://img.example.com/800/main1.webp 800w, https://img.example.com/1000/main1.webp 1000w" sizes="(min-width: 1000px) 1000px, 100vw">
-                        <img srcset="https://img.example.com/800/main1.png 800w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Main 1" title="Main 1">
+                        <img srcset="https://img.example.com/800/main1.png 800w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Main 1" width="800" height="300" title="Main 1">
                     </picture>
                 </a>
                 <a data-amp-content-breakpoint="400" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main2" target="_blank">
                     <picture>
                         <source type="image/avif" srcset="https://img.example.com/600/main2.avif 600w" sizes="100vw">
                         <source type="image/webp" srcset="https://img.example.com/600/main2.webp 600w" sizes="100vw">
-                        <img srcset="https://img.example.com/600/main2.png 600w" src="https://img.example.com/600/main2.png" sizes="100vw" alt="Main 2" title="Main 2">
+                        <img srcset="https://img.example.com/600/main2.png 600w" src="https://img.example.com/600/main2.png" sizes="100vw" alt="Main 2" width="800" height="300" title="Main 2">
                     </picture>
                 </a>
                 <style>[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:none}@media(min-width: 400px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="default"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:block}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:none}}@media(min-width: 600px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="default"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:block}}</style>
@@ -24,7 +24,7 @@
             <div class="amp-banner__item" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM1JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMlNlY29uZGFyeSUyMiUyQyUyMnBvc2l0aW9uSWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIycG9zaXRpb25Db2RlJTIyJTNBJTIyaG9tZXBhZ2UudG9wJTIyJTJDJTIycG9zaXRpb25OYW1lJTIyJTNBJTIySG9tZXBhZ2UlMjB0b3AlMjIlMkMlMjJjYW1wYWlnbklkJTIyJTNBbnVsbCUyQyUyMmNhbXBhaWduQ29kZSUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbk5hbWUlMjIlM0FudWxsJTdE" data-amp-banner-id="1235">
                 <a data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/secondary1">
                     <picture>
-                        <img srcset="https://img.example.com/800/secondary1.png 800w, https://img.example.com/1000/secondary1.png 1000w" src="https://img.example.com/1000/secondary1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Secondary 1" title="Secondary 1" loading="lazy">
+                        <img srcset="https://img.example.com/800/secondary1.png 800w, https://img.example.com/1000/secondary1.png 1000w" src="https://img.example.com/1000/secondary1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Secondary 1" width="800" height="300" title="Secondary 1" loading="lazy">
                     </picture>
                 </a>
             </div>
diff --git a/tests/resources/renderer/multiple/multipleBannersFullFeatured.withoutDimensions.html b/tests/resources/renderer/multiple/multipleBannersFullFeatured.withoutDimensions.html
new file mode 100644
index 0000000..ff2e7b6
--- /dev/null
+++ b/tests/resources/renderer/multiple/multipleBannersFullFeatured.withoutDimensions.html
@@ -0,0 +1,33 @@
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlMkMlMjJkaW1lbnNpb25zJTIyJTNBJTdCJTIyd2lkdGglMjIlM0FudWxsJTJDJTIyaGVpZ2h0JTIyJTNBbnVsbCU3RCU3RCUyQyUyMnN0YXRlJTIyJTNBJTdCJTIydmFsdWUlMjIlM0ElMjJSRU5ERVJFRCUyMiUyQyUyMmluZm8lMjIlM0ElMjJCYW5uZXIlMjB3YXMlMjBzdWNjZXNzZnVsbHklMjByZW5kZXJlZCUyMHNlcnZlci1zaWRlLiUyMiU3RCU3RA==">
+    <div class="amp-banner amp-banner--multiple">
+        <div class="amp-banner__list">
+            <div class="amp-banner__item" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
+                <div data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--html">
+                    <p>Small content</p>
+                </div>
+                <a data-amp-content-breakpoint="600" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main1" target="_blank">
+                    <picture>
+                        <source type="image/avif" srcset="https://img.example.com/800/main1.avif 800w, https://img.example.com/1000/main1.avif 1000w" sizes="(min-width: 1000px) 1000px, 100vw">
+                        <source type="image/webp" srcset="https://img.example.com/800/main1.webp 800w, https://img.example.com/1000/main1.webp 1000w" sizes="(min-width: 1000px) 1000px, 100vw">
+                        <img srcset="https://img.example.com/800/main1.png 800w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Main 1" title="Main 1">
+                    </picture>
+                </a>
+                <a data-amp-content-breakpoint="400" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main2" target="_blank">
+                    <picture>
+                        <source type="image/avif" srcset="https://img.example.com/600/main2.avif 600w" sizes="100vw">
+                        <source type="image/webp" srcset="https://img.example.com/600/main2.webp 600w" sizes="100vw">
+                        <img srcset="https://img.example.com/600/main2.png 600w" src="https://img.example.com/600/main2.png" sizes="100vw" alt="Main 2" title="Main 2">
+                    </picture>
+                </a>
+                <style>[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:none}@media(min-width: 400px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="default"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:block}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:none}}@media(min-width: 600px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="default"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:block}}</style>
+            </div>
+            <div class="amp-banner__item" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM1JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMlNlY29uZGFyeSUyMiUyQyUyMnBvc2l0aW9uSWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIycG9zaXRpb25Db2RlJTIyJTNBJTIyaG9tZXBhZ2UudG9wJTIyJTJDJTIycG9zaXRpb25OYW1lJTIyJTNBJTIySG9tZXBhZ2UlMjB0b3AlMjIlMkMlMjJjYW1wYWlnbklkJTIyJTNBbnVsbCUyQyUyMmNhbXBhaWduQ29kZSUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbk5hbWUlMjIlM0FudWxsJTdE" data-amp-banner-id="1235">
+                <a data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/secondary1">
+                    <picture>
+                        <img srcset="https://img.example.com/800/secondary1.png 800w, https://img.example.com/1000/secondary1.png 1000w" src="https://img.example.com/1000/secondary1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Secondary 1" title="Secondary 1">
+                    </picture>
+                </a>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/tests/resources/renderer/multiple/multipleBannersWithoutContents.html b/tests/resources/renderer/multiple/multipleBannersWithoutContents.html
index bd98e88..7a84ba7 100644
--- a/tests/resources/renderer/multiple/multipleBannersWithoutContents.html
+++ b/tests/resources/renderer/multiple/multipleBannersWithoutContents.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q="></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlMkMlMjJkaW1lbnNpb25zJTIyJTNBJTdCJTIyd2lkdGglMjIlM0E4MDAlMkMlMjJoZWlnaHQlMjIlM0EzMDAlN0QlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q="></div>
diff --git a/tests/resources/renderer/multiple/noBanner.html b/tests/resources/renderer/multiple/noBanner.html
index bd98e88..7a84ba7 100644
--- a/tests/resources/renderer/multiple/noBanner.html
+++ b/tests/resources/renderer/multiple/noBanner.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q="></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlMkMlMjJkaW1lbnNpb25zJTIyJTNBJTdCJTIyd2lkdGglMjIlM0E4MDAlMkMlMjJoZWlnaHQlMjIlM0EzMDAlN0QlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q="></div>
diff --git a/tests/resources/renderer/multiple/noBanner.withAttributes.html b/tests/resources/renderer/multiple/noBanner.withAttributes.html
index 14405ff..debae50 100644
--- a/tests/resources/renderer/multiple/noBanner.withAttributes.html
+++ b/tests/resources/renderer/multiple/noBanner.withAttributes.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q=" class="custom-class" data-custom></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlMkMlMjJkaW1lbnNpb25zJTIyJTNBJTdCJTIyd2lkdGglMjIlM0E4MDAlMkMlMjJoZWlnaHQlMjIlM0EzMDAlN0QlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q=" class="custom-class" data-custom></div>
diff --git a/tests/resources/renderer/multiple/singleBannerWithoutContents.html b/tests/resources/renderer/multiple/singleBannerWithoutContents.html
index bd98e88..7a84ba7 100644
--- a/tests/resources/renderer/multiple/singleBannerWithoutContents.html
+++ b/tests/resources/renderer/multiple/singleBannerWithoutContents.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q="></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMm11bHRpcGxlJTIyJTJDJTIyYnJlYWtwb2ludFR5cGUlMjIlM0ElMjJtaW4lMjIlMkMlMjJkaW1lbnNpb25zJTIyJTNBJTdCJTIyd2lkdGglMjIlM0E4MDAlMkMlMjJoZWlnaHQlMjIlM0EzMDAlN0QlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q="></div>
diff --git a/tests/resources/renderer/multiple/templates/multiple1.phtml b/tests/resources/renderer/multiple/templates/multiple1.phtml
index 8b906ca..23d3971 100644
--- a/tests/resources/renderer/multiple/templates/multiple1.phtml
+++ b/tests/resources/renderer/multiple/templates/multiple1.phtml
@@ -7,4 +7,4 @@ use SixtyEightPublishers\AmpClient\Renderer\Phtml\Helpers;
 
 /** @var Position $position */
 ?>
-<span style="color: red;">Random position "<?= Helpers::escapeHtml($position->getCode()) ?>".</span>
+<span style="color: red;">Multiple position "<?= Helpers::escapeHtml($position->getCode()) ?>".</span>
diff --git a/tests/resources/renderer/not-found/data-provider.php b/tests/resources/renderer/not-found/data-provider.php
index 1ba1905..297e780 100644
--- a/tests/resources/renderer/not-found/data-provider.php
+++ b/tests/resources/renderer/not-found/data-provider.php
@@ -2,9 +2,21 @@
 
 declare(strict_types=1);
 
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Dimensions;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Position;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Position as ResponsePosition;
 
-$position = new Position(null, 'homepage.top', null, 0, null, Position::BreakpointTypeMin, []);
+$position = new Position(
+    null,
+    'homepage.top',
+    null,
+    0,
+    null,
+    Position::BreakpointTypeMin,
+    ResponsePosition::ModeManaged,
+    new Dimensions(800, 300),
+    [],
+);
 
 return [
     'Not found' => [
diff --git a/tests/resources/renderer/not-found/notFound.html b/tests/resources/renderer/not-found/notFound.html
index cada5f2..b119569 100644
--- a/tests/resources/renderer/not-found/notFound.html
+++ b/tests/resources/renderer/not-found/notFound.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0FudWxsJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0FudWxsJTJDJTIycm90YXRpb25TZWNvbmRzJTIyJTNBMCUyQyUyMmRpc3BsYXlUeXBlJTIyJTNBbnVsbCUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMk5PVF9GT1VORCUyMiUyQyUyMmluZm8lMjIlM0ElMjJCYW5uZXIlMjBub3QlMjBmb3VuZCUyMGluJTIwZmV0Y2hlZCUyMHJlc3BvbnNlJTIwb24lMjB0aGUlMjBzZXJ2ZXIuJTIyJTdEJTdE"></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0FudWxsJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0FudWxsJTJDJTIycm90YXRpb25TZWNvbmRzJTIyJTNBMCUyQyUyMmRpc3BsYXlUeXBlJTIyJTNBbnVsbCUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMk5PVF9GT1VORCUyMiUyQyUyMmluZm8lMjIlM0ElMjJCYW5uZXIlMjBub3QlMjBmb3VuZCUyMGluJTIwZmV0Y2hlZCUyMHJlc3BvbnNlJTIwb24lMjB0aGUlMjBzZXJ2ZXIuJTIyJTdEJTdE"></div>
diff --git a/tests/resources/renderer/not-found/notFound.withAttributes.html b/tests/resources/renderer/not-found/notFound.withAttributes.html
index 56bfbc2..ee43108 100644
--- a/tests/resources/renderer/not-found/notFound.withAttributes.html
+++ b/tests/resources/renderer/not-found/notFound.withAttributes.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0FudWxsJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0FudWxsJTJDJTIycm90YXRpb25TZWNvbmRzJTIyJTNBMCUyQyUyMmRpc3BsYXlUeXBlJTIyJTNBbnVsbCUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMk5PVF9GT1VORCUyMiUyQyUyMmluZm8lMjIlM0ElMjJCYW5uZXIlMjBub3QlMjBmb3VuZCUyMGluJTIwZmV0Y2hlZCUyMHJlc3BvbnNlJTIwb24lMjB0aGUlMjBzZXJ2ZXIuJTIyJTdEJTdE" class="custom-class" data-custom></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0FudWxsJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0FudWxsJTJDJTIycm90YXRpb25TZWNvbmRzJTIyJTNBMCUyQyUyMmRpc3BsYXlUeXBlJTIyJTNBbnVsbCUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMk5PVF9GT1VORCUyMiUyQyUyMmluZm8lMjIlM0ElMjJCYW5uZXIlMjBub3QlMjBmb3VuZCUyMGluJTIwZmV0Y2hlZCUyMHJlc3BvbnNlJTIwb24lMjB0aGUlMjBzZXJ2ZXIuJTIyJTdEJTdE" class="custom-class" data-custom></div>
diff --git a/tests/resources/renderer/not-found/notFound.withLazyLoading.html b/tests/resources/renderer/not-found/notFound.withLazyLoading.html
index 983f275..8cd4f2e 100644
--- a/tests/resources/renderer/not-found/notFound.withLazyLoading.html
+++ b/tests/resources/renderer/not-found/notFound.withLazyLoading.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0FudWxsJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0FudWxsJTJDJTIycm90YXRpb25TZWNvbmRzJTIyJTNBMCUyQyUyMmRpc3BsYXlUeXBlJTIyJTNBbnVsbCUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMk5PVF9GT1VORCUyMiUyQyUyMmluZm8lMjIlM0ElMjJCYW5uZXIlMjBub3QlMjBmb3VuZCUyMGluJTIwZmV0Y2hlZCUyMHJlc3BvbnNlJTIwb24lMjB0aGUlMjBzZXJ2ZXIuJTIyJTdEJTdE" data-amp-option-loading="lazy"></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0FudWxsJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0FudWxsJTJDJTIycm90YXRpb25TZWNvbmRzJTIyJTNBMCUyQyUyMmRpc3BsYXlUeXBlJTIyJTNBbnVsbCUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMk5PVF9GT1VORCUyMiUyQyUyMmluZm8lMjIlM0ElMjJCYW5uZXIlMjBub3QlMjBmb3VuZCUyMGluJTIwZmV0Y2hlZCUyMHJlc3BvbnNlJTIwb24lMjB0aGUlMjBzZXJ2ZXIuJTIyJTdEJTdE" data-amp-option-loading="lazy"></div>
diff --git a/tests/resources/renderer/random/bannerWithBreakpointHtmlContentOnly.html b/tests/resources/renderer/random/bannerWithBreakpointHtmlContentOnly.html
index e87e59b..cbf4297 100644
--- a/tests/resources/renderer/random/bannerWithBreakpointHtmlContentOnly.html
+++ b/tests/resources/renderer/random/bannerWithBreakpointHtmlContentOnly.html
@@ -1,4 +1,4 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
     <div class="amp-banner amp-banner--random" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <div data-amp-content-breakpoint="500" class="amp-banner__content amp-banner__content--html">
             <p>My <span style="color:red;">Awesome</span> content!</p>
diff --git a/tests/resources/renderer/random/bannerWithBreakpointImageContentOnly.html b/tests/resources/renderer/random/bannerWithBreakpointImageContentOnly.html
index c5610bb..5d6458e 100644
--- a/tests/resources/renderer/random/bannerWithBreakpointImageContentOnly.html
+++ b/tests/resources/renderer/random/bannerWithBreakpointImageContentOnly.html
@@ -1,8 +1,8 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
     <div class="amp-banner amp-banner--random" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <a data-amp-content-breakpoint="500" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main1">
             <picture>
-                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" title="Main 1">
+                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" width="800" height="300" title="Main 1">
             </picture>
         </a>
         <style>[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="500"]{display:none}@media(min-width: 500px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="500"]{display:block}}</style>
diff --git a/tests/resources/renderer/random/bannerWithDefaultHtmlContentOnly.html b/tests/resources/renderer/random/bannerWithDefaultHtmlContentOnly.html
index f741561..a85507b 100644
--- a/tests/resources/renderer/random/bannerWithDefaultHtmlContentOnly.html
+++ b/tests/resources/renderer/random/bannerWithDefaultHtmlContentOnly.html
@@ -1,4 +1,4 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
     <div class="amp-banner amp-banner--random" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <div data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--html">
             <p>My <span style="color:red;">Awesome</span> content!</p>
diff --git a/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withLazyLoading.html b/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withLazyLoading.html
index 55a4c52..f44cb15 100644
--- a/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withLazyLoading.html
+++ b/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withLazyLoading.html
@@ -1,10 +1,10 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE" data-amp-option-loading="lazy">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE" data-amp-option-loading="lazy">
     <div class="amp-banner amp-banner--random" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <a data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main1" target="_blank">
             <picture>
                 <source type="image/avif" srcset="https://img.example.com/500/main1.avif 500w, https://img.example.com/1000/main1.avif 1000w" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw">
                 <source type="image/webp" srcset="https://img.example.com/500/main1.webp 500w, https://img.example.com/1000/main1.webp 1000w" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw">
-                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" title="Main 1" loading="lazy">
+                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" width="800" height="300" title="Main 1" loading="lazy">
             </picture>
         </a>
     </div>
diff --git a/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withOptionalValues.html b/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withOptionalValues.html
index b77d2fd..142c2d1 100644
--- a/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withOptionalValues.html
+++ b/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withOptionalValues.html
@@ -1,10 +1,10 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
     <div class="amp-banner amp-banner--random" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <a data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main1" target="_blank">
             <picture>
                 <source type="image/avif" srcset="https://img.example.com/500/main1.avif 500w, https://img.example.com/1000/main1.avif 1000w" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw">
                 <source type="image/webp" srcset="https://img.example.com/500/main1.webp 500w, https://img.example.com/1000/main1.webp 1000w" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw">
-                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" title="Main 1">
+                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" width="800" height="300" title="Main 1">
             </picture>
         </a>
     </div>
diff --git a/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withoutDimensions.html b/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withoutDimensions.html
new file mode 100644
index 0000000..3783216
--- /dev/null
+++ b/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withoutDimensions.html
@@ -0,0 +1,9 @@
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBbnVsbCUyQyUyMmhlaWdodCUyMiUzQW51bGwlN0QlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q=">
+    <div class="amp-banner amp-banner--random" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
+        <a data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main1">
+            <picture>
+                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" title="Main 1">
+            </picture>
+        </a>
+    </div>
+</div>
diff --git a/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withoutOptionalValues.html b/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withoutOptionalValues.html
index 4661727..bd95fc1 100644
--- a/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withoutOptionalValues.html
+++ b/tests/resources/renderer/random/bannerWithDefaultImageContentOnly.withoutOptionalValues.html
@@ -1,8 +1,8 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
     <div class="amp-banner amp-banner--random" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <a data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main1">
             <picture>
-                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" title="Main 1">
+                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" width="800" height="300" title="Main 1">
             </picture>
         </a>
     </div>
diff --git a/tests/resources/renderer/random/bannerWithMultipleContents.html b/tests/resources/renderer/random/bannerWithMultipleContents.html
index 4286bff..b8b79e5 100644
--- a/tests/resources/renderer/random/bannerWithMultipleContents.html
+++ b/tests/resources/renderer/random/bannerWithMultipleContents.html
@@ -1,4 +1,4 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE" data-amp-option-loading="lazy">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE" data-amp-option-loading="lazy">
     <div class="amp-banner amp-banner--random" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <div data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--html">
             <p>Small content</p>
@@ -7,14 +7,14 @@
             <picture>
                 <source type="image/avif" srcset="https://img.example.com/800/main1.avif 800w, https://img.example.com/1000/main1.avif 1000w" sizes="(min-width: 1000px) 1000px, 100vw">
                 <source type="image/webp" srcset="https://img.example.com/800/main1.webp 800w, https://img.example.com/1000/main1.webp 1000w" sizes="(min-width: 1000px) 1000px, 100vw">
-                <img srcset="https://img.example.com/800/main1.png 800w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Main 1" title="Main 1" loading="lazy">
+                <img srcset="https://img.example.com/800/main1.png 800w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Main 1" width="800" height="300" title="Main 1" loading="lazy">
             </picture>
         </a>
         <a data-amp-content-breakpoint="400" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main2" target="_blank">
             <picture>
                 <source type="image/avif" srcset="https://img.example.com/600/main2.avif 600w" sizes="100vw">
                 <source type="image/webp" srcset="https://img.example.com/600/main2.webp 600w" sizes="100vw">
-                <img srcset="https://img.example.com/600/main2.png 600w" src="https://img.example.com/600/main2.png" sizes="100vw" alt="Main 2" title="Main 2" loading="lazy">
+                <img srcset="https://img.example.com/600/main2.png 600w" src="https://img.example.com/600/main2.png" sizes="100vw" alt="Main 2" width="800" height="300" title="Main 2" loading="lazy">
             </picture>
         </a>
         <style>[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:none}@media(min-width: 400px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="default"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:block}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:none}}@media(min-width: 600px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="default"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:block}}</style>
diff --git a/tests/resources/renderer/random/bannerWithoutContent.html b/tests/resources/renderer/random/bannerWithoutContent.html
index 08aef83..cf4e95b 100644
--- a/tests/resources/renderer/random/bannerWithoutContent.html
+++ b/tests/resources/renderer/random/bannerWithoutContent.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE"></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE"></div>
diff --git a/tests/resources/renderer/random/data-provider.php b/tests/resources/renderer/random/data-provider.php
index 119c060..36e64ce 100644
--- a/tests/resources/renderer/random/data-provider.php
+++ b/tests/resources/renderer/random/data-provider.php
@@ -3,12 +3,36 @@
 declare(strict_types=1);
 
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Banner;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Dimensions;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\HtmlContent;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\ImageContent;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Position;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Position as ResponsePosition;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Source;
 
-$position = new Position('1234', 'homepage.top', 'Homepage top', 0, Position::DisplayTypeRandom, Position::BreakpointTypeMin, []);
+$position = new Position(
+    '1234',
+    'homepage.top',
+    'Homepage top',
+    0,
+    Position::DisplayTypeRandom,
+    Position::BreakpointTypeMin,
+    ResponsePosition::ModeManaged,
+    new Dimensions(800, 300),
+    [],
+);
+
+$positionWithoutDimensions = new Position(
+    '1234',
+    'homepage.top',
+    'Homepage top',
+    0,
+    Position::DisplayTypeRandom,
+    Position::BreakpointTypeMin,
+    ResponsePosition::ModeManaged,
+    new Dimensions(null, null),
+    [],
+);
 
 return [
     'No banner' => [
@@ -56,6 +80,25 @@
         [],
         __DIR__ . '/bannerWithDefaultImageContentOnly.withoutOptionalValues.html',
     ],
+    'Banner with default content only: image without dimensions' => [
+        $positionWithoutDimensions,
+        new Banner('1234', 'Main', 0, null, null, null, [
+            new ImageContent(
+                null,
+                'https://www.example.com/main1',
+                null,
+                'Main 1',
+                'Main 1',
+                'https://img.example.com/1000/main1.png',
+                'https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w',
+                '(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw',
+                [],
+            ),
+        ]),
+        [],
+        [],
+        __DIR__ . '/bannerWithDefaultImageContentOnly.withoutDimensions.html',
+    ],
     'Banner with default content only: image with optional value' => [
         $position,
         new Banner('1234', 'Main', 0, null, null, null, [
diff --git a/tests/resources/renderer/random/noBanner.html b/tests/resources/renderer/random/noBanner.html
index 08aef83..cf4e95b 100644
--- a/tests/resources/renderer/random/noBanner.html
+++ b/tests/resources/renderer/random/noBanner.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE"></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE"></div>
diff --git a/tests/resources/renderer/random/noBanner.withAttributes.html b/tests/resources/renderer/random/noBanner.withAttributes.html
index 7fd0cf0..22f2887 100644
--- a/tests/resources/renderer/random/noBanner.withAttributes.html
+++ b/tests/resources/renderer/random/noBanner.withAttributes.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE" class="custom-class" data-custom></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnJhbmRvbSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE" class="custom-class" data-custom></div>
diff --git a/tests/resources/renderer/random/templates/random1.phtml b/tests/resources/renderer/random/templates/random1.phtml
index 23d3971..8b906ca 100644
--- a/tests/resources/renderer/random/templates/random1.phtml
+++ b/tests/resources/renderer/random/templates/random1.phtml
@@ -7,4 +7,4 @@ use SixtyEightPublishers\AmpClient\Renderer\Phtml\Helpers;
 
 /** @var Position $position */
 ?>
-<span style="color: red;">Multiple position "<?= Helpers::escapeHtml($position->getCode()) ?>".</span>
+<span style="color: red;">Random position "<?= Helpers::escapeHtml($position->getCode()) ?>".</span>
diff --git a/tests/resources/renderer/single/bannerWithBreakpointHtmlContentOnly.html b/tests/resources/renderer/single/bannerWithBreakpointHtmlContentOnly.html
index 0359246..402273f 100644
--- a/tests/resources/renderer/single/bannerWithBreakpointHtmlContentOnly.html
+++ b/tests/resources/renderer/single/bannerWithBreakpointHtmlContentOnly.html
@@ -1,4 +1,4 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
     <div class="amp-banner amp-banner--single" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <div data-amp-content-breakpoint="500" class="amp-banner__content amp-banner__content--html">
             <p>My <span style="color:red;">Awesome</span> content!</p>
diff --git a/tests/resources/renderer/single/bannerWithBreakpointImageContentOnly.html b/tests/resources/renderer/single/bannerWithBreakpointImageContentOnly.html
index 041a706..ddd9194 100644
--- a/tests/resources/renderer/single/bannerWithBreakpointImageContentOnly.html
+++ b/tests/resources/renderer/single/bannerWithBreakpointImageContentOnly.html
@@ -1,8 +1,8 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
     <div class="amp-banner amp-banner--single" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <a data-amp-content-breakpoint="500" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main1">
             <picture>
-                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" title="Main 1">
+                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" width="800" height="300" title="Main 1">
             </picture>
         </a>
         <style>[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="500"]{display:none}@media(min-width: 500px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="500"]{display:block}}</style>
diff --git a/tests/resources/renderer/single/bannerWithDefaultHtmlContentOnly.html b/tests/resources/renderer/single/bannerWithDefaultHtmlContentOnly.html
index e178c4c..10fbff8 100644
--- a/tests/resources/renderer/single/bannerWithDefaultHtmlContentOnly.html
+++ b/tests/resources/renderer/single/bannerWithDefaultHtmlContentOnly.html
@@ -1,4 +1,4 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
     <div class="amp-banner amp-banner--single" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <div data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--html">
             <p>My <span style="color:red;">Awesome</span> content!</p>
diff --git a/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withLazyLoading.html b/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withLazyLoading.html
index 8773cfb..8b6ea73 100644
--- a/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withLazyLoading.html
+++ b/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withLazyLoading.html
@@ -1,10 +1,10 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE" data-amp-option-loading="lazy">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE" data-amp-option-loading="lazy">
     <div class="amp-banner amp-banner--single" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <a data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main1" target="_blank">
             <picture>
                 <source type="image/avif" srcset="https://img.example.com/500/main1.avif 500w, https://img.example.com/1000/main1.avif 1000w" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw">
                 <source type="image/webp" srcset="https://img.example.com/500/main1.webp 500w, https://img.example.com/1000/main1.webp 1000w" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw">
-                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" title="Main 1" loading="lazy">
+                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" width="800" height="300" title="Main 1" loading="lazy">
             </picture>
         </a>
     </div>
diff --git a/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withOptionalValues.html b/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withOptionalValues.html
index 85b5288..ad746e6 100644
--- a/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withOptionalValues.html
+++ b/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withOptionalValues.html
@@ -1,10 +1,10 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
     <div class="amp-banner amp-banner--single" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <a data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main1" target="_blank">
             <picture>
                 <source type="image/avif" srcset="https://img.example.com/500/main1.avif 500w, https://img.example.com/1000/main1.avif 1000w" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw">
                 <source type="image/webp" srcset="https://img.example.com/500/main1.webp 500w, https://img.example.com/1000/main1.webp 1000w" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw">
-                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" title="Main 1">
+                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" width="800" height="300" title="Main 1">
             </picture>
         </a>
     </div>
diff --git a/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withoutDimensions.html b/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withoutDimensions.html
new file mode 100644
index 0000000..d08bfcd
--- /dev/null
+++ b/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withoutDimensions.html
@@ -0,0 +1,16 @@
+<div data-amp-banner="homepage.top"
+     data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBbnVsbCUyQyUyMmhlaWdodCUyMiUzQW51bGwlN0QlN0QlMkMlMjJzdGF0ZSUyMiUzQSU3QiUyMnZhbHVlJTIyJTNBJTIyUkVOREVSRUQlMjIlMkMlMjJpbmZvJTIyJTNBJTIyQmFubmVyJTIwd2FzJTIwc3VjY2Vzc2Z1bGx5JTIwcmVuZGVyZWQlMjBzZXJ2ZXItc2lkZS4lMjIlN0QlN0Q=">
+    <div class="amp-banner amp-banner--single"
+         data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA=="
+         data-amp-banner-id="1234">
+        <a data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--img"
+           href="https://www.example.com/main1">
+            <picture>
+                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w"
+                     src="https://img.example.com/1000/main1.png"
+                     sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw"
+                     alt="Main 1" title="Main 1">
+            </picture>
+        </a>
+    </div>
+</div>
diff --git a/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withoutOptionalValues.html b/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withoutOptionalValues.html
index 118e443..28ad2e0 100644
--- a/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withoutOptionalValues.html
+++ b/tests/resources/renderer/single/bannerWithDefaultImageContentOnly.withoutOptionalValues.html
@@ -1,8 +1,8 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE">
     <div class="amp-banner amp-banner--single" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <a data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main1">
             <picture>
-                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" title="Main 1">
+                <img srcset="https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw" alt="Main 1" width="800" height="300" title="Main 1">
             </picture>
         </a>
     </div>
diff --git a/tests/resources/renderer/single/bannerWithMultipleContents.html b/tests/resources/renderer/single/bannerWithMultipleContents.html
index 1684757..5fd076c 100644
--- a/tests/resources/renderer/single/bannerWithMultipleContents.html
+++ b/tests/resources/renderer/single/bannerWithMultipleContents.html
@@ -1,4 +1,4 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE" data-amp-option-loading="lazy">
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE" data-amp-option-loading="lazy">
     <div class="amp-banner amp-banner--single" data-amp-banner-fingerprint="JTdCJTIyYmFubmVySWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyYmFubmVyTmFtZSUyMiUzQSUyMk1haW4lMjIlMkMlMjJwb3NpdGlvbklkJTIyJTNBJTIyMTIzNCUyMiUyQyUyMnBvc2l0aW9uQ29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMnBvc2l0aW9uTmFtZSUyMiUzQSUyMkhvbWVwYWdlJTIwdG9wJTIyJTJDJTIyY2FtcGFpZ25JZCUyMiUzQW51bGwlMkMlMjJjYW1wYWlnbkNvZGUlMjIlM0FudWxsJTJDJTIyY2FtcGFpZ25OYW1lJTIyJTNBbnVsbCU3RA==" data-amp-banner-id="1234">
         <div data-amp-content-breakpoint="default" class="amp-banner__content amp-banner__content--html">
             <p>Small content</p>
@@ -7,14 +7,14 @@
             <picture>
                 <source type="image/avif" srcset="https://img.example.com/800/main1.avif 800w, https://img.example.com/1000/main1.avif 1000w" sizes="(min-width: 1000px) 1000px, 100vw">
                 <source type="image/webp" srcset="https://img.example.com/800/main1.webp 800w, https://img.example.com/1000/main1.webp 1000w" sizes="(min-width: 1000px) 1000px, 100vw">
-                <img srcset="https://img.example.com/800/main1.png 800w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Main 1" title="Main 1" loading="lazy">
+                <img srcset="https://img.example.com/800/main1.png 800w, https://img.example.com/1000/main1.png 1000w" src="https://img.example.com/1000/main1.png" sizes="(min-width: 1000px) 1000px, 100vw" alt="Main 1" width="800" height="300" title="Main 1" loading="lazy">
             </picture>
         </a>
         <a data-amp-content-breakpoint="400" class="amp-banner__content amp-banner__content--img" href="https://www.example.com/main2" target="_blank">
             <picture>
                 <source type="image/avif" srcset="https://img.example.com/600/main2.avif 600w" sizes="100vw">
                 <source type="image/webp" srcset="https://img.example.com/600/main2.webp 600w" sizes="100vw">
-                <img srcset="https://img.example.com/600/main2.png 600w" src="https://img.example.com/600/main2.png" sizes="100vw" alt="Main 2" title="Main 2" loading="lazy">
+                <img srcset="https://img.example.com/600/main2.png 600w" src="https://img.example.com/600/main2.png" sizes="100vw" alt="Main 2" width="800" height="300" title="Main 2" loading="lazy">
             </picture>
         </a>
         <style>[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:none}@media(min-width: 400px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="default"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:block}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:none}}@media(min-width: 600px){[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="default"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="400"]{display:none}[data-amp-banner="homepage.top"] [data-amp-banner-id="1234"] [data-amp-content-breakpoint="600"]{display:block}}</style>
diff --git a/tests/resources/renderer/single/bannerWithoutContent.html b/tests/resources/renderer/single/bannerWithoutContent.html
index 170c63b..0f8e14d 100644
--- a/tests/resources/renderer/single/bannerWithoutContent.html
+++ b/tests/resources/renderer/single/bannerWithoutContent.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE"></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE"></div>
diff --git a/tests/resources/renderer/single/data-provider.php b/tests/resources/renderer/single/data-provider.php
index 7a0c622..e95d6c5 100644
--- a/tests/resources/renderer/single/data-provider.php
+++ b/tests/resources/renderer/single/data-provider.php
@@ -3,12 +3,36 @@
 declare(strict_types=1);
 
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Banner;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Dimensions;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\HtmlContent;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\ImageContent;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Position;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Position as ResponsePosition;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Source;
 
-$position = new Position('1234', 'homepage.top', 'Homepage top', 0, Position::DisplayTypeSingle, Position::BreakpointTypeMin, []);
+$position = new Position(
+    '1234',
+    'homepage.top',
+    'Homepage top',
+    0,
+    Position::DisplayTypeSingle,
+    Position::BreakpointTypeMin,
+    ResponsePosition::ModeManaged,
+    new Dimensions(800, 300),
+    [],
+);
+
+$positionWithoutDimensions = new Position(
+    '1234',
+    'homepage.top',
+    'Homepage top',
+    0,
+    Position::DisplayTypeSingle,
+    Position::BreakpointTypeMin,
+    ResponsePosition::ModeManaged,
+    new Dimensions(null, null),
+    [],
+);
 
 return [
     'No banner' => [
@@ -56,6 +80,25 @@
         [],
         __DIR__ . '/bannerWithDefaultImageContentOnly.withoutOptionalValues.html',
     ],
+    'Banner with default content only: image without dimensions' => [
+        $positionWithoutDimensions,
+        new Banner('1234', 'Main', 0, null, null, null, [
+            new ImageContent(
+                null,
+                'https://www.example.com/main1',
+                null,
+                'Main 1',
+                'Main 1',
+                'https://img.example.com/1000/main1.png',
+                'https://img.example.com/500/main1.png 500w, https://img.example.com/1000/main1.png 1000w',
+                '(min-width: 1000px) calc(1000px - 2 * 16px), (min-width: 600px) calc(100vw - 2 * 16px), 100vw',
+                [],
+            ),
+        ]),
+        [],
+        [],
+        __DIR__ . '/bannerWithDefaultImageContentOnly.withoutDimensions.html',
+    ],
     'Banner with default content only: image with optional value' => [
         $position,
         new Banner('1234', 'Main', 0, null, null, null, [
diff --git a/tests/resources/renderer/single/noBanner.html b/tests/resources/renderer/single/noBanner.html
index 170c63b..0f8e14d 100644
--- a/tests/resources/renderer/single/noBanner.html
+++ b/tests/resources/renderer/single/noBanner.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE"></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE"></div>
diff --git a/tests/resources/renderer/single/noBanner.withAttributes.html b/tests/resources/renderer/single/noBanner.withAttributes.html
index 16cfa77..8ad038f 100644
--- a/tests/resources/renderer/single/noBanner.withAttributes.html
+++ b/tests/resources/renderer/single/noBanner.withAttributes.html
@@ -1 +1 @@
-<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE" class="custom-class" data-custom></div>
+<div data-amp-banner="homepage.top" data-amp-banner-external="JTdCJTIycG9zaXRpb25EYXRhJTIyJTNBJTdCJTIyaWQlMjIlM0ElMjIxMjM0JTIyJTJDJTIyY29kZSUyMiUzQSUyMmhvbWVwYWdlLnRvcCUyMiUyQyUyMm5hbWUlMjIlM0ElMjJIb21lcGFnZSUyMHRvcCUyMiUyQyUyMnJvdGF0aW9uU2Vjb25kcyUyMiUzQTAlMkMlMjJkaXNwbGF5VHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMmJyZWFrcG9pbnRUeXBlJTIyJTNBJTIybWluJTIyJTJDJTIyZGltZW5zaW9ucyUyMiUzQSU3QiUyMndpZHRoJTIyJTNBODAwJTJDJTIyaGVpZ2h0JTIyJTNBMzAwJTdEJTdEJTJDJTIyc3RhdGUlMjIlM0ElN0IlMjJ2YWx1ZSUyMiUzQSUyMlJFTkRFUkVEJTIyJTJDJTIyaW5mbyUyMiUzQSUyMkJhbm5lciUyMHdhcyUyMHN1Y2Nlc3NmdWxseSUyMHJlbmRlcmVkJTIwc2VydmVyLXNpZGUuJTIyJTdEJTdE" class="custom-class" data-custom></div>
diff --git a/tests/resources/response-body/fetch-banners.full.json b/tests/resources/response-body/fetch-banners.full.json
index 4cb7380..ecb1c63 100644
--- a/tests/resources/response-body/fetch-banners.full.json
+++ b/tests/resources/response-body/fetch-banners.full.json
@@ -7,6 +7,11 @@
       "rotation_seconds": 3,
       "display_type": "multiple",
       "breakpoint_type": "min",
+      "mode": "managed",
+      "dimensions": {
+        "width": 1320,
+        "height": 400
+      },
       "banners": [
         {
           "id": "d7275445-c287-47d2-b71a-3baff5b4d23c",
@@ -70,12 +75,24 @@
       "rotation_seconds": 5,
       "display_type": "random",
       "breakpoint_type": "min",
+      "mode": "managed",
+      "dimensions": {
+        "width": 800,
+        "height": 300
+      },
       "banners": []
     },
     "homepage.missing": {
+      "position_id": null,
+      "position_name": null,
       "rotation_seconds": 0,
       "display_type": null,
       "breakpoint_type": "min",
+      "mode": "managed",
+      "dimensions": {
+        "width": null,
+        "height": null
+      },
       "banners": []
     },
     "homepage.bottom": {
@@ -84,6 +101,11 @@
       "rotation_seconds": 5,
       "display_type": "single",
       "breakpoint_type": "min",
+      "mode": "managed",
+      "dimensions": {
+        "width": 800,
+        "height": 300
+      },
       "banners": [
         {
           "id": "54c72f46-2b6c-4d80-a75e-28fed4d79f5c",
diff --git a/tests/resources/response-body/fetch-banners.full.php b/tests/resources/response-body/fetch-banners.full.php
index 54246c6..d3fa981 100644
--- a/tests/resources/response-body/fetch-banners.full.php
+++ b/tests/resources/response-body/fetch-banners.full.php
@@ -4,6 +4,7 @@
 
 use SixtyEightPublishers\AmpClient\Response\BannersResponse;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Banner;
+use SixtyEightPublishers\AmpClient\Response\ValueObject\Dimensions;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\HtmlContent;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\ImageContent;
 use SixtyEightPublishers\AmpClient\Response\ValueObject\Position;
@@ -15,8 +16,13 @@
         'homepage.top',
         'Homepage top',
         3,
-        'multiple',
-        'min',
+        Position::DisplayTypeMultiple,
+        Position::BreakpointTypeMin,
+        Position::ModeManaged,
+        new Dimensions(
+            1320,
+            400,
+        ),
         [
             new Banner(
                 'd7275445-c287-47d2-b71a-3baff5b4d23c',
@@ -77,8 +83,13 @@
         'homepage.middle',
         'Homepage - middle',
         5,
-        'random',
-        'min',
+        Position::DisplayTypeRandom,
+        Position::BreakpointTypeMin,
+        Position::ModeManaged,
+        new Dimensions(
+            800,
+            300,
+        ),
         [],
     ),
     'homepage.missing' => new Position(
@@ -87,7 +98,12 @@
         null,
         0,
         null,
-        'min',
+        Position::BreakpointTypeMin,
+        Position::ModeManaged,
+        new Dimensions(
+            null,
+            null,
+        ),
         [],
     ),
     'homepage.bottom' => new Position(
@@ -95,8 +111,13 @@
         'homepage.bottom',
         'Homepage - bottom',
         5,
-        'single',
-        'min',
+        Position::DisplayTypeSingle,
+        Position::BreakpointTypeMin,
+        Position::ModeManaged,
+        new Dimensions(
+            800,
+            300,
+        ),
         [
             new Banner(
                 '54c72f46-2b6c-4d80-a75e-28fed4d79f5c',