diff --git a/snapshot/guide/configurationreference.html b/snapshot/guide/configurationreference.html
index 58257bc3..18454b81 100644
--- a/snapshot/guide/configurationreference.html
+++ b/snapshot/guide/configurationreference.html
@@ -51,9 +51,33 @@ <h1>Configuration Reference</h1>
             </div>
 <div class="sect2">
 <h3 id="_micronaut_microstream_cache_config_properties">Micronaut Microstream Cache Config Properties</h3>
+<a id="io.micronaut.microstream.cache.CacheConfigurationProperties" href="#io.micronaut.microstream.cache.CacheConfigurationProperties">&#128279;</a>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 1. Configuration Properties for <a href="../api/io/micronaut/microstream/cache/CacheConfigurationProperties.html">CacheConfigurationProperties</a></caption>
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 33.3333%;">
+<col style="width: 33.3334%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property</th>
+<th class="tableblock halign-left valign-top">Type</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.cache.enabled</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">boolean</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Whether MicroStream Cache module is enabled. Default Value: true</p></td>
+</tr>
+</tbody>
+</table>
+<div style="page-break-after: always;"></div>
 <a id="io.micronaut.microstream.cache.MicroStreamCacheConfigurationProperties" href="#io.micronaut.microstream.cache.MicroStreamCacheConfigurationProperties">&#128279;</a>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 1. Configuration Properties for <a href="../api/io/micronaut/microstream/cache/MicroStreamCacheConfigurationProperties.html">MicroStreamCacheConfigurationProperties</a></caption>
+<caption class="title">Table 2. Configuration Properties for <a href="../api/io/micronaut/microstream/cache/MicroStreamCacheConfigurationProperties.html">MicroStreamCacheConfigurationProperties</a></caption>
 <colgroup>
 <col style="width: 33.3333%;">
 <col style="width: 33.3333%;">
@@ -115,134 +139,12 @@ <h3 id="_micronaut_microstream_cache_config_properties">Micronaut Microstream Ca
 </tbody>
 </table>
 <div style="page-break-after: always;"></div>
-<a id="io.micronaut.microstream.cache.CacheConfigurationProperties" href="#io.micronaut.microstream.cache.CacheConfigurationProperties">&#128279;</a>
-<table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 2. Configuration Properties for <a href="../api/io/micronaut/microstream/cache/CacheConfigurationProperties.html">CacheConfigurationProperties</a></caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 33.3333%;">
-<col style="width: 33.3334%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Type</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.cache.enabled</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Whether MicroStream Cache module is enabled. Default Value: true</p></td>
-</tr>
-</tbody>
-</table>
-<div style="page-break-after: always;"></div>
 </div>
 <div class="sect2">
 <h3 id="_micronaut_microstream_config_properties">Micronaut Microstream Config Properties</h3>
-<a id="io.micronaut.microstream.postgres.DefaultPostgresStorageConfigurationProvider" href="#io.micronaut.microstream.postgres.DefaultPostgresStorageConfigurationProvider">&#128279;</a>
-<table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 3. Configuration Properties for <a href="../api/io/micronaut/microstream/postgres/DefaultPostgresStorageConfigurationProvider.html">DefaultPostgresStorageConfigurationProvider</a></caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 33.3333%;">
-<col style="width: 33.3334%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Type</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.postgres.storage.*.root-class</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.Class</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Class of the Root Instance.
- &lt;a href="https://docs.microstream.one/manual/storage/root-instances.html"&gt;Root Instances&lt;/a&gt;</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.postgres.storage.*.datasource-name</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.String</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The name qualifier of the defined postgres DataSource to use.
- If unset, a datasource with the same name as the storage will be used.
- If there is no bean with a name qualifier matching the storage name, the default datasource will be used.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.postgres.storage.*.table-name</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.String</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Name of the table to use.</p></td>
-</tr>
-</tbody>
-</table>
-<div style="page-break-after: always;"></div>
-<a id="io.micronaut.microstream.conf.MicroStreamConfigurationProperties" href="#io.micronaut.microstream.conf.MicroStreamConfigurationProperties">&#128279;</a>
-<table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 4. Configuration Properties for <a href="../api/io/micronaut/microstream/conf/MicroStreamConfigurationProperties.html">MicroStreamConfigurationProperties</a></caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 33.3333%;">
-<col style="width: 33.3334%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Type</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.enabled</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">boolean</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Whether MicroStream module is enabled. Default Value: true</p></td>
-</tr>
-</tbody>
-</table>
-<div style="page-break-after: always;"></div>
-<a id="io.micronaut.microstream.s3.DefaultS3StorageConfigurationProvider" href="#io.micronaut.microstream.s3.DefaultS3StorageConfigurationProvider">&#128279;</a>
-<table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 5. Configuration Properties for <a href="../api/io/micronaut/microstream/s3/DefaultS3StorageConfigurationProvider.html">DefaultS3StorageConfigurationProvider</a></caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 33.3333%;">
-<col style="width: 33.3334%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Type</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.s3.storage.*.root-class</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.Class</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Class of the Root Instance.
- &lt;a href="https://docs.microstream.one/manual/storage/root-instances.html"&gt;Root Instances&lt;/a&gt;</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.s3.storage.*.s3-client-name</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.String</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">The name qualifier of the defined S3Client to use.
- If unset, a client with the same name as the storage will be used.
- If there is no bean with a name qualifier matching the storage name, the default client will be used.</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.s3.storage.*.bucket-name</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.String</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Name of the bucket to use.</p></td>
-</tr>
-</tbody>
-</table>
-<div style="page-break-after: always;"></div>
 <a id="io.micronaut.microstream.conf.DefaultEmbeddedStorageConfigurationProvider" href="#io.micronaut.microstream.conf.DefaultEmbeddedStorageConfigurationProvider">&#128279;</a>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 6. Configuration Properties for <a href="../api/io/micronaut/microstream/conf/DefaultEmbeddedStorageConfigurationProvider.html">DefaultEmbeddedStorageConfigurationProvider</a></caption>
+<caption class="title">Table 3. Configuration Properties for <a href="../api/io/micronaut/microstream/conf/DefaultEmbeddedStorageConfigurationProvider.html">DefaultEmbeddedStorageConfigurationProvider</a></caption>
 <colgroup>
 <col style="width: 33.3333%;">
 <col style="width: 33.3333%;">
@@ -385,9 +287,33 @@ <h3 id="_micronaut_microstream_config_properties">Micronaut Microstream Config P
 </tbody>
 </table>
 <div style="page-break-after: always;"></div>
+<a id="io.micronaut.microstream.conf.MicroStreamConfigurationProperties" href="#io.micronaut.microstream.conf.MicroStreamConfigurationProperties">&#128279;</a>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 4. Configuration Properties for <a href="../api/io/micronaut/microstream/conf/MicroStreamConfigurationProperties.html">MicroStreamConfigurationProperties</a></caption>
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 33.3333%;">
+<col style="width: 33.3334%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property</th>
+<th class="tableblock halign-left valign-top">Type</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.enabled</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">boolean</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Whether MicroStream module is enabled. Default Value: true</p></td>
+</tr>
+</tbody>
+</table>
+<div style="page-break-after: always;"></div>
 <a id="io.micronaut.microstream.dynamodb.DefaultDynamoDBStorageConfigurationProvider" href="#io.micronaut.microstream.dynamodb.DefaultDynamoDBStorageConfigurationProvider">&#128279;</a>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 7. Configuration Properties for <a href="../api/io/micronaut/microstream/dynamodb/DefaultDynamoDBStorageConfigurationProvider.html">DefaultDynamoDBStorageConfigurationProvider</a></caption>
+<caption class="title">Table 5. Configuration Properties for <a href="../api/io/micronaut/microstream/dynamodb/DefaultDynamoDBStorageConfigurationProvider.html">DefaultDynamoDBStorageConfigurationProvider</a></caption>
 <colgroup>
 <col style="width: 33.3333%;">
 <col style="width: 33.3333%;">
@@ -422,6 +348,80 @@ <h3 id="_micronaut_microstream_config_properties">Micronaut Microstream Config P
 </tbody>
 </table>
 <div style="page-break-after: always;"></div>
+<a id="io.micronaut.microstream.s3.DefaultS3StorageConfigurationProvider" href="#io.micronaut.microstream.s3.DefaultS3StorageConfigurationProvider">&#128279;</a>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 6. Configuration Properties for <a href="../api/io/micronaut/microstream/s3/DefaultS3StorageConfigurationProvider.html">DefaultS3StorageConfigurationProvider</a></caption>
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 33.3333%;">
+<col style="width: 33.3334%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property</th>
+<th class="tableblock halign-left valign-top">Type</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.s3.storage.*.root-class</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.Class</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Class of the Root Instance.
+ &lt;a href="https://docs.microstream.one/manual/storage/root-instances.html"&gt;Root Instances&lt;/a&gt;</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.s3.storage.*.s3-client-name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The name qualifier of the defined S3Client to use.
+ If unset, a client with the same name as the storage will be used.
+ If there is no bean with a name qualifier matching the storage name, the default client will be used.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.s3.storage.*.bucket-name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Name of the bucket to use.</p></td>
+</tr>
+</tbody>
+</table>
+<div style="page-break-after: always;"></div>
+<a id="io.micronaut.microstream.postgres.DefaultPostgresStorageConfigurationProvider" href="#io.micronaut.microstream.postgres.DefaultPostgresStorageConfigurationProvider">&#128279;</a>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 7. Configuration Properties for <a href="../api/io/micronaut/microstream/postgres/DefaultPostgresStorageConfigurationProvider.html">DefaultPostgresStorageConfigurationProvider</a></caption>
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 33.3333%;">
+<col style="width: 33.3334%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property</th>
+<th class="tableblock halign-left valign-top">Type</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.postgres.storage.*.root-class</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.Class</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Class of the Root Instance.
+ &lt;a href="https://docs.microstream.one/manual/storage/root-instances.html"&gt;Root Instances&lt;/a&gt;</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.postgres.storage.*.datasource-name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The name qualifier of the defined postgres DataSource to use.
+ If unset, a datasource with the same name as the storage will be used.
+ If there is no bean with a name qualifier matching the storage name, the default datasource will be used.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>microstream.postgres.storage.*.table-name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.String</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Name of the table to use.</p></td>
+</tr>
+</tbody>
+</table>
+<div style="page-break-after: always;"></div>
 </div>
 <div class="sect2">
 <h3 id="_micronaut_microstream_rest_config_properties">Micronaut Microstream Rest Config Properties</h3>