diff --git a/javadoc/allclasses-index.html b/javadoc/allclasses-index.html
index 2086ac8..13cc3f1 100644
--- a/javadoc/allclasses-index.html
+++ b/javadoc/allclasses-index.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>All Classes and Interfaces (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>All Classes and Interfaces (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="class index">
 <meta name="generator" content="javadoc/AllClassesIndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="all-classes-index-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "./";
+<script type="text/javascript">var pathtoroot = "./";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,23 +23,23 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="index.html">Overview</a></li>
-<li>Module</li>
-<li>Package</li>
+<li><a href="jakarta.nosql.core/module-summary.html">Module</a></li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">Package</a></li>
 <li>Class</li>
 <li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-tree.html">Tree</a></li>
 <li><a href="index-all.html">Index</a></li>
 <li><a href="help-doc.html#all-classes">Help</a></li>
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -56,120 +51,136 @@
 <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces</h1>
 </div>
 <div id="all-classes-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="all-classes-table-tab0" role="tab" aria-selected="true" aria-controls="all-classes-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="all-classes-table-tab1" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab1', 2)" class="table-tab">Interfaces</button><button id="all-classes-table-tab5" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab5', 2)" class="table-tab">Exceptions</button><button id="all-classes-table-tab7" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab7', 2)" class="table-tab">Annotation Interfaces</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="all-classes-table-tab0" role="tab" aria-selected="true" aria-controls="all-classes-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="all-classes-table-tab1" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab1', 2)" class="table-tab">Interfaces</button><button id="all-classes-table-tab3" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab3', 2)" class="table-tab">Enum Classes</button><button id="all-classes-table-tab5" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab5', 2)" class="table-tab">Exception Classes</button><button id="all-classes-table-tab6" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab6', 2)" class="table-tab">Annotation Interfaces</button></div>
 <div id="all-classes-table.tabpanel" role="tabpanel">
 <div class="summary-table two-column-summary" aria-labelledby="all-classes-table-tab0">
 <div class="table-header col-first">Class</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab7"><a href="jakarta.nosql.core/jakarta/nosql/Column.html" title="annotation interface in jakarta.nosql">Column</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab7">
-<div class="block">Specify the mapped column for a persistent property or field.</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/AttributeConverter.html" title="interface in jakarta.nosql">AttributeConverter&lt;X,<wbr>Y&gt;</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
+<div class="block">A class that implements this interface can be used to convert entity attribute state into a database column
+ representation and vice versa.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html" title="interface in jakarta.nosql.column">ColumnTemplate</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block"><a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Column-Family or Wide-Column databases.</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab6"><a href="jakarta.nosql.core/jakarta/nosql/Column.html" title="annotation interface in jakarta.nosql">Column</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab6">
+<div class="block">Specifies the column mapped by the annotated persistent property or field.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html" title="interface in jakarta.nosql.document">DocumentTemplate</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
-<div class="block"><a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Document-oriented databases.</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab6"><a href="jakarta.nosql.core/jakarta/nosql/Convert.html" title="annotation interface in jakarta.nosql">Convert</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab6">
+<div class="block">Specifies how the values of a field or property are converted to a basic type or a type that can be persisted by a persistence provider.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab7"><a href="jakarta.nosql.core/jakarta/nosql/Entity.html" title="annotation interface in jakarta.nosql">Entity</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab7">
-<div class="block">Specifies that the class is an entity.</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab6"><a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorColumn.html" title="annotation interface in jakarta.nosql">DiscriminatorColumn</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab6">
+<div class="block">Specifies the discriminator column for the mapping strategy.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab7"><a href="jakarta.nosql.core/jakarta/nosql/Id.html" title="annotation interface in jakarta.nosql">Id</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab7">
-<div class="block">Specifies the mapped field of an entity is the entity’s ID, or the Key in Key-Value databases.</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab6"><a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorValue.html" title="annotation interface in jakarta.nosql">DiscriminatorValue</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab6">
+<div class="block">Specifies the value of the discriminator column for the annotated entity type.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block"><a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Key-Value databases.</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab6"><a href="jakarta.nosql.core/jakarta/nosql/Embeddable.html" title="annotation interface in jakarta.nosql">Embeddable</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab6">
+<div class="block">Declares a type whose instances are stored as an intrinsic part of an owning entity, sharing the identity of the entity.</div>
+</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab3"><a href="jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab3">
+<div class="block">Defines the strategy for how fields of the embeddable class are stored.</div>
+</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab6"><a href="jakarta.nosql.core/jakarta/nosql/Entity.html" title="annotation interface in jakarta.nosql">Entity</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab6">
+<div class="block">Annotates a class as an entity, representing a persistent class corresponding to a database structure.</div>
+</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab6"><a href="jakarta.nosql.core/jakarta/nosql/Id.html" title="annotation interface in jakarta.nosql">Id</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab6">
+<div class="block">Identifies the primary key of an entity.</div>
+</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab6"><a href="jakarta.nosql.core/jakarta/nosql/Inheritance.html" title="annotation interface in jakarta.nosql">Inheritance</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab6">
+<div class="block">Specifies the inheritance mapping strategy for the entity class hierarchy, which descends from the annotated entity class.</div>
+</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab6"><a href="jakarta.nosql.core/jakarta/nosql/MappedSuperclass.html" title="annotation interface in jakarta.nosql">MappedSuperclass</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab6">
+<div class="block">Defines a class whose mapping information is applied to entities that inherit from it.</div>
+</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab5"><a href="jakarta.nosql.core/jakarta/nosql/MappingException.html" title="class in jakarta.nosql">MappingException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab5">
+<div class="block">An exception that occurs when there is a mapping error during entity mapping or persistence.</div>
 </div>
 <div class="col-first even-row-color all-classes-table all-classes-table-tab5"><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab5">
-<div class="block">The root exception to Mapping layer</div>
+<div class="block">Thrown by the persistence provider when a problem occurs.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents a precompiled Query statement.</div>
+<div class="block">This interface defines the Fluent API for selecting and deleting NoSQL entities.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteFrom</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab1">
-<div class="block">This interface holds the interfaces that compose the Fluent API for selecting and deleting NoSQL entities.</div>
+<div class="block">Represents the first step in the delete query fluent API.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteFrom</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents the first step in the delete query fluent API</div>
+<div class="block">Represents a delete condition based on a column name.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNotCondition</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents a delete condition based on a column name</div>
+<div class="block">Represents a NOT delete condition in the delete query fluent API.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNotCondition</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteQueryBuild</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents a NOT delete condition in the delete query fluent API</div>
+<div class="block">Represents the last step of the delete query fluent API execution.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteQueryBuild</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents the last step of the delete query fluent API execution</div>
+<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction,
+ add one more delete condition, or end up performing the built query.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction adding one more delete condition or end up performing the built query</div>
+<div class="block">Represents the first step in the query fluent API.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperLimit.html" title="interface in jakarta.nosql">QueryMapper.MapperLimit</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents the first step in the query fluent API</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperLimit.html" title="interface in jakarta.nosql">QueryMapper.MapperLimit</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution</div>
+<div class="block">Represents a condition based on a column name.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents a condition based on a column name</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNotCondition</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents the step in the query fluent API where it's possible to:
- 
-     define the order of the results
-     or define the position of the first result
-     or define the maximum number of results to retrieve
-     or to perform the query execution
- </div>
+<div class="block">Represents a NOT condition in the delete query fluent API.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNotCondition</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents a NOT condition in the delete query fluent API</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution</div>
+<div class="block">Represents the last step of the query fluent API execution.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperSkip.html" title="interface in jakarta.nosql">QueryMapper.MapperSkip</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents the last step of the query fluent API execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperSkip.html" title="interface in jakarta.nosql">QueryMapper.MapperSkip</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution</div>
-</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Represents a step where it's possible to:
  
-     Create a new condition performing logical conjunction (AND) by giving a column name
-     Or create a new condition performing logical disjunction (OR) by giving a column name
-     Or define the position of the first result
-     Or define the maximum number of results to retrieve
-     Or define the order of the results
-     Or to perform the query execution
+     Create a new condition performing logical conjunction (AND) by specifying a column name
+     Create a new condition performing logical disjunction (OR) by specifying a column name
+     Define the position of the first result
+     Define the maximum number of results to retrieve
+     Define the order of the results
+     Perform the query execution
  </div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Templates are a helper class that increases productivity when performing common NoSQL operations.</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
+<div class="block"><code>Template</code> is a helper class that increases productivity when performing common NoSQL operations.</div>
 </div>
 </div>
 </div>
diff --git a/javadoc/allpackages-index.html b/javadoc/allpackages-index.html
index 747556d..c921ebe 100644
--- a/javadoc/allpackages-index.html
+++ b/javadoc/allpackages-index.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>All Packages (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>All Packages (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="package index">
 <meta name="generator" content="javadoc/AllPackagesIndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,23 +23,23 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="index.html">Overview</a></li>
-<li>Module</li>
-<li>Package</li>
+<li><a href="jakarta.nosql.core/module-summary.html">Module</a></li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">Package</a></li>
 <li>Class</li>
 <li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-tree.html">Tree</a></li>
 <li><a href="index-all.html">Index</a></li>
 <li><a href="help-doc.html#all-packages">Help</a></li>
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -57,19 +56,7 @@ <h1 title="All&amp;nbsp;Packages" class="title">All&nbsp;Packages</h1>
 <div class="table-header col-last">Description</div>
 <div class="col-first even-row-color"><a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></div>
 <div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-<div class="col-first odd-row-color"><a href="jakarta.nosql.column/jakarta/nosql/column/package-summary.html">jakarta.nosql.column</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Defines the API to Column Family in mapping level.</div>
-</div>
-<div class="col-first even-row-color"><a href="jakarta.nosql.document/jakarta/nosql/document/package-summary.html">jakarta.nosql.document</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the API to Document Collection in mapping level.</div>
-</div>
-<div class="col-first odd-row-color"><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html">jakarta.nosql.keyvalue</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Defines the API to Key-value in mapping level.</div>
+<div class="block">Provides classes and interfaces for integrating Java applications with various NoSQL databases.</div>
 </div>
 </div>
 </main>
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
new file mode 100644
index 0000000..861bbc2
--- /dev/null
+++ b/javadoc/constant-values.html
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Constant Field Values (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="summary of constants">
+<meta name="generator" content="javadoc/ConstantsSummaryWriterImpl">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+<script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="constants-summary-page">
+<script type="text/javascript">var pathtoroot = "./";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="jakarta.nosql.core/module-summary.html">Module</a></li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-tree.html">Tree</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html#constant-values">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
+</div>
+<section class="packages">
+<h2 title="Contents">Contents</h2>
+<ul class="contents-list">
+<li><a href="#jakarta.nosql">jakarta.nosql.*</a></li>
+</ul>
+</section>
+<section class="constants-summary" id="jakarta.nosql">
+<h2 title="jakarta.nosql.*">jakarta.nosql.*</h2>
+<ul class="block-list">
+<li>
+<div class="caption"><span>jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorColumn.html" title="annotation interface in jakarta.nosql">DiscriminatorColumn</a></span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Constant Field</div>
+<div class="table-header col-last">Value</div>
+<div class="col-first even-row-color"><code id="jakarta.nosql.DiscriminatorColumn.DEFAULT_DISCRIMINATOR_COLUMN">public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color"><code><a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorColumn.html#DEFAULT_DISCRIMINATOR_COLUMN">DEFAULT_DISCRIMINATOR_COLUMN</a></code></div>
+<div class="col-last even-row-color"><code>"dtype"</code></div>
+</div>
+</li>
+</ul>
+</section>
+</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/copy.svg b/javadoc/copy.svg
new file mode 100644
index 0000000..7c46ab1
--- /dev/null
+++ b/javadoc/copy.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.  Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
+ by Oracle in the LICENSE file that accompanied this code.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 380 460" fill="#505050">
+  <path
+     d="M 346,8 H 108 C 90,8 75,23 75,41 v 316 c 0,18 15,33 33,33 h 238 c 18,0 33,-15 33,-33 V 41 C 379,23 364,8 346,8 Z m -8,344 H 116 c -2,0 -3,-1 -3,-3 V 49 c 0,-2 1,-3 3,-3 h 222 c 2,0 3,1 3,3 v 300 h 10e-4 c 0,2 -1,3 -3,3 z"/>
+  <path
+     d="m 290,389 v 26 h 10e-4 c 0,2 -1,3 -3,3 H 49 c -2,0 -3,-1 -3,-3 V 99 c 0,-2 1,-3 3,-3 h 27 v 0 l -5e-4,-38 H 41 C 23,58 8,73 8,91 v 332 c 10e-4,18 15,33 33,33 h 254 c 18,0 33,-15 33,-33 v -34"/>
+</svg>
diff --git a/javadoc/element-list b/javadoc/element-list
index 5b5204b..364f51d 100644
--- a/javadoc/element-list
+++ b/javadoc/element-list
@@ -1,8 +1,2 @@
-module:jakarta.nosql.column
-jakarta.nosql.column
 module:jakarta.nosql.core
 jakarta.nosql
-module:jakarta.nosql.document
-jakarta.nosql.document
-module:jakarta.nosql.keyvalue
-jakarta.nosql.keyvalue
diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html
index ecf505c..50e22d6 100644
--- a/javadoc/help-doc.html
+++ b/javadoc/help-doc.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>API Help (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>API Help (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="help">
 <meta name="generator" content="javadoc/HelpWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,30 +23,38 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="index.html">Overview</a></li>
-<li>Module</li>
-<li>Package</li>
+<li><a href="jakarta.nosql.core/module-summary.html">Module</a></li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">Package</a></li>
 <li>Class</li>
 <li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-tree.html">Tree</a></li>
 <li><a href="index-all.html">Index</a></li>
 <li class="nav-bar-cell1-rev">Help</li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Help:</p>
+<ul>
+<li><a href="#help-navigation">Navigation</a></li>
+<li><a href="#help-pages">Pages</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Help:&nbsp;</li>
 <li><a href="#help-navigation">Navigation</a>&nbsp;|&nbsp;</li>
 <li><a href="#help-pages">Pages</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -59,18 +66,18 @@ <h1 class="title">JavaDoc Help</h1>
 <ul class="help-toc">
 <li><a href="#help-navigation">Navigation</a>: 
 <ul class="help-subtoc">
-<li><a href="#help-search">Search</a></li>
+<li><a href="#search">Search</a></li>
 </ul>
 </li>
 <li><a href="#help-pages">Kinds of Pages</a>: 
 <ul class="help-subtoc">
-<li><a href="#overview">Overview</a></li>
 <li><a href="#module">Module</a></li>
 <li><a href="#package">Package</a></li>
 <li><a href="#class">Class or Interface</a></li>
 <li><a href="#doc-file">Other Files</a></li>
 <li><a href="#use">Use</a></li>
 <li><a href="#tree">Tree (Class Hierarchy)</a></li>
+<li><a href="#constant-values">Constant Field Values</a></li>
 <li><a href="#serialized-form">Serialized Form</a></li>
 <li><a href="#all-packages">All Packages</a></li>
 <li><a href="#all-classes">All Classes and Interfaces</a></li>
@@ -82,25 +89,21 @@ <h1 class="title">JavaDoc Help</h1>
 <div class="sub-title">
 <h2 id="help-navigation">Navigation</h2>
 Starting from the <a href="index.html">Overview</a> page, you can browse the documentation using the links in each page, and in the navigation bar at the top of each page. The <a href="index-all.html">Index</a> and Search box allow you to navigate to specific declarations and summary pages, including: <a href="allpackages-index.html">All Packages</a>, <a href="allclasses-index.html">All Classes and Interfaces</a>
-<section class="help-section" id="help-search">
+<section class="help-section" id="search">
 <h3>Search</h3>
-<p>You can search for definitions of modules, packages, types, fields, methods, system properties and other terms defined in the API, using some or all of the name, optionally using "camelCase" abbreviations. For example:</p>
+<p>You can search for definitions of modules, packages, types, fields, methods, system properties and other terms defined in the API. These items can be searched using part or all of the name, optionally using "camelCase" abbreviations, or multiple search terms separated by whitespace. Some examples:</p>
 <ul class="help-section-list">
-<li><code>j.l.obj</code> will match "java.lang.Object"</li>
-<li><code>InpStr</code> will match "java.io.InputStream"</li>
-<li><code>HM.cK</code> will match "java.util.HashMap.containsKey(Object)"</li>
+<li><code>"j.l.obj"</code> matches "java.lang.Object"</li>
+<li><code>"InpStr"</code> matches "java.io.InputStream"</li>
+<li><code>"math exact long"</code> matches "java.lang.Math.absExact(long)"</li>
 </ul>
-<p>Refer to the <a href="https://docs.oracle.com/en/java/javase/17/docs/specs/javadoc/javadoc-search-spec.html">Javadoc Search Specification</a> for a full description of search features.</p>
+<p>Refer to the <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/javadoc/javadoc-search-spec.html">Javadoc Search Specification</a> for a full description of search features.</p>
 </section>
 </div>
 <hr>
 <div class="sub-title">
 <h2 id="help-pages">Kinds of Pages</h2>
 The following sections describe the different kinds of pages in this collection.
-<section class="help-section" id="overview">
-<h3>Overview</h3>
-<p>The <a href="index.html">Overview</a> page is the front page of this API document and provides a list of all modules with a summary for each.  This page can also contain an overall description of the set of modules.</p>
-</section>
 <section class="help-section" id="module">
 <h3>Module</h3>
 <p>Each module has a page that contains a list of its packages, dependencies on other modules, and services, with a summary for each. These pages may contain the following categories:</p>
@@ -117,8 +120,7 @@ <h3>Package</h3>
 <li>Interfaces</li>
 <li>Classes</li>
 <li>Enum Classes</li>
-<li>Exceptions</li>
-<li>Errors</li>
+<li>Exception Classes</li>
 <li>Annotation Interfaces</li>
 </ul>
 </section>
@@ -172,6 +174,10 @@ <h3>Tree (Class Hierarchy)</h3>
 <li>When viewing a particular package, class or interface page, clicking on TREE displays the hierarchy for only that package.</li>
 </ul>
 </section>
+<section class="help-section" id="constant-values">
+<h3>Constant Field Values</h3>
+<p>The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.</p>
+</section>
 <section class="help-section" id="serialized-form">
 <h3>Serialized Form</h3>
 <p>Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to those who implement rather than use the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See Also" section of the class description.</p>
diff --git a/javadoc/index-all.html b/javadoc/index-all.html
index 95d07ad..08f2802 100644
--- a/javadoc/index-all.html
+++ b/javadoc/index-all.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Index (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Index (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="index">
 <meta name="generator" content="javadoc/IndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,23 +23,23 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="index.html">Overview</a></li>
-<li>Module</li>
-<li>Package</li>
+<li><a href="jakarta.nosql.core/module-summary.html">Module</a></li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">Package</a></li>
 <li>Class</li>
 <li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-tree.html">Tree</a></li>
 <li class="nav-bar-cell1-rev">Index</li>
 <li><a href="help-doc.html#index">Help</a></li>
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,234 +50,200 @@
 <div class="header">
 <h1>Index</h1>
 </div>
-<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:K">K</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:Q">Q</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;<br><a href="allclasses-index.html">All&nbsp;Classes&nbsp;and&nbsp;Interfaces</a><span class="vertical-separator">|</span><a href="allpackages-index.html">All&nbsp;Packages</a><span class="vertical-separator">|</span><a href="serialized-form.html">Serialized&nbsp;Form</a>
+<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:Q">Q</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;<br><a href="allclasses-index.html">All&nbsp;Classes&nbsp;and&nbsp;Interfaces</a><span class="vertical-separator">|</span><a href="allpackages-index.html">All&nbsp;Packages</a><span class="vertical-separator">|</span><a href="constant-values.html">Constant&nbsp;Field&nbsp;Values</a><span class="vertical-separator">|</span><a href="serialized-form.html">Serialized&nbsp;Form</a>
 <h2 class="title" id="I:A">A</h2>
 <dl class="index">
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteWhere.html#and(java.lang.String)" class="member-name-link">and(String)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></dt>
 <dd>
-<div class="block">Create a new delete condition performing logical conjunction (AND) by giving a column name</div>
+<div class="block">Create a new delete condition performing logical conjunction (AND) by specifying a column name.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html#and(java.lang.String)" class="member-name-link">and(String)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></dt>
 <dd>
-<div class="block">Create a new condition performing logical conjunction (AND) by giving a column name</div>
+<div class="block">Create a new condition performing logical conjunction (AND) by specifying a column name.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html#asc()" class="member-name-link">asc()</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></dt>
 <dd>
-<div class="block">Defines the order ascending</div>
+<div class="block">Defines the order as ascending.</div>
+</dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/AttributeConverter.html" class="type-name-link" title="interface in jakarta.nosql">AttributeConverter&lt;X,<wbr>Y&gt;</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
+<dd>
+<div class="block">A class that implements this interface can be used to convert entity attribute state into a database column
+ representation and vice versa.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:B">B</h2>
 <dl class="index">
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html#between(T,T)" class="member-name-link">between(T, T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></dt>
 <dd>
-<div class="block">Creates a delete condition where the column name provided is between the provided values</div>
+<div class="block">Creates a delete condition where the specified column name is between the provided values.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html#between(T,T)" class="member-name-link">between(T, T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></dt>
 <dd>
-<div class="block">Creates a condition where the column name provided is between the provided values</div>
-</dd>
-<dt><a href="jakarta.nosql.core/jakarta/nosql/PreparedStatement.html#bind(java.lang.String,java.lang.Object)" class="member-name-link">bind(String, Object)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></dt>
-<dd>
-<div class="block">Binds an argument to a named parameter.</div>
+<div class="block">Creates a condition where the specified column name is between the provided values.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:C">C</h2>
 <dl class="index">
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Column.html" class="type-name-link" title="annotation interface in jakarta.nosql">Column</a> - Annotation Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Specify the mapped column for a persistent property or field.</div>
+<div class="block">Specifies the column mapped by the annotated persistent property or field.</div>
 </dd>
-<dt><a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html" class="type-name-link" title="interface in jakarta.nosql.column">ColumnTemplate</a> - Interface in <a href="jakarta.nosql.column/jakarta/nosql/column/package-summary.html">jakarta.nosql.column</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/Convert.html" class="type-name-link" title="annotation interface in jakarta.nosql">Convert</a> - Annotation Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block"><a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Column-Family or Wide-Column databases.</div>
+<div class="block">Specifies how the values of a field or property are converted to a basic type or a type that can be persisted by a persistence provider.</div>
 </dd>
-<dt><a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html#count(java.lang.Class)" class="member-name-link">count(Class&lt;T&gt;)</a> - Method in interface jakarta.nosql.column.<a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html" title="interface in jakarta.nosql.column">ColumnTemplate</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/AttributeConverter.html#convertToDatabaseColumn(X)" class="member-name-link">convertToDatabaseColumn(X)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/AttributeConverter.html" title="interface in jakarta.nosql">AttributeConverter</a></dt>
 <dd>
-<div class="block">Returns the number of elements from column family</div>
+<div class="block">Converts the value stored in the entity attribute into the data representation to be stored in the database.</div>
 </dd>
-<dt><a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html#count(java.lang.Class)" class="member-name-link">count(Class&lt;T&gt;)</a> - Method in interface jakarta.nosql.document.<a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html" title="interface in jakarta.nosql.document">DocumentTemplate</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/AttributeConverter.html#convertToEntityAttribute(Y)" class="member-name-link">convertToEntityAttribute(Y)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/AttributeConverter.html" title="interface in jakarta.nosql">AttributeConverter</a></dt>
 <dd>
-<div class="block">Returns the number of elements from document collection</div>
-</dd>
-<dt><a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html#count(java.lang.String)" class="member-name-link">count(String)</a> - Method in interface jakarta.nosql.column.<a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html" title="interface in jakarta.nosql.column">ColumnTemplate</a></dt>
-<dd>
-<div class="block">Returns the number of elements from column family</div>
-</dd>
-<dt><a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html#count(java.lang.String)" class="member-name-link">count(String)</a> - Method in interface jakarta.nosql.document.<a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html" title="interface in jakarta.nosql.document">DocumentTemplate</a></dt>
-<dd>
-<div class="block">Returns the number of elements from document collection</div>
+<div class="block">Converts the data stored in the database column into the value to be stored in the entity attribute.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:D">D</h2>
 <dl class="index">
+<dt><a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorColumn.html#DEFAULT_DISCRIMINATOR_COLUMN" class="member-name-link">DEFAULT_DISCRIMINATOR_COLUMN</a> - Static variable in annotation interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorColumn.html" title="annotation interface in jakarta.nosql">DiscriminatorColumn</a></dt>
+<dd>
+<div class="block">The default name of the discriminator column, which is <code>"dtype"</code>.</div>
+</dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Template.html#delete(java.lang.Class)" class="member-name-link">delete(Class&lt;T&gt;)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></dt>
 <dd>
-<div class="block">It starts a query builder using the fluent-API journey.</div>
+<div class="block">Start a query builder using the fluent API.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Template.html#delete(java.lang.Class,K)" class="member-name-link">delete(Class&lt;T&gt;, K)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></dt>
 <dd>
 <div class="block">Deletes by ID or key.</div>
 </dd>
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#delete(java.lang.Iterable)" class="member-name-link">delete(Iterable&lt;K&gt;)</a> - Method in interface jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></dt>
-<dd>
-<div class="block">Removes entities from keys</div>
-</dd>
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#delete(K)" class="member-name-link">delete(K)</a> - Method in interface jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html#desc()" class="member-name-link">desc()</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></dt>
 <dd>
-<div class="block">Removes an entity from key</div>
+<div class="block">Defines the order as descending.</div>
 </dd>
-<dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html#desc()" class="member-name-link">desc()</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorColumn.html" class="type-name-link" title="annotation interface in jakarta.nosql">DiscriminatorColumn</a> - Annotation Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Defines the order as descending</div>
+<div class="block">Specifies the discriminator column for the mapping strategy.</div>
 </dd>
-<dt><a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html" class="type-name-link" title="interface in jakarta.nosql.document">DocumentTemplate</a> - Interface in <a href="jakarta.nosql.document/jakarta/nosql/document/package-summary.html">jakarta.nosql.document</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorValue.html" class="type-name-link" title="annotation interface in jakarta.nosql">DiscriminatorValue</a> - Annotation Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block"><a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Document-oriented databases.</div>
+<div class="block">Specifies the value of the discriminator column for the annotated entity type.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:E">E</h2>
 <dl class="index">
+<dt><a href="jakarta.nosql.core/jakarta/nosql/Embeddable.html" class="type-name-link" title="annotation interface in jakarta.nosql">Embeddable</a> - Annotation Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
+<dd>
+<div class="block">Declares a type whose instances are stored as an intrinsic part of an owning entity, sharing the identity of the entity.</div>
+</dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html" class="type-name-link" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a> - Enum Class in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
+<dd>
+<div class="block">Defines the strategy for how fields of the embeddable class are stored.</div>
+</dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Entity.html" class="type-name-link" title="annotation interface in jakarta.nosql">Entity</a> - Annotation Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Specifies that the class is an entity.</div>
+<div class="block">Annotates a class as an entity, representing a persistent class corresponding to a database structure.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html#eq(T)" class="member-name-link">eq(T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></dt>
 <dd>
-<div class="block">Creates a delete condition where the column name provided is equal to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name equals the provided value.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html#eq(T)" class="member-name-link">eq(T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></dt>
 <dd>
-<div class="block">Creates a condition where the column name provided is equal to the provided value</div>
+<div class="block">Creates a condition where the specified column name equals the provided value.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteQueryBuild.html#execute()" class="member-name-link">execute()</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteQueryBuild</a></dt>
 <dd>
-<div class="block">Executes the query</div>
+<div class="block">Executes the query.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:F">F</h2>
 <dl class="index">
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Template.html#find(java.lang.Class,K)" class="member-name-link">find(Class&lt;T&gt;, K)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></dt>
 <dd>
-<div class="block">Finds by ID or key.</div>
+<div class="block">Retrieves an entity by its Id.</div>
+</dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html#FLAT" class="member-name-link">FLAT</a> - Enum constant in enum class jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></dt>
+<dd>
+<div class="block">Fields of the embeddable class are embedded directly into the data structure of the parent entity or embeddable.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:G">G</h2>
 <dl class="index">
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#get(java.lang.Iterable,java.lang.Class)" class="member-name-link">get(Iterable&lt;K&gt;, Class&lt;T&gt;)</a> - Method in interface jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html#GROUPING" class="member-name-link">GROUPING</a> - Enum constant in enum class jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></dt>
 <dd>
-<div class="block">Finds a list of values from keys</div>
-</dd>
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#get(K,java.lang.Class)" class="member-name-link">get(K, Class&lt;T&gt;)</a> - Method in interface jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></dt>
-<dd>
-<div class="block">Finds the Value from a key</div>
-</dd>
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#getSingleResult(java.lang.String,java.lang.Class)" class="member-name-link">getSingleResult(String, Class&lt;T&gt;)</a> - Method in interface jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></dt>
-<dd>
-<div class="block">Executes a query database then returns as single result</div>
+<div class="block">Fields of the embeddable class are stored in a structured type, such as a user-defined type (UDT).</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html#gt(T)" class="member-name-link">gt(T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></dt>
 <dd>
-<div class="block">Creates a delete condition where the column name provided is greater than to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is greater than the provided value.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html#gt(T)" class="member-name-link">gt(T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></dt>
 <dd>
-<div class="block">Creates a condition where the column name provided is greater than to the provided value</div>
+<div class="block">Creates a condition where the specified column name is greater than the provided value.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html#gte(T)" class="member-name-link">gte(T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></dt>
 <dd>
-<div class="block">Creates a delete condition where the column name provided is greater than or equal to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is greater than or equal to the provided value.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html#gte(T)" class="member-name-link">gte(T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></dt>
 <dd>
-<div class="block">Creates a condition where the column name provided is greater than or equal to the provided value</div>
+<div class="block">Creates a condition where the specified column name is greater than or equal to the provided value.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:I">I</h2>
 <dl class="index">
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Id.html" class="type-name-link" title="annotation interface in jakarta.nosql">Id</a> - Annotation Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Specifies the mapped field of an entity is the entity’s ID, or the Key in Key-Value databases.</div>
+<div class="block">Identifies the primary key of an entity.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html#in(java.lang.Iterable)" class="member-name-link">in(Iterable&lt;T&gt;)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></dt>
 <dd>
-<div class="block">Creates a delete condition where the column name provided is in the provided iterable values</div>
+<div class="block">Creates a delete condition where the specified column name is in the provided iterable values.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html#in(java.lang.Iterable)" class="member-name-link">in(Iterable&lt;T&gt;)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></dt>
 <dd>
-<div class="block">Creates a condition where the column name provided is in the provided iterable values</div>
+<div class="block">Creates a condition where the specified column name is in the provided iterable values.</div>
+</dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/Inheritance.html" class="type-name-link" title="annotation interface in jakarta.nosql">Inheritance</a> - Annotation Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
+<dd>
+<div class="block">Specifies the inheritance mapping strategy for the entity class hierarchy, which descends from the annotated entity class.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Template.html#insert(java.lang.Iterable)" class="member-name-link">insert(Iterable&lt;T&gt;)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></dt>
 <dd>
-<div class="block">Inserts entity, by default it's just run for each saving using
- <a href="jakarta.nosql.core/jakarta/nosql/Template.html#insert(T)"><code>Template.insert(Object)</code></a>},
- each NoSQL vendor might replace to a more appropriate one.</div>
+<div class="block">Inserts multiple entities into the database.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Template.html#insert(java.lang.Iterable,java.time.Duration)" class="member-name-link">insert(Iterable&lt;T&gt;, Duration)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></dt>
 <dd>
-<div class="block">Inserts entities collection entity with time to live, by default it's just run for each saving using
- <a href="jakarta.nosql.core/jakarta/nosql/Template.html#insert(T,java.time.Duration)"><code>Template.insert(Object, Duration)</code></a>,
- each NoSQL vendor might replace to a more appropriate one.</div>
+<div class="block">Inserts multiple entities into the database with the expiration date.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Template.html#insert(T)" class="member-name-link">insert(T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></dt>
 <dd>
-<div class="block">Inserts an entity</div>
+<div class="block">Inserts an entity into the database.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Template.html#insert(T,java.time.Duration)" class="member-name-link">insert(T, Duration)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></dt>
 <dd>
-<div class="block">Inserts entity with time to live, TTL.</div>
+<div class="block">Inserts an entity into the database with an expiration to the entity.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:J">J</h2>
 <dl class="index">
 <dt><a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a> - package jakarta.nosql</dt>
 <dd>
-<div class="block">Defines the core API in mapping level.</div>
-</dd>
-<dt><a href="jakarta.nosql.column/module-summary.html">jakarta.nosql.column</a> - module jakarta.nosql.column</dt>
-<dd>
-<div class="block">The Jakarta NoSQL column module.</div>
-</dd>
-<dt><a href="jakarta.nosql.column/jakarta/nosql/column/package-summary.html">jakarta.nosql.column</a> - package jakarta.nosql.column</dt>
-<dd>
-<div class="block">Defines the API to Column Family in mapping level.</div>
+<div class="block">Provides classes and interfaces for integrating Java applications with various NoSQL databases.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/module-summary.html">jakarta.nosql.core</a> - module jakarta.nosql.core</dt>
 <dd>
 <div class="block">The Jakarta NoSQL Core module.</div>
 </dd>
-<dt><a href="jakarta.nosql.document/module-summary.html">jakarta.nosql.document</a> - module jakarta.nosql.document</dt>
-<dd>
-<div class="block">The Jakarta NoSQL document module.</div>
-</dd>
-<dt><a href="jakarta.nosql.document/jakarta/nosql/document/package-summary.html">jakarta.nosql.document</a> - package jakarta.nosql.document</dt>
-<dd>
-<div class="block">Defines the API to Document Collection in mapping level.</div>
-</dd>
-<dt><a href="jakarta.nosql.keyvalue/module-summary.html">jakarta.nosql.keyvalue</a> - module jakarta.nosql.keyvalue</dt>
-<dd>
-<div class="block">The Jakarta NoSQL key-value module.</div>
-</dd>
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html">jakarta.nosql.keyvalue</a> - package jakarta.nosql.keyvalue</dt>
-<dd>
-<div class="block">Defines the API to Key-value in mapping level.</div>
-</dd>
-</dl>
-<h2 class="title" id="I:K">K</h2>
-<dl class="index">
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" class="type-name-link" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a> - Interface in <a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html">jakarta.nosql.keyvalue</a></dt>
-<dd>
-<div class="block"><a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Key-Value databases.</div>
-</dd>
 </dl>
 <h2 class="title" id="I:L">L</h2>
 <dl class="index">
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html#like(java.lang.String)" class="member-name-link">like(String)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></dt>
 <dd>
-<div class="block">Creates a delete condition where the column name provided is like to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is like the provided value.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html#like(java.lang.String)" class="member-name-link">like(String)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></dt>
 <dd>
-<div class="block">Creates a condition where the column name provided is like to the provided value</div>
+<div class="block">Creates a condition where the specified column name is like the provided value.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html#limit(long)" class="member-name-link">limit(long)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></dt>
 <dd>
@@ -298,46 +263,69 @@ <h2 class="title" id="I:L">L</h2>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html#lt(T)" class="member-name-link">lt(T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></dt>
 <dd>
-<div class="block">Creates a delete condition where the column name provided is less than the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is less than the provided value.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html#lt(T)" class="member-name-link">lt(T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></dt>
 <dd>
-<div class="block">Creates a condition where the column name provided is less than the provided value</div>
+<div class="block">Creates a condition where the specified column name is less than the provided value.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html#lte(T)" class="member-name-link">lte(T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></dt>
 <dd>
-<div class="block">Creates a delete condition where the column name provided is less than or equal to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is less than or equal to the provided value.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html#lte(T)" class="member-name-link">lte(T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></dt>
 <dd>
-<div class="block">Creates a condition where the column name provided is less than or equal to the provided value</div>
+<div class="block">Creates a condition where the specified column name is less than or equal to the provided value.</div>
+</dd>
+</dl>
+<h2 class="title" id="I:M">M</h2>
+<dl class="index">
+<dt><a href="jakarta.nosql.core/jakarta/nosql/MappedSuperclass.html" class="type-name-link" title="annotation interface in jakarta.nosql">MappedSuperclass</a> - Annotation Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
+<dd>
+<div class="block">Defines a class whose mapping information is applied to entities that inherit from it.</div>
+</dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/MappingException.html" class="type-name-link" title="class in jakarta.nosql">MappingException</a> - Exception Class in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
+<dd>
+<div class="block">An exception that occurs when there is a mapping error during entity mapping or persistence.</div>
+</dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/MappingException.html#%3Cinit%3E(java.lang.String)" class="member-name-link">MappingException(String)</a> - Constructor for exception class jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/MappingException.html" title="class in jakarta.nosql">MappingException</a></dt>
+<dd>
+<div class="block">Constructs a <code>MappingException</code> using the given message.</div>
+</dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/MappingException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable)" class="member-name-link">MappingException(String, Throwable)</a> - Constructor for exception class jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/MappingException.html" title="class in jakarta.nosql">MappingException</a></dt>
+<dd>
+<div class="block">Constructs a <code>MappingException</code> using the given message and cause.</div>
+</dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/MappingException.html#%3Cinit%3E(java.lang.Throwable)" class="member-name-link">MappingException(Throwable)</a> - Constructor for exception class jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/MappingException.html" title="class in jakarta.nosql">MappingException</a></dt>
+<dd>
+<div class="block">Constructs a <code>MappingException</code> using the given cause.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:N">N</h2>
 <dl class="index">
-<dt><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" class="type-name-link" title="class in jakarta.nosql">NoSQLException</a> - Exception in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" class="type-name-link" title="class in jakarta.nosql">NoSQLException</a> - Exception Class in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">The root exception to Mapping layer</div>
+<div class="block">Thrown by the persistence provider when a problem occurs.</div>
 </dd>
-<dt><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html#%3Cinit%3E()" class="member-name-link">NoSQLException()</a> - Constructor for exception jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html#%3Cinit%3E()" class="member-name-link">NoSQLException()</a> - Constructor for exception class jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></dt>
 <dd>
 <div class="block">Constructs a new runtime exception with null as its detail message.</div>
 </dd>
-<dt><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html#%3Cinit%3E(java.lang.String)" class="member-name-link">NoSQLException(String)</a> - Constructor for exception jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html#%3Cinit%3E(java.lang.String)" class="member-name-link">NoSQLException(String)</a> - Constructor for exception class jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></dt>
 <dd>
 <div class="block">Constructs a new runtime exception with the specified detail message.</div>
 </dd>
-<dt><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable)" class="member-name-link">NoSQLException(String, Throwable)</a> - Constructor for exception jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable)" class="member-name-link">NoSQLException(String, Throwable)</a> - Constructor for exception class jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></dt>
 <dd>
 <div class="block">Constructs a new runtime exception with the specified detail message and cause.</div>
 </dd>
-<dt><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable,boolean,boolean)" class="member-name-link">NoSQLException(String, Throwable, boolean, boolean)</a> - Constructor for exception jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable,boolean,boolean)" class="member-name-link">NoSQLException(String, Throwable, boolean, boolean)</a> - Constructor for exception class jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></dt>
 <dd>
 <div class="block">Constructs a new runtime exception with the specified detail
  message, cause, suppression enabled or disabled, and writable stack
  trace enabled or disabled.</div>
 </dd>
-<dt><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html#%3Cinit%3E(java.lang.Throwable)" class="member-name-link">NoSQLException(Throwable)</a> - Constructor for exception jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></dt>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html#%3Cinit%3E(java.lang.Throwable)" class="member-name-link">NoSQLException(Throwable)</a> - Constructor for exception class jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></dt>
 <dd>
 <div class="block">Constructs a new runtime exception with the specified cause and a detail
  message of (cause==null ? null : cause.toString()) (which typically contains
@@ -345,197 +333,124 @@ <h2 class="title" id="I:N">N</h2>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html#not()" class="member-name-link">not()</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></dt>
 <dd>
-<div class="block">Creates a NOT delete condition for the column name provided</div>
+<div class="block">Creates a NOT delete condition for the specified column name.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html#not()" class="member-name-link">not()</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></dt>
 <dd>
-<div class="block">Creates a NOT condition for the column name provided.</div>
+<div class="block">Creates a NOT condition for the specified column name.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:O">O</h2>
 <dl class="index">
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteWhere.html#or(java.lang.String)" class="member-name-link">or(String)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></dt>
 <dd>
-<div class="block">Create a new delete condition performing logical disjunction (OR) by giving a column name</div>
+<div class="block">Create a new delete condition performing logical disjunction (OR) by specifying a column name.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html#or(java.lang.String)" class="member-name-link">or(String)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></dt>
 <dd>
-<div class="block">Create a new condition performing logical disjunction (OR) by giving a column name</div>
+<div class="block">Create a new condition performing logical disjunction (OR) by specifying a column name.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html#orderBy(java.lang.String)" class="member-name-link">orderBy(String)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></dt>
 <dd>
-<div class="block">Add the order how the result will return</div>
+<div class="block">Add the order how the result will return based on a given column name.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameOrder.html#orderBy(java.lang.String)" class="member-name-link">orderBy(String)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></dt>
 <dd>
-<div class="block">Add the order of how the result will return based on a given column name</div>
+<div class="block">Add the order of how the result will return based on a given column name.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html#orderBy(java.lang.String)" class="member-name-link">orderBy(String)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></dt>
 <dd>
-<div class="block">Add the order how the result will return</div>
-</dd>
-</dl>
-<h2 class="title" id="I:P">P</h2>
-<dl class="index">
-<dt><a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html#prepare(java.lang.String)" class="member-name-link">prepare(String)</a> - Method in interface jakarta.nosql.column.<a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html" title="interface in jakarta.nosql.column">ColumnTemplate</a></dt>
-<dd>
-<div class="block">Creates a <a href="jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a> from the query</div>
-</dd>
-<dt><a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html#prepare(java.lang.String)" class="member-name-link">prepare(String)</a> - Method in interface jakarta.nosql.document.<a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html" title="interface in jakarta.nosql.document">DocumentTemplate</a></dt>
-<dd>
-<div class="block">Creates a <a href="jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a> from the query</div>
-</dd>
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#prepare(java.lang.String,java.lang.Class)" class="member-name-link">prepare(String, Class&lt;T&gt;)</a> - Method in interface jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></dt>
-<dd>
-<div class="block">Executes a query database with <a href="jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a></div>
-</dd>
-<dt><a href="jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" class="type-name-link" title="interface in jakarta.nosql">PreparedStatement</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
-<dd>
-<div class="block">Represents a precompiled Query statement.</div>
-</dd>
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#put(java.lang.Iterable)" class="member-name-link">put(Iterable&lt;T&gt;)</a> - Method in interface jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></dt>
-<dd>
-<div class="block">Saves the <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link"><code>Iterable</code></a> of entities</div>
-</dd>
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#put(java.lang.Iterable,java.time.Duration)" class="member-name-link">put(Iterable&lt;T&gt;, Duration)</a> - Method in interface jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></dt>
-<dd>
-<div class="block">Saves the <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link"><code>Iterable</code></a> of entities with a defined time to live</div>
-</dd>
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#put(T)" class="member-name-link">put(T)</a> - Method in interface jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></dt>
-<dd>
-<div class="block">Saves the entity</div>
-</dd>
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#put(T,java.time.Duration)" class="member-name-link">put(T, Duration)</a> - Method in interface jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></dt>
-<dd>
-<div class="block">Saves the entity with time to live</div>
+<div class="block">Add the order how the result will return.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:Q">Q</h2>
 <dl class="index">
-<dt><a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html#query(java.lang.String)" class="member-name-link">query(String)</a> - Method in interface jakarta.nosql.column.<a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html" title="interface in jakarta.nosql.column">ColumnTemplate</a></dt>
-<dd>
-<div class="block">Executes a native query database then bring the result as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a></div>
-</dd>
-<dt><a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html#query(java.lang.String)" class="member-name-link">query(String)</a> - Method in interface jakarta.nosql.document.<a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html" title="interface in jakarta.nosql.document">DocumentTemplate</a></dt>
-<dd>
-<div class="block">Executes a query database, then bring the result as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a></div>
-</dd>
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#query(java.lang.String)" class="member-name-link">query(String)</a> - Method in interface jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></dt>
-<dd>
-<div class="block">Executes a query database and don't return result, e.g.: when the query is either <b>remove</b> or
- <b>put</b></div>
-</dd>
-<dt><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#query(java.lang.String,java.lang.Class)" class="member-name-link">query(String, Class&lt;T&gt;)</a> - Method in interface jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></dt>
-<dd>
-<div class="block">Executes a query database.</div>
-</dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">This interface holds the interfaces that compose the Fluent API for selecting and deleting NoSQL entities.</div>
+<div class="block">This interface defines the Fluent API for selecting and deleting NoSQL entities.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteFrom.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteFrom</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents the first step in the delete query fluent API</div>
+<div class="block">Represents the first step in the delete query fluent API.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents a delete condition based on a column name</div>
+<div class="block">Represents a delete condition based on a column name.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNotCondition.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNotCondition</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents a NOT delete condition in the delete query fluent API</div>
+<div class="block">Represents a NOT delete condition in the delete query fluent API.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteQueryBuild.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteQueryBuild</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents the last step of the delete query fluent API execution</div>
+<div class="block">Represents the last step of the delete query fluent API execution.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteWhere.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction adding one more delete condition or end up performing the built query</div>
+<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction,
+ add one more delete condition, or end up performing the built query.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents the first step in the query fluent API</div>
+<div class="block">Represents the first step in the query fluent API.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperLimit.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperLimit</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents a condition based on a column name</div>
+<div class="block">Represents a condition based on a column name.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameOrder.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents the step in the query fluent API where it's possible to:
- 
-     define the order of the results
-     or define the position of the first result
-     or define the maximum number of results to retrieve
-     or to perform the query execution
- </div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNotCondition.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperNotCondition</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents a NOT condition in the delete query fluent API</div>
+<div class="block">Represents a NOT condition in the delete query fluent API.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents the last step of the query fluent API execution</div>
+<div class="block">Represents the last step of the query fluent API execution.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperSkip.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperSkip</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
 <div class="block">Represents a step where it's possible to:
  
-     Create a new condition performing logical conjunction (AND) by giving a column name
-     Or create a new condition performing logical disjunction (OR) by giving a column name
-     Or define the position of the first result
-     Or define the maximum number of results to retrieve
-     Or define the order of the results
-     Or to perform the query execution
+     Create a new condition performing logical conjunction (AND) by specifying a column name
+     Create a new condition performing logical disjunction (OR) by specifying a column name
+     Define the position of the first result
+     Define the maximum number of results to retrieve
+     Define the order of the results
+     Perform the query execution
  </div>
 </dd>
 </dl>
 <h2 class="title" id="I:R">R</h2>
 <dl class="index">
-<dt><a href="jakarta.nosql.core/jakarta/nosql/PreparedStatement.html#result()" class="member-name-link">result()</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></dt>
-<dd>
-<div class="block">Executes a query and return the result as <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a></div>
-</dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html#result()" class="member-name-link">result()</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></dt>
 <dd>
-<div class="block">Executes the query and it returns as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link"><code>List</code></a></div>
+<div class="block">Executes the query and returns the result as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link"><code>List</code></a>.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:S">S</h2>
 <dl class="index">
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Template.html#select(java.lang.Class)" class="member-name-link">select(Class&lt;T&gt;)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></dt>
 <dd>
-<div class="block">It starts a query using the fluent-API journey.</div>
-</dd>
-<dt><a href="jakarta.nosql.core/jakarta/nosql/PreparedStatement.html#singleResult()" class="member-name-link">singleResult()</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></dt>
-<dd>
-<div class="block">Returns the result as a single element otherwise it will return an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html#empty()" title="class or interface in java.util" class="external-link"><code>Optional.empty()</code></a></div>
+<div class="block">Start a query using the fluent API.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html#singleResult()" class="member-name-link">singleResult()</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></dt>
 <dd>
-<div class="block">Executes the query and returns the result as a single element otherwise it will return an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html#empty()" title="class or interface in java.util" class="external-link"><code>Optional.empty()</code></a></div>
-</dd>
-<dt><a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html#singleResult(java.lang.String)" class="member-name-link">singleResult(String)</a> - Method in interface jakarta.nosql.column.<a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html" title="interface in jakarta.nosql.column">ColumnTemplate</a></dt>
-<dd>
-<div class="block">Executes a query then bring the result as a unique result</div>
-</dd>
-<dt><a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html#singleResult(java.lang.String)" class="member-name-link">singleResult(String)</a> - Method in interface jakarta.nosql.document.<a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html" title="interface in jakarta.nosql.document">DocumentTemplate</a></dt>
-<dd>
-<div class="block">Executes a query database, then bring the result as a unique result</div>
+<div class="block">Executes the query and returns the result as a single element, wrapped in an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link"><code>Optional</code></a>.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html#skip(long)" class="member-name-link">skip(long)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></dt>
 <dd>
@@ -555,27 +470,29 @@ <h2 class="title" id="I:S">S</h2>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html#stream()" class="member-name-link">stream()</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></dt>
 <dd>
-<div class="block">Executes the query and it returns as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a></div>
+<div class="block">Executes the query and returns the result as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a>.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:T">T</h2>
 <dl class="index">
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Template.html" class="type-name-link" title="interface in jakarta.nosql">Template</a> - Interface in <a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></dt>
 <dd>
-<div class="block">Templates are a helper class that increases productivity when performing common NoSQL operations.</div>
+<div class="block"><code>Template</code> is a helper class that increases productivity when performing common NoSQL operations.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:U">U</h2>
 <dl class="index">
+<dt><a href="jakarta.nosql.core/jakarta/nosql/Column.html#udt()" class="member-name-link">udt()</a> - Element in annotation interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Column.html" title="annotation interface in jakarta.nosql">Column</a></dt>
+<dd>
+<div class="block">(Optional) Defines the name of the user-defined type (UDT) used by the NoSQL database for this field.</div>
+</dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Template.html#update(java.lang.Iterable)" class="member-name-link">update(Iterable&lt;T&gt;)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></dt>
 <dd>
-<div class="block">Saves entity, by default it's just run for each saving using
- <a href="jakarta.nosql.core/jakarta/nosql/Template.html#update(T)"><code>Template.update(Object)</code></a>},
- each NoSQL vendor might replace to a more appropriate one.</div>
+<div class="block">Modifies entities that already exist in the database.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Template.html#update(T)" class="member-name-link">update(T)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></dt>
 <dd>
-<div class="block">Updates an entity</div>
+<div class="block">Modifies an entity that already exists in the database.</div>
 </dd>
 </dl>
 <h2 class="title" id="I:V">V</h2>
@@ -584,27 +501,52 @@ <h2 class="title" id="I:V">V</h2>
 <dd>
 <div class="block">(Optional) The name of the column.</div>
 </dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/Convert.html#value()" class="member-name-link">value()</a> - Element in annotation interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Convert.html" title="annotation interface in jakarta.nosql">Convert</a></dt>
+<dd>
+<div class="block">Specifies the converter to be applied.</div>
+</dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorColumn.html#value()" class="member-name-link">value()</a> - Element in annotation interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorColumn.html" title="annotation interface in jakarta.nosql">DiscriminatorColumn</a></dt>
+<dd>
+<div class="block">(Optional) The name of the column to be used for the discriminator.</div>
+</dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorValue.html#value()" class="member-name-link">value()</a> - Element in annotation interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorValue.html" title="annotation interface in jakarta.nosql">DiscriminatorValue</a></dt>
+<dd>
+<div class="block">(Optional) The value that indicates that the row is an entity of the annotated entity type.</div>
+</dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/Embeddable.html#value()" class="member-name-link">value()</a> - Element in annotation interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Embeddable.html" title="annotation interface in jakarta.nosql">Embeddable</a></dt>
+<dd>
+<div class="block">Specifies the embeddable type.</div>
+</dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Entity.html#value()" class="member-name-link">value()</a> - Element in annotation interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Entity.html" title="annotation interface in jakarta.nosql">Entity</a></dt>
 <dd>
-<div class="block">The name of an entity.</div>
+<div class="block">The name of the entity.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/Id.html#value()" class="member-name-link">value()</a> - Element in annotation interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Id.html" title="annotation interface in jakarta.nosql">Id</a></dt>
 <dd>
 <div class="block">The name of the entity ID.</div>
 </dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html#valueOf(java.lang.String)" class="member-name-link">valueOf(String)</a> - Static method in enum class jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this class with the specified name.</div>
+</dd>
+<dt><a href="jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html#values()" class="member-name-link">values()</a> - Static method in enum class jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></dt>
+<dd>
+<div class="block">Returns an array containing the constants of this enum class, in
+the order they are declared.</div>
+</dd>
 </dl>
 <h2 class="title" id="I:W">W</h2>
 <dl class="index">
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteFrom.html#where(java.lang.String)" class="member-name-link">where(String)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteFrom</a></dt>
 <dd>
-<div class="block">Starts a new delete condition by a column name</div>
+<div class="block">Starts a new delete condition by specifying a column name.</div>
 </dd>
 <dt><a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html#where(java.lang.String)" class="member-name-link">where(String)</a> - Method in interface jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></dt>
 <dd>
-<div class="block">Starts a new condition by given a column name</div>
+<div class="block">Starts a new condition by specifying a column name.</div>
 </dd>
 </dl>
-<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:K">K</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:Q">Q</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;<br><a href="allclasses-index.html">All&nbsp;Classes&nbsp;and&nbsp;Interfaces</a><span class="vertical-separator">|</span><a href="allpackages-index.html">All&nbsp;Packages</a><span class="vertical-separator">|</span><a href="serialized-form.html">Serialized&nbsp;Form</a></main>
+<a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:Q">Q</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;<br><a href="allclasses-index.html">All&nbsp;Classes&nbsp;and&nbsp;Interfaces</a><span class="vertical-separator">|</span><a href="allpackages-index.html">All&nbsp;Packages</a><span class="vertical-separator">|</span><a href="constant-values.html">Constant&nbsp;Field&nbsp;Values</a><span class="vertical-separator">|</span><a href="serialized-form.html">Serialized&nbsp;Form</a></main>
 <footer role="contentinfo">
 <hr>
 <p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
diff --git a/javadoc/index.html b/javadoc/index.html
index 1ec9e24..80aed72 100644
--- a/javadoc/index.html
+++ b/javadoc/index.html
@@ -1,85 +1,25 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Overview (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Jakarta NoSQL API 1.0.0-M1 API</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="module index">
-<meta name="generator" content="javadoc/ModuleIndexWriter">
+<meta name="description" content="index redirect">
+<meta name="generator" content="javadoc/IndexRedirectWriter">
+<link rel="canonical" href="jakarta.nosql.core/module-summary.html">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="script.js"></script>
-<script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="module-index-page">
-<script type="text/javascript">var pathtoroot = "./";
-loadScripts(document, 'script');</script>
+<script type="text/javascript">window.location.replace('jakarta.nosql.core/module-summary.html')</script>
 <noscript>
-<div>JavaScript is disabled on your browser.</div>
+<meta http-equiv="Refresh" content="0;jakarta.nosql.core/module-summary.html">
 </noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li class="nav-bar-cell1-rev">Overview</li>
-<li>Module</li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
-<li><a href="index-all.html">Index</a></li>
-<li><a href="help-doc.html#overview">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
+</head>
+<body class="index-redirect-page">
 <main role="main">
-<div class="header">
-<h1 class="title">api-parent 1.0.0-b7 API</h1>
-</div>
-<div id="all-modules-table">
-<div class="caption"><span>Modules</span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Module</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color all-modules-table all-modules-table-tab1"><a href="jakarta.nosql.column/module-summary.html">jakarta.nosql.column</a></div>
-<div class="col-last even-row-color all-modules-table all-modules-table-tab1">
-<div class="block">The Jakarta NoSQL column module.</div>
-</div>
-<div class="col-first odd-row-color all-modules-table all-modules-table-tab1"><a href="jakarta.nosql.core/module-summary.html">jakarta.nosql.core</a></div>
-<div class="col-last odd-row-color all-modules-table all-modules-table-tab1">
-<div class="block">The Jakarta NoSQL Core module.</div>
-</div>
-<div class="col-first even-row-color all-modules-table all-modules-table-tab1"><a href="jakarta.nosql.document/module-summary.html">jakarta.nosql.document</a></div>
-<div class="col-last even-row-color all-modules-table all-modules-table-tab1">
-<div class="block">The Jakarta NoSQL document module.</div>
-</div>
-<div class="col-first odd-row-color all-modules-table all-modules-table-tab1"><a href="jakarta.nosql.keyvalue/module-summary.html">jakarta.nosql.keyvalue</a></div>
-<div class="col-last odd-row-color all-modules-table all-modules-table-tab1">
-<div class="block">The Jakarta NoSQL key-value module.</div>
-</div>
-</div>
-</div>
+<noscript>
+<p>JavaScript is disabled on your browser.</p>
+</noscript>
+<p><a href="jakarta.nosql.core/module-summary.html">jakarta.nosql.core/module-summary.html</a></p>
 </main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
 </body>
 </html>
diff --git a/javadoc/jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html b/javadoc/jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html
deleted file mode 100644
index e9d2372..0000000
--- a/javadoc/jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html
+++ /dev/null
@@ -1,263 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>ColumnTemplate (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: module: jakarta.nosql.column, package: jakarta.nosql.column, interface: ColumnTemplate">
-<meta name="generator" content="javadoc/ClassWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
-<li><a href="../../../module-summary.html">Module</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="nav-bar-cell1-rev">Class</li>
-<li><a href="class-use/ColumnTemplate.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html#class">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method-summary">Method</a></li>
-</ul>
-<ul class="sub-nav-list">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method-detail">Method</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../../module-summary.html">jakarta.nosql.column</a></div>
-<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql.column</a></div>
-<h1 title="Interface ColumnTemplate" class="title">Interface ColumnTemplate</h1>
-</div>
-<section class="class-description" id="class-description">
-<dl class="notes">
-<dt>All Superinterfaces:</dt>
-<dd><code><a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></code></dd>
-</dl>
-<hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">ColumnTemplate</span><span class="extends-implements">
-extends <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></span></div>
-<div class="block"><a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Column-Family or Wide-Column databases.
-
- <p>
- These NoSQL databases store data in a table-like structure,
- where each column contains a particular attribute or piece of information.
- </p>
- <p>
- This interface provides some methods that accepts queries in a text format to retrieve from the database but,
- <b>the query syntax belongs to each provider, thus, it is not Jakarta's NoSQL scope to define it.
- Accordingly, it might vary from implementation and NoSQL provider.</b>
- </p></div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<!-- ========== METHOD SUMMARY =========== -->
-<li>
-<section class="method-summary" id="method-summary">
-<h2>Method Summary</h2>
-<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button></div>
-<div id="method-summary-table.tabpanel" role="tabpanel">
-<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;long</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#count(java.lang.Class)" class="member-name-link">count</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Returns the number of elements from column family</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>long</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#count(java.lang.String)" class="member-name-link">count</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;columnFamily)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Returns the number of elements from column family</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#prepare(java.lang.String)" class="member-name-link">prepare</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a <a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a> from the query</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;T&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#query(java.lang.String)" class="member-name-link">query</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes a native query database then bring the result as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a></div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#singleResult(java.lang.String)" class="member-name-link">singleResult</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes a query then bring the result as a unique result</div>
-</div>
-</div>
-</div>
-</div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-jakarta.nosql.Template">Methods inherited from interface&nbsp;jakarta.nosql.<a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></h3>
-<code><a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#delete(java.lang.Class)">delete</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#delete(java.lang.Class,K)">delete</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#find(java.lang.Class,K)">find</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#insert(java.lang.Iterable)">insert</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#insert(java.lang.Iterable,java.time.Duration)">insert</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#insert(T)">insert</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#insert(T,java.time.Duration)">insert</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#select(java.lang.Class)">select</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#update(java.lang.Iterable)">update</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#update(T)">update</a></code></div>
-</section>
-</li>
-</ul>
-</section>
-<section class="details">
-<ul class="details-list">
-<!-- ============ METHOD DETAIL ========== -->
-<li>
-<section class="method-details" id="method-detail">
-<h2>Method Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="count(java.lang.String)">
-<h3>count</h3>
-<div class="member-signature"><span class="return-type">long</span>&nbsp;<span class="element-name">count</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;columnFamily)</span></div>
-<div class="block">Returns the number of elements from column family</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>columnFamily</code> - the column family</dd>
-<dt>Returns:</dt>
-<dd>the number of elements</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when column family is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the database dot not have support</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="count(java.lang.Class)">
-<h3>count</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type">long</span>&nbsp;<span class="element-name">count</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</span></div>
-<div class="block">Returns the number of elements from column family</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>type</code> - the column family</dd>
-<dt>Returns:</dt>
-<dd>the number of elements</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when column family is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the database dot not have support</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="query(java.lang.String)">
-<h3>query</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;T&gt;</span>&nbsp;<span class="element-name">query</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</span></div>
-<div class="block">Executes a native query database then bring the result as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a>
-
- <p>
- <b>the query syntax belongs to each provider, thus, it is not Jakarta's NoSQL scope to define it. Accordingly, it might vary from implementation and NoSQL provider.</b>
- </p></div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>query</code> - the query</dd>
-<dt>Returns:</dt>
-<dd>the result as <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a></dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when the query is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the provider does not support query by text</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="singleResult(java.lang.String)">
-<h3>singleResult</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</span>&nbsp;<span class="element-name">singleResult</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</span></div>
-<div class="block">Executes a query then bring the result as a unique result
-
- <p>
- <b>the query syntax belongs to each provider, thus, it is not Jakarta's NoSQL scope to define it. Accordingly, it might vary from implementation and NoSQL provider.</b>
- </p></div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>query</code> - the query</dd>
-<dt>Returns:</dt>
-<dd>the result as <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link"><code>Optional</code></a></dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when the query is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the provider does not support query by text</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="prepare(java.lang.String)">
-<h3>prepare</h3>
-<div class="member-signature"><span class="return-type"><a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></span>&nbsp;<span class="element-name">prepare</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</span></div>
-<div class="block">Creates a <a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a> from the query
-
- <p>
- <b>the query syntax belongs to each provider, thus, it is not Jakarta's NoSQL scope to define it. Accordingly, it might vary from implementation and NoSQL provider.</b>
- </p></div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>query</code> - the query</dd>
-<dt>Returns:</dt>
-<dd>a <a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a> instance</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when the query is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the provider does not support query by text</dd>
-</dl>
-</section>
-</li>
-</ul>
-</section>
-</li>
-</ul>
-</section>
-<!-- ========= END OF CLASS DATA ========= -->
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.column/jakarta/nosql/column/class-use/ColumnTemplate.html b/javadoc/jakarta.nosql.column/jakarta/nosql/column/class-use/ColumnTemplate.html
deleted file mode 100644
index 9fed9ea..0000000
--- a/javadoc/jakarta.nosql.column/jakarta/nosql/column/class-use/ColumnTemplate.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.column.ColumnTemplate (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="use: module: jakarta.nosql.column, package: jakarta.nosql.column, interface: ColumnTemplate">
-<meta name="generator" content="javadoc/ClassUseWriter">
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-<script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-use-page">
-<script type="text/javascript">var pathtoroot = "../../../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../../index.html">Overview</a></li>
-<li><a href="../../../../module-summary.html">Module</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../ColumnTemplate.html" title="interface in jakarta.nosql.column">Class</a></li>
-<li class="nav-bar-cell1-rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html#use">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<div class="header">
-<h1 title="Uses of Interface jakarta.nosql.column.ColumnTemplate" class="title">Uses of Interface<br>jakarta.nosql.column.ColumnTemplate</h1>
-</div>
-No usage of jakarta.nosql.column.ColumnTemplate</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.column/jakarta/nosql/column/package-summary.html b/javadoc/jakarta.nosql.column/jakarta/nosql/column/package-summary.html
deleted file mode 100644
index 2bd248b..0000000
--- a/javadoc/jakarta.nosql.column/jakarta/nosql/column/package-summary.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>jakarta.nosql.column (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: module: jakarta.nosql.column, package: jakarta.nosql.column">
-<meta name="generator" content="javadoc/PackageWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="package-declaration-page">
-<script type="text/javascript">var pathtoroot = "../../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
-<li><a href="../../../module-summary.html">Module</a></li>
-<li class="nav-bar-cell1-rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html#package">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Package:&nbsp;</li>
-<li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
-<li><a href="#related-package-summary">Related Packages</a>&nbsp;|&nbsp;</li>
-<li><a href="#class-summary">Classes and Interfaces</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<div class="header">
-<div class="sub-title"><span class="module-label-in-package">Module</span>&nbsp;<a href="../../../module-summary.html">jakarta.nosql.column</a></div>
-<h1 title="Package jakarta.nosql.column" class="title">Package jakarta.nosql.column</h1>
-</div>
-<hr>
-<div class="package-signature">package <span class="element-name">jakarta.nosql.column</span></div>
-<section class="package-description" id="package-description">
-<div class="block">Defines the API to Column Family in mapping level. This API going to focus in domain, in other words, ubiquitous language.
- <p>
- A column family is a NoSQL object that contains columns of related data. It is a tuple (pair)
- that consists of a key-value pair, where the key is mapped to a value that is a set of columns.
- In analogy with relational databases, a column family is as a <b>"table"</b>, each key-value pair being a <b>"row"</b>.
- </p>
- <p>
- Each column is a tuple (triplet) consisting of a column name, a value, and a timestamp. In a relational
- database table, this data would be grouped together within a table with other non-related data.
- Ref: <a href="https://en.wikipedia.org/wiki/Column_family" target="_blank">https://en.wikipedia.org/wiki/Column_family</a>
- </p></div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<li>
-<div id="related-package-summary">
-<div class="caption"><span>Related Packages</span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Module</div>
-<div class="table-header col-second">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-plain even-row-color"><a href="../../../../jakarta.nosql.core/module-summary.html">jakarta.nosql.core</a></div>
-<div class="col-first even-row-color"><a href="../../../../jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-<div class="col-plain odd-row-color"><a href="../../../../jakarta.nosql.document/module-summary.html">jakarta.nosql.document</a></div>
-<div class="col-first odd-row-color"><a href="../../../../jakarta.nosql.document/jakarta/nosql/document/package-summary.html">jakarta.nosql.document</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Defines the API to Document Collection in mapping level.</div>
-</div>
-<div class="col-plain even-row-color"><a href="../../../../jakarta.nosql.keyvalue/module-summary.html">jakarta.nosql.keyvalue</a></div>
-<div class="col-first even-row-color"><a href="../../../../jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html">jakarta.nosql.keyvalue</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the API to Key-value in mapping level.</div>
-</div>
-</div>
-</div>
-</li>
-<li>
-<div id="class-summary">
-<div class="caption"><span>Interfaces</span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Class</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color class-summary class-summary-tab1"><a href="ColumnTemplate.html" title="interface in jakarta.nosql.column">ColumnTemplate</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block"><a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Column-Family or Wide-Column databases.</div>
-</div>
-</div>
-</div>
-</li>
-</ul>
-</section>
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.column/module-summary.html b/javadoc/jakarta.nosql.column/module-summary.html
deleted file mode 100644
index 63dbf64..0000000
--- a/javadoc/jakarta.nosql.column/module-summary.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>jakarta.nosql.column (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: module: jakarta.nosql.column">
-<meta name="generator" content="javadoc/ModuleWriterImpl">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-<script type="text/javascript" src="../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="module-declaration-page">
-<script type="text/javascript">var pathtoroot = "../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../index.html">Overview</a></li>
-<li class="nav-bar-cell1-rev">Module</li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../index-all.html">Index</a></li>
-<li><a href="../help-doc.html#module">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Module:&nbsp;</li>
-<li><a href="#module-description">Description</a>&nbsp;|&nbsp;</li>
-<li>Modules&nbsp;|&nbsp;</li>
-<li><a href="#packages-summary">Packages</a>&nbsp;|&nbsp;</li>
-<li>Services</li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<div class="header">
-<h1 title="Module jakarta.nosql.column" class="title">Module jakarta.nosql.column</h1>
-</div>
-<hr>
-<div class="module-signature">module <span class="element-name">jakarta.nosql.column</span></div>
-<section class="module-description" id="module-description">
-<!-- ============ MODULE DESCRIPTION =========== -->
-<div class="block">The Jakarta NoSQL column module.
- <p>
- A column family is a NoSQL object that contains columns of related data. It is a tuple (pair)
- that consists of a key-value pair, where the key is mapped to a value that is a set of columns.
- In analogy with relational databases, a column family is as a <b>"table"</b>, each key-value pair being a <b>"row"</b>.
- </p></div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<li>
-<section class="packages-summary" id="packages-summary">
-<!-- ============ PACKAGES SUMMARY =========== -->
-<h2>Packages</h2>
-<div id="package-summary-table">
-<div class="caption"><span>Exports</span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="jakarta/nosql/column/package-summary.html">jakarta.nosql.column</a></div>
-<div class="col-last even-row-color package-summary-table package-summary-table-tab1">
-<div class="block">Defines the API to Column Family in mapping level.</div>
-</div>
-</div>
-</div>
-</section>
-</li>
-</ul>
-</section>
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/AttributeConverter.html b/javadoc/jakarta.nosql.core/jakarta/nosql/AttributeConverter.html
new file mode 100644
index 0000000..ef83c2e
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/AttributeConverter.html
@@ -0,0 +1,200 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>AttributeConverter (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: AttributeConverter">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="class-use/AttributeConverter.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../module-summary.html">jakarta.nosql.core</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql</a></div>
+<h1 title="Interface AttributeConverter" class="title">Interface AttributeConverter&lt;X,<wbr>Y&gt;</h1>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>X</code> - the target type, that is, the type of the entity attribute</dd>
+<dd><code>Y</code> - a basic type or a supported type in the NoSQL database representing the type of the database column</dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">AttributeConverter&lt;X,<wbr>Y&gt;</span></div>
+<div class="block">A class that implements this interface can be used to convert entity attribute state into a database column
+ representation and vice versa. Note that the types X and Y may be the same Java type.
+
+ <p>This interface is implemented by custom attribute converters. A converter is a class whose methods convert
+ between the target type of the converter (an arbitrary Java type which may be used as the type of a persistent
+ field or property) and a basic type or a type that can be persisted by a persistence provider, used as an
+ intermediate step in mapping to the database representation.
+
+ <p>A converted field or property is considered basic, since, with the aid of the converter, its values can be
+ represented as instances of a basic type.
+
+ <p>Note that the target type <code>X</code> and the converted basic type <code>Y</code> may be the same Java type.</div>
+<dl class="notes">
+<dt>Since:</dt>
+<dd>1.0.0</dd>
+<dt>See Also:</dt>
+<dd>
+<ul class="tag-list">
+<li><a href="Convert.html" title="annotation interface in jakarta.nosql"><code>Convert</code></a></li>
+</ul>
+</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="AttributeConverter.html" title="type parameter in AttributeConverter">Y</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#convertToDatabaseColumn(X)" class="member-name-link">convertToDatabaseColumn</a><wbr>(<a href="AttributeConverter.html" title="type parameter in AttributeConverter">X</a>&nbsp;attribute)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
+<div class="block">Converts the value stored in the entity attribute into the data representation to be stored in the database.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="AttributeConverter.html" title="type parameter in AttributeConverter">X</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#convertToEntityAttribute(Y)" class="member-name-link">convertToEntityAttribute</a><wbr>(<a href="AttributeConverter.html" title="type parameter in AttributeConverter">Y</a>&nbsp;dbData)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
+<div class="block">Converts the data stored in the database column into the value to be stored in the entity attribute.</div>
+</div>
+</div>
+</div>
+</div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="convertToDatabaseColumn(X)">
+<h3 id="convertToDatabaseColumn(java.lang.Object)">convertToDatabaseColumn</h3>
+<div class="member-signature"><span class="return-type"><a href="AttributeConverter.html" title="type parameter in AttributeConverter">Y</a></span>&nbsp;<span class="element-name">convertToDatabaseColumn</span><wbr><span class="parameters">(<a href="AttributeConverter.html" title="type parameter in AttributeConverter">X</a>&nbsp;attribute)</span></div>
+<div class="block">Converts the value stored in the entity attribute into the data representation to be stored in the database.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>attribute</code> - the entity attribute value to be converted</dd>
+<dt>Returns:</dt>
+<dd>the converted data to be stored in the database column</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="convertToEntityAttribute(Y)">
+<h3 id="convertToEntityAttribute(java.lang.Object)">convertToEntityAttribute</h3>
+<div class="member-signature"><span class="return-type"><a href="AttributeConverter.html" title="type parameter in AttributeConverter">X</a></span>&nbsp;<span class="element-name">convertToEntityAttribute</span><wbr><span class="parameters">(<a href="AttributeConverter.html" title="type parameter in AttributeConverter">Y</a>&nbsp;dbData)</span></div>
+<div class="block">Converts the data stored in the database column into the value to be stored in the entity attribute.
+ Note that it is the responsibility of the converter writer to specify the correct database data type for the
+ corresponding column for use by the NoSQL database: i.e., persistence providers are not expected to do
+ such type conversion.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>dbData</code> - the data from the database column to be converted</dd>
+<dt>Returns:</dt>
+<dd>the converted value to be stored in the entity attribute</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/Column.html b/javadoc/jakarta.nosql.core/jakarta/nosql/Column.html
index 7080c41..adfaf88 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/Column.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/Column.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Column (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Column (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Column">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -36,14 +34,31 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Field</li>
+<li>Required</li>
+<li><a href="#annotation-interface-optional-element-summary">Optional</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#annotation-interface-element-detail">Element</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation-interface-optional-element-summary">Optional</a>&nbsp;|&nbsp;</li>
-<li>Required</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li><a href="#annotation-interface-optional-element-summary">Optional</a></li>
 </ul>
 <ul class="sub-nav-list">
 <li>Detail:&nbsp;</li>
@@ -51,9 +66,9 @@
 <li><a href="#annotation-interface-element-detail">Element</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,12 +87,25 @@ <h1 title="Annotation Interface Column" class="title">Annotation Interface Colum
 <div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Retention.html" title="class or interface in java.lang.annotation" class="external-link">@Retention</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/RetentionPolicy.html#RUNTIME" title="class or interface in java.lang.annotation" class="external-link">RUNTIME</a>)
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Target.html" title="class or interface in java.lang.annotation" class="external-link">@Target</a>({<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/ElementType.html#FIELD" title="class or interface in java.lang.annotation" class="external-link">FIELD</a>,<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/ElementType.html#PARAMETER" title="class or interface in java.lang.annotation" class="external-link">PARAMETER</a>})
 </span><span class="modifiers">public @interface </span><span class="element-name type-name-label">Column</span></div>
-<div class="block">Specify the mapped column for a persistent property or field.</div>
+<div class="block">Specifies the column mapped by the annotated persistent property or field.
+ <p>
+ If no <code>Column</code> annotation is explicitly specified, the field will be ignored by Jakarta NoSQL.
+ </p>
+
+ Example:
+ <pre><code>
+ @Column(name = "DESC")
+ private String description;
+ </code></pre></div>
 <dl class="notes">
+<dt>Since:</dt>
+<dd>1.0.0</dd>
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
+<li><a href="Convert.html" title="annotation interface in jakarta.nosql"><code>Convert</code></a></li>
 <li><a href="Entity.html" title="annotation interface in jakarta.nosql"><code>Entity</code></a></li>
+<li><a href="Id.html" title="annotation interface in jakarta.nosql"><code>Id</code></a></li>
 </ul>
 </dd>
 </dl>
@@ -94,8 +122,13 @@ <h2>Optional Element Summary</h2>
 <div class="table-header col-second">Optional Element</div>
 <div class="table-header col-last">Description</div>
 <div class="col-first even-row-color"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second even-row-color"><code><a href="#value()" class="member-name-link">value</a></code></div>
+<div class="col-second even-row-color"><code><a href="#udt()" class="member-name-link">udt</a></code></div>
 <div class="col-last even-row-color">
+<div class="block">(Optional) Defines the name of the user-defined type (UDT) used by the NoSQL database for this field.</div>
+</div>
+<div class="col-first odd-row-color"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second odd-row-color"><code><a href="#value()" class="member-name-link">value</a></code></div>
+<div class="col-last odd-row-color">
 <div class="block">(Optional) The name of the column.</div>
 </div>
 </div>
@@ -115,32 +148,27 @@ <h2>Element Details</h2>
 <h3>value</h3>
 <div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name">value</span></div>
 <div class="block">(Optional) The name of the column. Defaults to the property or field name.
-
  <p>
- The sample below shows the <code>Person</code> entity where the mapped fields with <code>@Column</code> will be going be mapped to columns with their respective field name:
+ For example, in the <code>Person</code> entity class below, the mapped fields with <code>@Column</code>
+ will be mapped to columns with their respective field name:
  </p>
-
  <pre><code>
  @Entity
  public class Person {
-
      @Column
      private String name;
-
  }
  </code></pre>
-
  <p>
- If any name customization is needed, it just set the single attribute of the annotation to specify the desired name.
- In the sample below the Person name field will be mapped to the "personName" column:
+ If any name customization is needed, set the value of this attribute to specify the desired name.
+ For instance, in the example below, the <code>name</code> field of the <code>Person</code> class will be mapped
+ to the "personName" column:
  </p>
  <pre><code>
  @Entity
  public class Person {
-
      @Column("personName")
      private String name;
-
  }
  </code></pre></div>
 <dl class="notes">
@@ -149,7 +177,26 @@ <h3>value</h3>
 </dl>
 <dl class="notes">
 <dt>Default:</dt>
-<dd>""</dd>
+<dd><code>""</code></dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="udt()">
+<h3>udt</h3>
+<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name">udt</span></div>
+<div class="block">(Optional) Defines the name of the user-defined type (UDT) used by the NoSQL database for this field.
+ <p>
+ If a NoSQL database supports UDTs, this attribute allows specifying the name of the UDT to be used
+ for serializing this field. If the database does not support UDTs, this field will be skipped during serialization.
+ </p></div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>the user-defined type (UDT) name</dd>
+</dl>
+<dl class="notes">
+<dt>Default:</dt>
+<dd><code>""</code></dd>
 </dl>
 </section>
 </li>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/Convert.html b/javadoc/jakarta.nosql.core/jakarta/nosql/Convert.html
new file mode 100644
index 0000000..6c537db
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/Convert.html
@@ -0,0 +1,171 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Convert (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Convert">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="class-use/Convert.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Field</li>
+<li><a href="#annotation-interface-required-element-summary">Required</a></li>
+<li>Optional</li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#annotation-interface-element-detail">Element</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#annotation-interface-required-element-summary">Required</a>&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#annotation-interface-element-detail">Element</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../module-summary.html">jakarta.nosql.core</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql</a></div>
+<h1 title="Annotation Interface Convert" class="title">Annotation Interface Convert</h1>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Retention.html" title="class or interface in java.lang.annotation" class="external-link">@Retention</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/RetentionPolicy.html#RUNTIME" title="class or interface in java.lang.annotation" class="external-link">RUNTIME</a>)
+<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Target.html" title="class or interface in java.lang.annotation" class="external-link">@Target</a>({<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/ElementType.html#FIELD" title="class or interface in java.lang.annotation" class="external-link">FIELD</a>,<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/ElementType.html#PARAMETER" title="class or interface in java.lang.annotation" class="external-link">PARAMETER</a>})
+</span><span class="modifiers">public @interface </span><span class="element-name type-name-label">Convert</span></div>
+<div class="block">Specifies how the values of a field or property are converted to a basic type or a type that can be persisted by a persistence provider.
+
+ <p>The <code>Convert</code> annotation may be applied to any field or property and must be used in conjunction with the
+ <a href="Id.html" title="annotation interface in jakarta.nosql"><code>Id</code></a> or <a href="Column.html" title="annotation interface in jakarta.nosql"><code>Column</code></a> annotation (if not, a default value will be used).
+
+ <p>The dot notation may also be used with map entries:
+ <p>Convert a basic attribute
+ <pre>
+ <code>
+ @Converter
+ public class BooleanToIntegerConverter
+         implements AttributeConverter&lt;Boolean, Integer&gt; {  ... }
+
+ @Entity
+ public class Employee {
+     @Id
+     long id;
+
+     @Convert(converter = BooleanToIntegerConverter.class)
+     boolean fullTime;
+ }
+ </code>
+</pre></div>
+<dl class="notes">
+<dt>Since:</dt>
+<dd>1.0.0</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- =========== ANNOTATION INTERFACE REQUIRED MEMBER SUMMARY =========== -->
+<li>
+<section class="member-summary" id="annotation-interface-required-element-summary">
+<h2>Required Element Summary</h2>
+<div class="caption"><span>Required Elements</span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Required Element</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a><wbr>&lt;? extends <a href="AttributeConverter.html" title="interface in jakarta.nosql">AttributeConverter</a>&lt;?,<wbr>?&gt;&gt;</code></div>
+<div class="col-second even-row-color"><code><a href="#value()" class="member-name-link">value</a></code></div>
+<div class="col-last even-row-color">
+<div class="block">Specifies the converter to be applied.</div>
+</div>
+</div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details" id="annotation-interface-element-detail">
+<ul class="details-list">
+<!-- ============ ANNOTATION INTERFACE MEMBER DETAIL =========== -->
+<li>
+<section class="member-details">
+<h2>Element Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="value()">
+<h3>value</h3>
+<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;? extends <a href="AttributeConverter.html" title="interface in jakarta.nosql">AttributeConverter</a>&lt;?,<wbr>?&gt;&gt;</span>&nbsp;<span class="element-name">value</span></div>
+<div class="block">Specifies the converter to be applied.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>the converter class</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/DiscriminatorColumn.html b/javadoc/jakarta.nosql.core/jakarta/nosql/DiscriminatorColumn.html
new file mode 100644
index 0000000..9782754
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/DiscriminatorColumn.html
@@ -0,0 +1,214 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>DiscriminatorColumn (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: DiscriminatorColumn">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="class-use/DiscriminatorColumn.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#field-summary">Field</a></li>
+<li>Required</li>
+<li><a href="#annotation-interface-optional-element-summary">Optional</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#annotation-interface-element-detail">Element</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li><a href="#field-summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li><a href="#annotation-interface-optional-element-summary">Optional</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li><a href="#field-detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#annotation-interface-element-detail">Element</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../module-summary.html">jakarta.nosql.core</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql</a></div>
+<h1 title="Annotation Interface DiscriminatorColumn" class="title">Annotation Interface DiscriminatorColumn</h1>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Retention.html" title="class or interface in java.lang.annotation" class="external-link">@Retention</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/RetentionPolicy.html#RUNTIME" title="class or interface in java.lang.annotation" class="external-link">RUNTIME</a>)
+<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Target.html" title="class or interface in java.lang.annotation" class="external-link">@Target</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/ElementType.html#TYPE" title="class or interface in java.lang.annotation" class="external-link">TYPE</a>)
+</span><span class="modifiers">public @interface </span><span class="element-name type-name-label">DiscriminatorColumn</span></div>
+<div class="block">Specifies the discriminator column for the mapping strategy.
+ If the <code>DiscriminatorColumn</code> annotation is missing,
+ the name of the discriminator column defaults to <code>"dtype"</code>.
+
+ <p>Example usage:
+ <pre><code>
+ @Entity
+ @DiscriminatorColumn(name = "dtype")
+ public class Animal {
+     // Common fields and methods for all animals
+ }
+
+ @Entity
+ public class Dog extends Animal {
+     // Specific fields and methods for dogs
+ }
+
+ @Entity
+ public class Cat extends Animal {
+     // Specific fields and methods for cats
+ }
+ </code></pre></div>
+<dl class="notes">
+<dt>Since:</dt>
+<dd>1.0.0</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- =========== ANNOTATION INTERFACE OPTIONAL MEMBER SUMMARY =========== -->
+<li>
+<section class="member-summary" id="annotation-interface-optional-element-summary">
+<h2>Optional Element Summary</h2>
+<div class="caption"><span>Optional Elements</span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Optional Element</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color"><code><a href="#value()" class="member-name-link">value</a></code></div>
+<div class="col-last even-row-color">
+<div class="block">(Optional) The name of the column to be used for the discriminator.</div>
+</div>
+</div>
+</section>
+</li>
+<!-- =========== FIELD SUMMARY =========== -->
+<li>
+<section class="field-summary" id="field-summary">
+<h2>Field Summary</h2>
+<div class="caption"><span>Fields</span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Field</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code>static final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color"><code><a href="#DEFAULT_DISCRIMINATOR_COLUMN" class="member-name-link">DEFAULT_DISCRIMINATOR_COLUMN</a></code></div>
+<div class="col-last even-row-color">
+<div class="block">The default name of the discriminator column, which is <code>"dtype"</code>.</div>
+</div>
+</div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details" id="annotation-interface-element-detail">
+<ul class="details-list">
+<!-- ============ FIELD DETAIL =========== -->
+<li>
+<section class="field-details" id="field-detail">
+<h2>Field Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="DEFAULT_DISCRIMINATOR_COLUMN">
+<h3>DEFAULT_DISCRIMINATOR_COLUMN</h3>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name">DEFAULT_DISCRIMINATOR_COLUMN</span></div>
+<div class="block">The default name of the discriminator column, which is <code>"dtype"</code>.</div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="tag-list">
+<li><a href="../../../constant-values.html#jakarta.nosql.DiscriminatorColumn.DEFAULT_DISCRIMINATOR_COLUMN">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ ANNOTATION INTERFACE MEMBER DETAIL =========== -->
+<li>
+<section class="member-details">
+<h2>Element Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="value()">
+<h3>value</h3>
+<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name">value</span></div>
+<div class="block">(Optional) The name of the column to be used for the discriminator.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>the column's name</dd>
+</dl>
+<dl class="notes">
+<dt>Default:</dt>
+<dd><code>"dtype"</code></dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/DiscriminatorValue.html b/javadoc/jakarta.nosql.core/jakarta/nosql/DiscriminatorValue.html
new file mode 100644
index 0000000..5767220
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/DiscriminatorValue.html
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>DiscriminatorValue (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: DiscriminatorValue">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="class-use/DiscriminatorValue.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Field</li>
+<li><a href="#annotation-interface-required-element-summary">Required</a></li>
+<li>Optional</li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#annotation-interface-element-detail">Element</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#annotation-interface-required-element-summary">Required</a>&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#annotation-interface-element-detail">Element</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../module-summary.html">jakarta.nosql.core</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql</a></div>
+<h1 title="Annotation Interface DiscriminatorValue" class="title">Annotation Interface DiscriminatorValue</h1>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Retention.html" title="class or interface in java.lang.annotation" class="external-link">@Retention</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/RetentionPolicy.html#RUNTIME" title="class or interface in java.lang.annotation" class="external-link">RUNTIME</a>)
+<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Target.html" title="class or interface in java.lang.annotation" class="external-link">@Target</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/ElementType.html#TYPE" title="class or interface in java.lang.annotation" class="external-link">TYPE</a>)
+</span><span class="modifiers">public @interface </span><span class="element-name type-name-label">DiscriminatorValue</span></div>
+<div class="block">Specifies the value of the discriminator column for the annotated entity type.
+ <p>The <code>DiscriminatorValue</code> annotation can only be specified on a concrete entity class.
+ Specifies the value of the discriminator column for entities of the given type.
+
+ <p>The <code>DiscriminatorValue</code> annotation can only be specified on a concrete entity class.
+
+ <p>If the <code>DiscriminatorValue</code> annotation is not specified and a discriminator column is used,
+ a provider-specific function will be used to generate a value representing the entity type.
+ So the discriminator value default is the <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html#getSimpleName()" title="class or interface in java.lang" class="external-link"><code>Class.getSimpleName()</code></a>.</div>
+<dl class="notes">
+<dt>Since:</dt>
+<dd>1.0.0</dd>
+<dt>See Also:</dt>
+<dd>
+<ul class="tag-list">
+<li><a href="DiscriminatorColumn.html" title="annotation interface in jakarta.nosql"><code>DiscriminatorColumn</code></a></li>
+</ul>
+</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- =========== ANNOTATION INTERFACE REQUIRED MEMBER SUMMARY =========== -->
+<li>
+<section class="member-summary" id="annotation-interface-required-element-summary">
+<h2>Required Element Summary</h2>
+<div class="caption"><span>Required Elements</span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Required Element</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color"><code><a href="#value()" class="member-name-link">value</a></code></div>
+<div class="col-last even-row-color">
+<div class="block">(Optional) The value that indicates that the row is an entity of the annotated entity type.</div>
+</div>
+</div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details" id="annotation-interface-element-detail">
+<ul class="details-list">
+<!-- ============ ANNOTATION INTERFACE MEMBER DETAIL =========== -->
+<li>
+<section class="member-details">
+<h2>Element Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="value()">
+<h3>value</h3>
+<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name">value</span></div>
+<div class="block">(Optional) The value that indicates that the row is an entity of the annotated entity type.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>the discriminator Value</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html b/javadoc/jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html
new file mode 100644
index 0000000..cc9d72b
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html
@@ -0,0 +1,247 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Embeddable.EmbeddableType (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Embeddable, enum: EmbeddableType">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="class-use/Embeddable.EmbeddableType.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#enum-constant-summary">Enum Constants</a></li>
+<li>Field</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#enum-constant-detail">Enum Constants</a></li>
+<li>Field</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#enum-constant-summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum-constant-detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../module-summary.html">jakarta.nosql.core</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql</a></div>
+<h1 title="Enum Class Embeddable.EmbeddableType" class="title">Enum Class Embeddable.EmbeddableType</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" title="class or interface in java.lang" class="external-link">java.lang.Enum</a>&lt;<a href="Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a>&gt;
+<div class="inheritance">jakarta.nosql.Embeddable.EmbeddableType</div>
+</div>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;<a href="Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/constant/Constable.html" title="class or interface in java.lang.constant" class="external-link">Constable</a></code></dd>
+</dl>
+<dl class="notes">
+<dt>Enclosing class:</dt>
+<dd><code><a href="Embeddable.html" title="annotation interface in jakarta.nosql">Embeddable</a></code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public static enum </span><span class="element-name type-name-label">Embeddable.EmbeddableType</span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" title="class or interface in java.lang" class="external-link">Enum</a>&lt;<a href="Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a>&gt;</span></div>
+<div class="block">Defines the strategy for how fields of the embeddable class are stored.</div>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<li>
+<section class="nested-class-summary" id="nested-class-summary">
+<h2>Nested Class Summary</h2>
+<div class="inherited-list">
+<h2 id="nested-classes-inherited-from-class-java.lang.Enum">Nested classes/interfaces inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" title="class or interface in java.lang" class="external-link">Enum</a></h2>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.EnumDesc.html" title="class or interface in java.lang" class="external-link">Enum.EnumDesc</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.EnumDesc.html" title="class or interface in java.lang" class="external-link">E</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" title="class or interface in java.lang" class="external-link">Enum</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.EnumDesc.html" title="class or interface in java.lang" class="external-link">E</a>&gt;&gt;</code></div>
+</section>
+</li>
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<li>
+<section class="constants-summary" id="enum-constant-summary">
+<h2>Enum Constant Summary</h2>
+<div class="caption"><span>Enum Constants</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Enum Constant</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code><a href="#FLAT" class="member-name-link">FLAT</a></code></div>
+<div class="col-last even-row-color">
+<div class="block">Fields of the embeddable class are embedded directly into the data structure of the parent entity or embeddable.</div>
+</div>
+<div class="col-first odd-row-color"><code><a href="#GROUPING" class="member-name-link">GROUPING</a></code></div>
+<div class="col-last odd-row-color">
+<div class="block">Fields of the embeddable class are stored in a structured type, such as a user-defined type (UDT).</div>
+</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#valueOf(java.lang.String)" class="member-name-link">valueOf</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
+<div class="block">Returns the enum constant of this class with the specified name.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a>[]</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#values()" class="member-name-link">values</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
+<div class="block">Returns an array containing the constants of this enum class, in
+the order they are declared.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Enum">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" title="class or interface in java.lang" class="external-link">Enum</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#compareTo(E)" title="class or interface in java.lang" class="external-link">compareTo</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#describeConstable()" title="class or interface in java.lang" class="external-link">describeConstable</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#getDeclaringClass()" title="class or interface in java.lang" class="external-link">getDeclaringClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#name()" title="class or interface in java.lang" class="external-link">name</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#ordinal()" title="class or interface in java.lang" class="external-link">ordinal</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#valueOf(java.lang.Class,java.lang.String)" title="class or interface in java.lang" class="external-link">valueOf</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<li>
+<section class="constant-details" id="enum-constant-detail">
+<h2>Enum Constant Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="FLAT">
+<h3>FLAT</h3>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></span>&nbsp;<span class="element-name">FLAT</span></div>
+<div class="block">Fields of the embeddable class are embedded directly into the data structure of the parent entity or embeddable.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="GROUPING">
+<h3>GROUPING</h3>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></span>&nbsp;<span class="element-name">GROUPING</span></div>
+<div class="block">Fields of the embeddable class are stored in a structured type, such as a user-defined type (UDT).</div>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="values()">
+<h3>values</h3>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a>[]</span>&nbsp;<span class="element-name">values</span>()</div>
+<div class="block">Returns an array containing the constants of this enum class, in
+the order they are declared.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>an array containing the constants of this enum class, in the order they are declared</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="valueOf(java.lang.String)">
+<h3>valueOf</h3>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></span>&nbsp;<span class="element-name">valueOf</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</span></div>
+<div class="block">Returns the enum constant of this class with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this class.  (Extraneous whitespace characters are 
+not permitted.)</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt>Returns:</dt>
+<dd>the enum constant with the specified name</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - if this enum class has no constant with the specified name</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - if the argument is null</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/Embeddable.html b/javadoc/jakarta.nosql.core/jakarta/nosql/Embeddable.html
new file mode 100644
index 0000000..92c8419
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/Embeddable.html
@@ -0,0 +1,229 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Embeddable (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Embeddable">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="class-use/Embeddable.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Field</li>
+<li>Required</li>
+<li><a href="#annotation-interface-optional-element-summary">Optional</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#annotation-interface-element-detail">Element</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li><a href="#annotation-interface-optional-element-summary">Optional</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#annotation-interface-element-detail">Element</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../module-summary.html">jakarta.nosql.core</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql</a></div>
+<h1 title="Annotation Interface Embeddable" class="title">Annotation Interface Embeddable</h1>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Retention.html" title="class or interface in java.lang.annotation" class="external-link">@Retention</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/RetentionPolicy.html#RUNTIME" title="class or interface in java.lang.annotation" class="external-link">RUNTIME</a>)
+<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Target.html" title="class or interface in java.lang.annotation" class="external-link">@Target</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/ElementType.html#TYPE" title="class or interface in java.lang.annotation" class="external-link">TYPE</a>)
+</span><span class="modifiers">public @interface </span><span class="element-name type-name-label">Embeddable</span></div>
+<div class="block">Declares a type whose instances are stored as an intrinsic part of an owning entity, sharing the identity of the entity.
+ A single embeddable type may be used as the type of multiple persistent fields or properties across several entities, even entities of unrelated types.
+
+ <p>The annotated type must:</p>
+ <ul>
+     <li>Be a non-abstract, non-final top-level class or static inner class.</li>
+     <li>Have at least one field annotated with <a href="Column.html" title="annotation interface in jakarta.nosql"><code>Column</code></a>.</li>
+     <li>Have a public or protected constructor with no parameters or a constructor parameter annotated with <a href="Column.html" title="annotation interface in jakarta.nosql"><code>Column</code></a>.</li>
+     <li>Annotations at the constructor will build the entity and read information from the database, while
+     field annotations are required to write information to the database.</li>
+     <li>If both a non-args constructor and a constructor with annotated parameters exist, the constructor with annotations will be used to create the entity.</li>
+     <li>Constructor parameters without annotations will be ignored, utilizing a non-arg constructor instead.</li>
+     <li>An embeddable class should not have multiple constructors using <a href="Column.html" title="annotation interface in jakarta.nosql"><code>Column</code></a> annotations.</li>
+     <li>Enums or interfaces cannot be designated as embeddable types.</li>
+     <li>Record classes can also serve as embeddable types.</li>
+ </ul>
+
+ <p>An embeddable class does not have its own database structure; instead, the state of an instance is stored in the structure mapped by the owning entity.</p>
+
+ <p>Persistent fields and properties of an embeddable class are mapped using the same mapping annotations used for
+ entity classes and may hold instances of other embeddable types.</p>
+
+ <p>An embeddable class can have two types of strategies:</p>
+ <ul>
+     <li><a href="Embeddable.EmbeddableType.html#FLAT"><code>Embeddable.EmbeddableType.FLAT</code></a>: where the embeddable class is treated as a parent entity type.</li>
+     <li><a href="Embeddable.EmbeddableType.html#GROUPING"><code>Embeddable.EmbeddableType.GROUPING</code></a>: where the embeddable class is stored in a structured type.</li>
+ </ul>
+
+ <p>The behavior of the <a href="Embeddable.EmbeddableType.html#FLAT"><code>Embeddable.EmbeddableType.FLAT</code></a> strategy is guaranteed to be supported by all Jakarta NoSQL implementations.
+ However, the support and behavior of the <a href="Embeddable.EmbeddableType.html#GROUPING"><code>Embeddable.EmbeddableType.GROUPING</code></a> strategy may vary among NoSQL databases.
+ If a NoSQL database does not support the <a href="Embeddable.EmbeddableType.html#GROUPING"><code>Embeddable.EmbeddableType.GROUPING</code></a> strategy, invoking operations that require it
+ will result in an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link"><code>UnsupportedOperationException</code></a>. Additionally, if a database requires specific configurations,
+ such as <a href="Column.html#udt()"><code>Column.udt()</code></a>, to support the <a href="Embeddable.EmbeddableType.html#GROUPING"><code>Embeddable.EmbeddableType.GROUPING</code></a> strategy, but those configurations are not met,
+ a <a href="MappingException.html" title="class in jakarta.nosql"><code>MappingException</code></a> may be thrown.</p>
+
+ <p>For key-value NoSQL databases, the serialization mechanism may vary depending on the Jakarta NoSQL provider or the specific NoSQL database being used.</p>
+
+ <p>Example:</p>
+ <pre><code>
+ @Embeddable
+ public class PhoneNumber {
+     @Column
+     protected String areaCode;
+     @Column
+     protected String localNumber;
+ }
+ </code></pre>
+ The sample below demonstrates the use of records as embeddable types:
+ <pre><code>
+ @Embeddable
+ public record PhoneNumber(@Column String areaCode, @Column String localNumber) {
+ }
+ </code></pre></div>
+<dl class="notes">
+<dt>Since:</dt>
+<dd>1.0.0</dd>
+<dt>See Also:</dt>
+<dd>
+<ul class="tag-list">
+<li><a href="Column.html" title="annotation interface in jakarta.nosql"><code>Column</code></a></li>
+<li><a href="Entity.html" title="annotation interface in jakarta.nosql"><code>Entity</code></a></li>
+</ul>
+</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<li>
+<section class="nested-class-summary" id="nested-class-summary">
+<h2>Nested Class Summary</h2>
+<div class="caption"><span>Nested Classes</span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Class</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code>static enum&nbsp;</code></div>
+<div class="col-second even-row-color"><code><a href="Embeddable.EmbeddableType.html" class="type-name-link" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></code></div>
+<div class="col-last even-row-color">
+<div class="block">Defines the strategy for how fields of the embeddable class are stored.</div>
+</div>
+</div>
+</section>
+</li>
+<!-- =========== ANNOTATION INTERFACE OPTIONAL MEMBER SUMMARY =========== -->
+<li>
+<section class="member-summary" id="annotation-interface-optional-element-summary">
+<h2>Optional Element Summary</h2>
+<div class="caption"><span>Optional Elements</span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Optional Element</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code><a href="Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></code></div>
+<div class="col-second even-row-color"><code><a href="#value()" class="member-name-link">value</a></code></div>
+<div class="col-last even-row-color">
+<div class="block">Specifies the embeddable type.</div>
+</div>
+</div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details" id="annotation-interface-element-detail">
+<ul class="details-list">
+<!-- ============ ANNOTATION INTERFACE MEMBER DETAIL =========== -->
+<li>
+<section class="member-details">
+<h2>Element Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="value()">
+<h3>value</h3>
+<div class="member-signature"><span class="return-type"><a href="Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></span>&nbsp;<span class="element-name">value</span></div>
+<div class="block">Specifies the embeddable type.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>the embeddable type</dd>
+</dl>
+<dl class="notes">
+<dt>Default:</dt>
+<dd><code>FLAT</code></dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/Entity.html b/javadoc/jakarta.nosql.core/jakarta/nosql/Entity.html
index 6164107..3f06415 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/Entity.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/Entity.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Entity (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Entity (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Entity">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -36,14 +34,31 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Field</li>
+<li>Required</li>
+<li><a href="#annotation-interface-optional-element-summary">Optional</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#annotation-interface-element-detail">Element</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation-interface-optional-element-summary">Optional</a>&nbsp;|&nbsp;</li>
-<li>Required</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li><a href="#annotation-interface-optional-element-summary">Optional</a></li>
 </ul>
 <ul class="sub-nav-list">
 <li>Detail:&nbsp;</li>
@@ -51,9 +66,9 @@
 <li><a href="#annotation-interface-element-detail">Element</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,12 +87,26 @@ <h1 title="Annotation Interface Entity" class="title">Annotation Interface Entit
 <div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Retention.html" title="class or interface in java.lang.annotation" class="external-link">@Retention</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/RetentionPolicy.html#RUNTIME" title="class or interface in java.lang.annotation" class="external-link">RUNTIME</a>)
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Target.html" title="class or interface in java.lang.annotation" class="external-link">@Target</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/ElementType.html#TYPE" title="class or interface in java.lang.annotation" class="external-link">TYPE</a>)
 </span><span class="modifiers">public @interface </span><span class="element-name type-name-label">Entity</span></div>
-<div class="block">Specifies that the class is an entity.
+<div class="block">Annotates a class as an entity, representing a persistent class corresponding to a database structure.
+ <p>
+ Entity classes must adhere to specific rules:
+ <ul>
+ <li>At least one field must be annotated with <a href="Id.html" title="annotation interface in jakarta.nosql"><code>Id</code></a> or <a href="Column.html" title="annotation interface in jakarta.nosql"><code>Column</code></a>.</li>
+ <li>Constructors must be <code>public</code> or <code>protected</code> with no parameters, or with parameters annotated with <a href="Column.html" title="annotation interface in jakarta.nosql"><code>Column</code></a> or <a href="Id.html" title="annotation interface in jakarta.nosql"><code>Id</code></a>.</li>
+ <li>Annotations at the constructor will build the entity and read information from the database, while field annotations are required to write information to the database.</li>
+ <li>If both a non-args constructor and a constructor with annotated parameters exist, the constructor with annotations will be used to create the entity.</li>
+ <li>Constructor parameters without annotations will be ignored, utilizing a non-arg constructor instead.</li>
+ <li>Entities should not have multiple constructors using <a href="Id.html" title="annotation interface in jakarta.nosql"><code>Id</code></a> or <a href="Column.html" title="annotation interface in jakarta.nosql"><code>Column</code></a> annotations.</li>
+ <li>Record classes can also serve as entities.</li>
+ </ul>
  <p>
- You can include one or multiple entities if the Database supports it.
+ Enums or interfaces cannot be designated as entities.
  </p>
  <p>
- The sample below shows two entities, Person and Address, where a person has an address:
+ Each entity must have a unique identifier, typically annotated with <a href="Id.html" title="annotation interface in jakarta.nosql"><code>Id</code></a>.
+ </p>
+ <p>
+ The following example demonstrates two classes, <code>Person</code> and <code>Address</code>, where a person has an address:
  </p>
  <pre><code>
  @Entity
@@ -93,7 +122,7 @@ <h1 title="Annotation Interface Entity" class="title">Annotation Interface Entit
      private Address address;
  }
 
- @Entity
+ @Embeddable
  public class Address {
      @Column
      private String street;
@@ -103,23 +132,36 @@ <h1 title="Annotation Interface Entity" class="title">Annotation Interface Entit
  }
  </code></pre>
  <p>
- However, it’s essential to remember that NoSQL databases have varying behaviors then the serialization method may differ depending on the NoSQL vendor.
- For instance, in a Document database, these entities may be converted into a sub-document, while on a Key-value, it will be the value:
+ Note: NoSQL databases may have varying behaviors regarding serialization, resulting in different storage formats based on the NoSQL vendor.
+ </p>
+ <p>
+ The sample below demonstrates the use of records as entities:
  </p>
  <pre><code>
- {
-     "_id":10,
-     "name":"Ada Lovelave",
-     "address":{
-          "city":"São Paulo",
-          "street":"Av Nove de Julho"
+ @Entity
+ public record Person(@Id Long id, @Column String name, @Column Address address) {
+ }
+
+ @Embeddable
+ public class Address {
+     @Column
+     private String street;
+
+     @Column
+     private String city;
+
+     public Address(@Column String street, @Column String city) {
+         this.street = street;
+         this.city = city;
      }
  }
  </code></pre></div>
 <dl class="notes">
+<dt>Since:</dt>
+<dd>1.0</dd>
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="Id.html" title="annotation interface in jakarta.nosql"><code>Id</code></a></li>
 <li><a href="Column.html" title="annotation interface in jakarta.nosql"><code>Column</code></a></li>
 </ul>
@@ -140,7 +182,7 @@ <h2>Optional Element Summary</h2>
 <div class="col-first even-row-color"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second even-row-color"><code><a href="#value()" class="member-name-link">value</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">The name of an entity.</div>
+<div class="block">The name of the entity.</div>
 </div>
 </div>
 </section>
@@ -158,31 +200,25 @@ <h2>Element Details</h2>
 <section class="detail" id="value()">
 <h3>value</h3>
 <div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name">value</span></div>
-<div class="block">The name of an entity. The default value is the unqualified simple name of the class.
- <p>
- For example, given the <code>org.jakarta.nosql.demo.Person</code> class, the default name will be <code>Person</code>:
-
- <pre><code>
-     @Entity
-     public class Person {
-     }
- </code></pre>
+<div class="block">The name of the entity. If not specified, defaults to the unqualified simple name of the class.
+ This name is used to refer to the entity in queries and also to represent the name in the NoSQL database structure, such as the table name or collection name.
  <p>
+ For example, given the class <code>org.jakarta.nosql.demo.Person</code>, the default name will be <code>Person</code>.
+ </p>
  <p>
- In the case of name customization, it just needs to set the value of the @Entity annotation with the desired name as like below:
-
+ To customize the name, set the value of the <code>@Entity</code> annotation to the desired name, as shown below:
  <pre><code>
-     @Entity("ThePerson")
-     public class Person {
-     }
+ @Entity("ThePerson")
+ public class Person {
+ }
  </code></pre></div>
 <dl class="notes">
 <dt>Returns:</dt>
-<dd>the entity name (Optional)</dd>
+<dd>the entity name (optional)</dd>
 </dl>
 <dl class="notes">
 <dt>Default:</dt>
-<dd>""</dd>
+<dd><code>""</code></dd>
 </dl>
 </section>
 </li>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/Id.html b/javadoc/jakarta.nosql.core/jakarta/nosql/Id.html
index 481e13b..2597b19 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/Id.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/Id.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Id (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Id (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Id">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -36,14 +34,31 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Field</li>
+<li>Required</li>
+<li><a href="#annotation-interface-optional-element-summary">Optional</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#annotation-interface-element-detail">Element</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation-interface-optional-element-summary">Optional</a>&nbsp;|&nbsp;</li>
-<li>Required</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li><a href="#annotation-interface-optional-element-summary">Optional</a></li>
 </ul>
 <ul class="sub-nav-list">
 <li>Detail:&nbsp;</li>
@@ -51,9 +66,9 @@
 <li><a href="#annotation-interface-element-detail">Element</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,11 +87,43 @@ <h1 title="Annotation Interface Id" class="title">Annotation Interface Id</h1>
 <div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Retention.html" title="class or interface in java.lang.annotation" class="external-link">@Retention</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/RetentionPolicy.html#RUNTIME" title="class or interface in java.lang.annotation" class="external-link">RUNTIME</a>)
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Target.html" title="class or interface in java.lang.annotation" class="external-link">@Target</a>({<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/ElementType.html#FIELD" title="class or interface in java.lang.annotation" class="external-link">FIELD</a>,<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/ElementType.html#PARAMETER" title="class or interface in java.lang.annotation" class="external-link">PARAMETER</a>})
 </span><span class="modifiers">public @interface </span><span class="element-name type-name-label">Id</span></div>
-<div class="block">Specifies the mapped field of an entity is the entity’s ID, or the Key in Key-Value databases.</div>
+<div class="block">Identifies the primary key of an entity.
+ Specifies the mapped field of an entity as the entity’s ID, or the Key in Key-Value databases.
+ The field or property to which the <code>Id</code> annotation is
+ applied should have one of the following types:
+ <ul>
+ <li>any Java primitive type;</li>
+ <li>any primitive wrapper type;</li>
+ <li><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link"><code>String</code></a>;</li>
+ <li><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/UUID.html" title="class or interface in java.util" class="external-link"><code>UUID</code></a>;</li>
+ <li><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/BigDecimal.html" title="class or interface in java.math" class="external-link"><code>BigDecimal</code></a>;</li>
+ <li><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/BigInteger.html" title="class or interface in java.math" class="external-link"><code>BigInteger</code></a>.</li>
+ </ul>
+ Or it uses the <a href="Convert.html" title="annotation interface in jakarta.nosql"><code>Convert</code></a> to convert the type to one of the above types.
+ <p>
+ The mapped column for the primary key of the entity is assumed
+ to be the primary key of the database structure.
+ </p>
+
+ <p>Example:</p>
+ <pre>
+ <code>
+ @Id
+ public Long id;
+ </code>
+ </pre>
+ <p>
+ An insertion with an ID value might vary from the vendor, where vendors can throw a NullPointerException,
+ for example, a Key-value database, or apply a strategy of auto generating value, for example, UUID or auto-increment.
+ </p></div>
 <dl class="notes">
+<dt>Since:</dt>
+<dd>1.0.0</dd>
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
+<li><a href="Convert.html" title="annotation interface in jakarta.nosql"><code>Convert</code></a></li>
+<li><a href="Column.html" title="annotation interface in jakarta.nosql"><code>Column</code></a></li>
 <li><a href="Entity.html" title="annotation interface in jakarta.nosql"><code>Entity</code></a></li>
 </ul>
 </dd>
@@ -115,37 +162,22 @@ <h2>Element Details</h2>
 <h3>value</h3>
 <div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name">value</span></div>
 <div class="block">The name of the entity ID. Default value is <code>_id</code>.
-
- <pre><code>
+ This value might be ignored if the NoSQL database has a keyword reserved for keys.
+ For example:
+ <code>
  @Entity
  public class User {
-
      @Id
      private String userName;
-
- }
- </code></pre>
-
- <p>
- if the entity ID name requires customization, it just set the single attribute of the annotation to specify the desired name:
- </p>
-
- <pre><code>
- @Entity
- public class User {
-
-     @Id("userId")
-     private String userName;
-
  }
- </code></pre></div>
+ </code></div>
 <dl class="notes">
 <dt>Returns:</dt>
 <dd>the entity ID name</dd>
 </dl>
 <dl class="notes">
 <dt>Default:</dt>
-<dd>"_id"</dd>
+<dd><code>"_id"</code></dd>
 </dl>
 </section>
 </li>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/Inheritance.html b/javadoc/jakarta.nosql.core/jakarta/nosql/Inheritance.html
new file mode 100644
index 0000000..5ebbd4e
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/Inheritance.html
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Inheritance (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Inheritance">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="class-use/Inheritance.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Field</li>
+<li>Required</li>
+<li>Optional</li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Element</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Element</li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../module-summary.html">jakarta.nosql.core</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql</a></div>
+<h1 title="Annotation Interface Inheritance" class="title">Annotation Interface Inheritance</h1>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Retention.html" title="class or interface in java.lang.annotation" class="external-link">@Retention</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/RetentionPolicy.html#RUNTIME" title="class or interface in java.lang.annotation" class="external-link">RUNTIME</a>)
+<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Target.html" title="class or interface in java.lang.annotation" class="external-link">@Target</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/ElementType.html#TYPE" title="class or interface in java.lang.annotation" class="external-link">TYPE</a>)
+</span><span class="modifiers">public @interface </span><span class="element-name type-name-label">Inheritance</span></div>
+<div class="block">Specifies the inheritance mapping strategy for the entity class hierarchy, which descends from the annotated entity class.
+ Specifies the inheritance strategy to be used for an entity class hierarchy.
+ It is specified on the entity class that is the root of the entity class hierarchy.
+ This class can be either a regular or an abstract;
+ The NoSQL database structure will have a column for every attribute
+ of every class in the hierarchy.
+ The subclass will use the <a href="Entity.html" title="annotation interface in jakarta.nosql"><code>Entity</code></a> name from that class with this annotation.
+
+ <pre>
+
+   Example:
+   &#064;Entity
+   &#064;Inheritance
+   public class Notification { ... }
+
+   &#064;Entity
+   public class SMSNotification extends Notification { ... }
+ </pre></div>
+<dl class="notes">
+<dt>Since:</dt>
+<dd>1.0.0</dd>
+</dl>
+</section>
+<section class="details" id="annotation-interface-element-detail"></section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/MappedSuperclass.html b/javadoc/jakarta.nosql.core/jakarta/nosql/MappedSuperclass.html
new file mode 100644
index 0000000..d9d2495
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/MappedSuperclass.html
@@ -0,0 +1,133 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>MappedSuperclass (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: MappedSuperclass">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="class-use/MappedSuperclass.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Field</li>
+<li>Required</li>
+<li>Optional</li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Element</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
+<li>Optional</li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Element</li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../module-summary.html">jakarta.nosql.core</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql</a></div>
+<h1 title="Annotation Interface MappedSuperclass" class="title">Annotation Interface MappedSuperclass</h1>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Retention.html" title="class or interface in java.lang.annotation" class="external-link">@Retention</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/RetentionPolicy.html#RUNTIME" title="class or interface in java.lang.annotation" class="external-link">RUNTIME</a>)
+<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Target.html" title="class or interface in java.lang.annotation" class="external-link">@Target</a>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/ElementType.html#TYPE" title="class or interface in java.lang.annotation" class="external-link">TYPE</a>)
+</span><span class="modifiers">public @interface </span><span class="element-name type-name-label">MappedSuperclass</span></div>
+<div class="block">Defines a class whose mapping information is applied to entities that inherit from it.
+ Unlike regular entities, a mapped superclass does not imply the existence of separate storage
+ structures.
+
+ <p>Declares a class that is not itself an entity, but whose mappings are inherited by entities that extend it.
+ A mapped superclass is not a persistent type and is not mapped to a specific database structure.
+
+ <p>The persistent fields and properties of a mapped superclass are declared and mapped using the same mapping
+ annotations used to map <a href="Entity.html" title="annotation interface in jakarta.nosql">entity classes</a>. However, these mappings are interpreted in the context
+ of each entity class that inherits the mapped superclass, since the mapped superclass itself does not have a
+ predefined storage structure in NoSQL databases.
+
+ <p>Example:</p>
+ <pre><code>
+ @MappedSuperclass
+ public class Employee {
+     @Id
+     protected Integer id;
+     @Column
+     protected Address address;
+ }
+
+ @Entity
+ public class Programmer extends Employee {
+     @Column
+     protected Money salary;
+ }
+ </code></pre></div>
+<dl class="notes">
+<dt>Since:</dt>
+<dd>1.0.0</dd>
+</dl>
+</section>
+<section class="details" id="annotation-interface-element-detail"></section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/MappingException.html b/javadoc/jakarta.nosql.core/jakarta/nosql/MappingException.html
new file mode 100644
index 0000000..00567b5
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/MappingException.html
@@ -0,0 +1,225 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>MappingException (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, class: MappingException">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="class-use/MappingException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor-summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor-detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../module-summary.html">jakarta.nosql.core</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql</a></div>
+<h1 title="Class MappingException" class="title">Class MappingException</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">java.lang.Throwable</a>
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">java.lang.Exception</a>
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" title="class or interface in java.lang" class="external-link">java.lang.RuntimeException</a>
+<div class="inheritance"><a href="NoSQLException.html" title="class in jakarta.nosql">jakarta.nosql.NoSQLException</a>
+<div class="inheritance">jakarta.nosql.MappingException</div>
+</div>
+</div>
+</div>
+</div>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">MappingException</span>
+<span class="extends-implements">extends <a href="NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></span></div>
+<div class="block">An exception that occurs when there is a mapping error during entity mapping or persistence.
+ This exception typically indicates issues with the usage or missing annotations at the entity level.
+ Some scenarios where this exception may be thrown include:
+ <ul>
+     <li>A class annotated with <code>@Entity</code> does not have the <code>@Id</code> annotation.</li>
+     <li>A class annotated with <code>@Entity</code> or <code>@Embeddable</code> does not have a default constructor
+     or has multiple constructors without <code>@Id</code> and <code>@Column</code> annotations.</li>
+     <li>A class annotated with <code>@Entity</code> or <code>@Embeddable</code> has multiple constructors with annotations
+     provided by Jakarta NoSQL, which may lead to ambiguity in entity instantiation.</li>
+ </ul>
+
+ <p>This exception may occur at runtime or build time, depending on the Jakarta NoSQL provider being used.</p></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="tag-list">
+<li><a href="../../../serialized-form.html#jakarta.nosql.MappingException">Serialized Form</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String)" class="member-name-link">MappingException</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;message)</code></div>
+<div class="col-last even-row-color">
+<div class="block">Constructs a <code>MappingException</code> using the given message.</div>
+</div>
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(java.lang.String,java.lang.Throwable)" class="member-name-link">MappingException</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;message,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;cause)</code></div>
+<div class="col-last odd-row-color">
+<div class="block">Constructs a <code>MappingException</code> using the given message and cause.</div>
+</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.Throwable)" class="member-name-link">MappingException</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;cause)</code></div>
+<div class="col-last even-row-color">
+<div class="block">Constructs a <code>MappingException</code> using the given cause.</div>
+</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Throwable">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#addSuppressed(java.lang.Throwable)" title="class or interface in java.lang" class="external-link">addSuppressed</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#fillInStackTrace()" title="class or interface in java.lang" class="external-link">fillInStackTrace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#getCause()" title="class or interface in java.lang" class="external-link">getCause</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#getLocalizedMessage()" title="class or interface in java.lang" class="external-link">getLocalizedMessage</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#getMessage()" title="class or interface in java.lang" class="external-link">getMessage</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#getStackTrace()" title="class or interface in java.lang" class="external-link">getStackTrace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#getSuppressed()" title="class or interface in java.lang" class="external-link">getSuppressed</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#initCause(java.lang.Throwable)" title="class or interface in java.lang" class="external-link">initCause</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#printStackTrace()" title="class or interface in java.lang" class="external-link">printStackTrace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#printStackTrace(java.io.PrintStream)" title="class or interface in java.lang" class="external-link">printStackTrace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#printStackTrace(java.io.PrintWriter)" title="class or interface in java.lang" class="external-link">printStackTrace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#setStackTrace(java.lang.StackTraceElement%5B%5D)" title="class or interface in java.lang" class="external-link">setStackTrace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#toString()" title="class or interface in java.lang" class="external-link">toString</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="&lt;init&gt;(java.lang.String,java.lang.Throwable)">
+<h3>MappingException</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name">MappingException</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;message,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;cause)</span></div>
+<div class="block">Constructs a <code>MappingException</code> using the given message and cause.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>message</code> - A message explaining the exception condition</dd>
+<dd><code>cause</code> - The underlying cause</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="&lt;init&gt;(java.lang.Throwable)">
+<h3>MappingException</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name">MappingException</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;cause)</span></div>
+<div class="block">Constructs a <code>MappingException</code> using the given cause.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>cause</code> - The underlying cause</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="&lt;init&gt;(java.lang.String)">
+<h3>MappingException</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name">MappingException</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;message)</span></div>
+<div class="block">Constructs a <code>MappingException</code> using the given message.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>message</code> - A message explaining the exception condition</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/NoSQLException.html b/javadoc/jakarta.nosql.core/jakarta/nosql/NoSQLException.html
index b47cb74..f08e936 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/NoSQLException.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/NoSQLException.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>NoSQLException (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>NoSQLException (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, class: NoSQLException">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -36,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -53,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -83,14 +100,18 @@ <h1 title="Class NoSQLException" class="title">Class NoSQLException</h1>
 <dt>All Implemented Interfaces:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code></dd>
 </dl>
+<dl class="notes">
+<dt>Direct Known Subclasses:</dt>
+<dd><code><a href="MappingException.html" title="class in jakarta.nosql">MappingException</a></code></dd>
+</dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">NoSQLException</span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" title="class or interface in java.lang" class="external-link">RuntimeException</a></span></div>
-<div class="block">The root exception to Mapping layer</div>
+<div class="block">Thrown by the persistence provider when a problem occurs.</div>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../serialized-form.html#jakarta.nosql.NoSQLException">Serialized Form</a></li>
 </ul>
 </dd>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/PreparedStatement.html b/javadoc/jakarta.nosql.core/jakarta/nosql/PreparedStatement.html
deleted file mode 100644
index 9d0a106..0000000
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/PreparedStatement.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>PreparedStatement (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: PreparedStatement">
-<meta name="generator" content="javadoc/ClassWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../script.js"></script>
-<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
-<li><a href="../../module-summary.html">Module</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="nav-bar-cell1-rev">Class</li>
-<li><a href="class-use/PreparedStatement.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../index-all.html">Index</a></li>
-<li><a href="../../../help-doc.html#class">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method-summary">Method</a></li>
-</ul>
-<ul class="sub-nav-list">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method-detail">Method</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../module-summary.html">jakarta.nosql.core</a></div>
-<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql</a></div>
-<h1 title="Interface PreparedStatement" class="title">Interface PreparedStatement</h1>
-</div>
-<section class="class-description" id="class-description">
-<hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">PreparedStatement</span></div>
-<div class="block">Represents a precompiled Query statement.</div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<!-- ========== METHOD SUMMARY =========== -->
-<li>
-<section class="method-summary" id="method-summary">
-<h2>Method Summary</h2>
-<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button></div>
-<div id="method-summary-table.tabpanel" role="tabpanel">
-<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#bind(java.lang.String,java.lang.Object)" class="member-name-link">bind</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;value)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Binds an argument to a named parameter.</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;T&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#result()" class="member-name-link">result</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes a query and return the result as <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a></div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#singleResult()" class="member-name-link">singleResult</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Returns the result as a single element otherwise it will return an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html#empty()" title="class or interface in java.util" class="external-link"><code>Optional.empty()</code></a></div>
-</div>
-</div>
-</div>
-</div>
-</section>
-</li>
-</ul>
-</section>
-<section class="details">
-<ul class="details-list">
-<!-- ============ METHOD DETAIL ========== -->
-<li>
-<section class="method-details" id="method-detail">
-<h2>Method Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="bind(java.lang.String,java.lang.Object)">
-<h3>bind</h3>
-<div class="member-signature"><span class="return-type"><a href="PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></span>&nbsp;<span class="element-name">bind</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;value)</span></div>
-<div class="block">Binds an argument to a named parameter.</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>name</code> - the parameter name</dd>
-<dd><code>value</code> - the parameter value</dd>
-<dt>Returns:</dt>
-<dd>the same query instance</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when there is null parameter</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="result()">
-<h3>result</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;T&gt;</span>&nbsp;<span class="element-name">result</span>()</div>
-<div class="block">Executes a query and return the result as <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a></div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the type</dd>
-<dt>Returns:</dt>
-<dd>The result stream, if delete it will return an empty stream</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="singleResult()">
-<h3>singleResult</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</span>&nbsp;<span class="element-name">singleResult</span>()</div>
-<div class="block">Returns the result as a single element otherwise it will return an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html#empty()" title="class or interface in java.util" class="external-link"><code>Optional.empty()</code></a></div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the type</dd>
-<dt>Returns:</dt>
-<dd>the single result</dd>
-</dl>
-</section>
-</li>
-</ul>
-</section>
-</li>
-</ul>
-</section>
-<!-- ========= END OF CLASS DATA ========= -->
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteFrom.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteFrom.html
index b87c30a..8facb62 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteFrom.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteFrom.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperDeleteFrom (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperDeleteFrom (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperDeleteFrom">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,12 +93,12 @@ <h1 title="Interface QueryMapper.MapperDeleteFrom" class="title">Interface Query
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperDeleteFrom</span><span class="extends-implements">
 extends <a href="QueryMapper.MapperDeleteQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteQueryBuild</a></span></div>
-<div class="block">Represents the first step in the delete query fluent API</div>
+<div class="block">Represents the first step in the delete query fluent API.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -103,7 +116,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#where(java.lang.String)" class="member-name-link">where</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Starts a new delete condition by a column name</div>
+<div class="block">Starts a new delete condition by specifying a column name.</div>
 </div>
 </div>
 </div>
@@ -126,7 +139,7 @@ <h2>Method Details</h2>
 <section class="detail" id="where(java.lang.String)">
 <h3>where</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></span>&nbsp;<span class="element-name">where</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</span></div>
-<div class="block">Starts a new delete condition by a column name</div>
+<div class="block">Starts a new delete condition by specifying a column name.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>name</code> - the column name</dd>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html
index c89e149..15b4a69 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperDeleteNameCondition (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperDeleteNameCondition (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperDeleteNameCondition">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,11 +93,11 @@ <h1 title="Interface QueryMapper.MapperDeleteNameCondition" class="title">Interf
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperDeleteNameCondition</span></div>
-<div class="block">Represents a delete condition based on a column name</div>
+<div class="block">Represents a delete condition based on a column name.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -103,47 +116,47 @@ <h2>Method Summary</h2>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#between(T,T)" class="member-name-link">between</a><wbr>(T&nbsp;valueA,
  T&nbsp;valueB)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a delete condition where the column name provided is between the provided values</div>
+<div class="block">Creates a delete condition where the specified column name is between the provided values.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#eq(T)" class="member-name-link">eq</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a delete condition where the column name provided is equal to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name equals the provided value.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#gt(T)" class="member-name-link">gt</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a delete condition where the column name provided is greater than to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is greater than the provided value.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#gte(T)" class="member-name-link">gte</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a delete condition where the column name provided is greater than or equal to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is greater than or equal to the provided value.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#in(java.lang.Iterable)" class="member-name-link">in</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;values)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a delete condition where the column name provided is in the provided iterable values</div>
+<div class="block">Creates a delete condition where the specified column name is in the provided iterable values.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#like(java.lang.String)" class="member-name-link">like</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;value)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a delete condition where the column name provided is like to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is like the provided value.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#lt(T)" class="member-name-link">lt</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a delete condition where the column name provided is less than the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is less than the provided value.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#lte(T)" class="member-name-link">lte</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a delete condition where the column name provided is less than or equal to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is less than or equal to the provided value.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperDeleteNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNotCondition</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#not()" class="member-name-link">not</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a NOT delete condition for the column name provided</div>
+<div class="block">Creates a NOT delete condition for the specified column name.</div>
 </div>
 </div>
 </div>
@@ -163,12 +176,12 @@ <h2>Method Details</h2>
 <section class="detail" id="eq(T)">
 <h3 id="eq(java.lang.Object)">eq</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></span>&nbsp;<span class="element-name">eq</span><wbr><span class="parameters">(T&nbsp;value)</span></div>
-<div class="block">Creates a delete condition where the column name provided is equal to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name equals the provided value.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>value</code> - the value to the condition</dd>
+<dd><code>value</code> - the value for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperDeleteWhere</code></a></dd>
 <dt>Throws:</dt>
@@ -180,10 +193,10 @@ <h3 id="eq(java.lang.Object)">eq</h3>
 <section class="detail" id="like(java.lang.String)">
 <h3>like</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></span>&nbsp;<span class="element-name">like</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;value)</span></div>
-<div class="block">Creates a delete condition where the column name provided is like to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is like the provided value.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>value</code> - the value to the condition</dd>
+<dd><code>value</code> - the value for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperDeleteWhere</code></a></dd>
 <dt>Throws:</dt>
@@ -195,12 +208,12 @@ <h3>like</h3>
 <section class="detail" id="gt(T)">
 <h3 id="gt(java.lang.Object)">gt</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></span>&nbsp;<span class="element-name">gt</span><wbr><span class="parameters">(T&nbsp;value)</span></div>
-<div class="block">Creates a delete condition where the column name provided is greater than to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is greater than the provided value.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>value</code> - the value to the condition</dd>
+<dd><code>value</code> - the value for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperDeleteWhere</code></a></dd>
 <dt>Throws:</dt>
@@ -212,12 +225,12 @@ <h3 id="gt(java.lang.Object)">gt</h3>
 <section class="detail" id="gte(T)">
 <h3 id="gte(java.lang.Object)">gte</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></span>&nbsp;<span class="element-name">gte</span><wbr><span class="parameters">(T&nbsp;value)</span></div>
-<div class="block">Creates a delete condition where the column name provided is greater than or equal to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is greater than or equal to the provided value.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>value</code> - the value to the condition</dd>
+<dd><code>value</code> - the value for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperDeleteWhere</code></a></dd>
 <dt>Throws:</dt>
@@ -229,12 +242,12 @@ <h3 id="gte(java.lang.Object)">gte</h3>
 <section class="detail" id="lt(T)">
 <h3 id="lt(java.lang.Object)">lt</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></span>&nbsp;<span class="element-name">lt</span><wbr><span class="parameters">(T&nbsp;value)</span></div>
-<div class="block">Creates a delete condition where the column name provided is less than the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is less than the provided value.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>value</code> - the value to the condition</dd>
+<dd><code>value</code> - the value for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperDeleteWhere</code></a></dd>
 <dt>Throws:</dt>
@@ -246,12 +259,12 @@ <h3 id="lt(java.lang.Object)">lt</h3>
 <section class="detail" id="lte(T)">
 <h3 id="lte(java.lang.Object)">lte</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></span>&nbsp;<span class="element-name">lte</span><wbr><span class="parameters">(T&nbsp;value)</span></div>
-<div class="block">Creates a delete condition where the column name provided is less than or equal to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is less than or equal to the provided value.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>value</code> - the value to the condition</dd>
+<dd><code>value</code> - the value for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperDeleteWhere</code></a></dd>
 <dt>Throws:</dt>
@@ -264,17 +277,17 @@ <h3 id="lte(java.lang.Object)">lte</h3>
 <h3 id="between(java.lang.Object,java.lang.Object)">between</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></span>&nbsp;<span class="element-name">between</span><wbr><span class="parameters">(T&nbsp;valueA,
  T&nbsp;valueB)</span></div>
-<div class="block">Creates a delete condition where the column name provided is between the provided values</div>
+<div class="block">Creates a delete condition where the specified column name is between the provided values.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>valueA</code> - the values within a given range</dd>
-<dd><code>valueB</code> - the values within a given range</dd>
+<dd><code>valueA</code> - the lower bound of the range</dd>
+<dd><code>valueB</code> - the upper bound of the range</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperDeleteWhere</code></a></dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when either valueA or valueB are null</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when either valueA or valueB is null</dd>
 </dl>
 </section>
 </li>
@@ -282,16 +295,16 @@ <h3 id="between(java.lang.Object,java.lang.Object)">between</h3>
 <section class="detail" id="in(java.lang.Iterable)">
 <h3>in</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></span>&nbsp;<span class="element-name">in</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;values)</span></div>
-<div class="block">Creates a delete condition where the column name provided is in the provided iterable values</div>
+<div class="block">Creates a delete condition where the specified column name is in the provided iterable values.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>values</code> - the values</dd>
+<dd><code>values</code> - the values for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperDeleteWhere</code></a></dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when value is null</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when values is null</dd>
 </dl>
 </section>
 </li>
@@ -299,7 +312,7 @@ <h3>in</h3>
 <section class="detail" id="not()">
 <h3>not</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperDeleteNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNotCondition</a></span>&nbsp;<span class="element-name">not</span>()</div>
-<div class="block">Creates a NOT delete condition for the column name provided</div>
+<div class="block">Creates a NOT delete condition for the specified column name.</div>
 <dl class="notes">
 <dt>Returns:</dt>
 <dd><a href="QueryMapper.MapperDeleteNotCondition.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperDeleteNotCondition</code></a></dd>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNotCondition.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNotCondition.html
index a7c9e63..2af043e 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNotCondition.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNotCondition.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperDeleteNotCondition (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperDeleteNotCondition (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperDeleteNotCondition">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -36,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -53,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -76,12 +93,12 @@ <h1 title="Interface QueryMapper.MapperDeleteNotCondition" class="title">Interfa
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperDeleteNotCondition</span><span class="extends-implements">
 extends <a href="QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></span></div>
-<div class="block">Represents a NOT delete condition in the delete query fluent API</div>
+<div class="block">Represents a NOT delete condition in the delete query fluent API.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteQueryBuild.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteQueryBuild.html
index f05ad8d..f6ac656 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteQueryBuild.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteQueryBuild.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperDeleteQueryBuild (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperDeleteQueryBuild (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperDeleteQueryBuild">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,11 +93,11 @@ <h1 title="Interface QueryMapper.MapperDeleteQueryBuild" class="title">Interface
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperDeleteQueryBuild</span></div>
-<div class="block">Represents the last step of the delete query fluent API execution</div>
+<div class="block">Represents the last step of the delete query fluent API execution.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -102,7 +115,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#execute()" class="member-name-link">execute</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes the query</div>
+<div class="block">Executes the query.</div>
 </div>
 </div>
 </div>
@@ -122,7 +135,14 @@ <h2>Method Details</h2>
 <section class="detail" id="execute()">
 <h3>execute</h3>
 <div class="member-signature"><span class="return-type">void</span>&nbsp;<span class="element-name">execute</span>()</div>
-<div class="block">Executes the query</div>
+<div class="block">Executes the query.</div>
+<dl class="notes">
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - If a NoSQL database does not support a specific operation or if the
+                                       database does not support certain query conditions, an exception will be raised. For example, a wide-column
+                                       may not support the OR operator, or a document database may not support the BETWEEN operator.
+                                       The level of NoSQL database support for various conditions may vary depending on the database provider.</dd>
+</dl>
 </section>
 </li>
 </ul>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteWhere.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteWhere.html
index 1aab3cd..2faf8e0 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteWhere.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteWhere.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperDeleteWhere (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperDeleteWhere (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperDeleteWhere">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,12 +93,13 @@ <h1 title="Interface QueryMapper.MapperDeleteWhere" class="title">Interface Quer
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperDeleteWhere</span><span class="extends-implements">
 extends <a href="QueryMapper.MapperDeleteQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteQueryBuild</a></span></div>
-<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction adding one more delete condition or end up performing the built query</div>
+<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction,
+ add one more delete condition, or end up performing the built query.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -103,12 +117,12 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#and(java.lang.String)" class="member-name-link">and</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Create a new delete condition performing logical conjunction (AND) by giving a column name</div>
+<div class="block">Create a new delete condition performing logical conjunction (AND) by specifying a column name.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#or(java.lang.String)" class="member-name-link">or</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Create a new delete condition performing logical disjunction (OR) by giving a column name</div>
+<div class="block">Create a new delete condition performing logical disjunction (OR) by specifying a column name.</div>
 </div>
 </div>
 </div>
@@ -131,7 +145,7 @@ <h2>Method Details</h2>
 <section class="detail" id="and(java.lang.String)">
 <h3>and</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></span>&nbsp;<span class="element-name">and</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</span></div>
-<div class="block">Create a new delete condition performing logical conjunction (AND) by giving a column name</div>
+<div class="block">Create a new delete condition performing logical conjunction (AND) by specifying a column name.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>name</code> - the column name</dd>
@@ -146,7 +160,7 @@ <h3>and</h3>
 <section class="detail" id="or(java.lang.String)">
 <h3>or</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></span>&nbsp;<span class="element-name">or</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</span></div>
-<div class="block">Create a new delete condition performing logical disjunction (OR) by giving a column name</div>
+<div class="block">Create a new delete condition performing logical disjunction (OR) by specifying a column name.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>name</code> - the column name</dd>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html
index 2e9357e..8405a58 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperFrom.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperFrom (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperFrom (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperFrom">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,12 +93,12 @@ <h1 title="Interface QueryMapper.MapperFrom" class="title">Interface QueryMapper
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperFrom</span><span class="extends-implements">
 extends <a href="QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></span></div>
-<div class="block">Represents the first step in the query fluent API</div>
+<div class="block">Represents the first step in the query fluent API.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -108,7 +121,7 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#orderBy(java.lang.String)" class="member-name-link">orderBy</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Add the order how the result will return</div>
+<div class="block">Add the order how the result will return based on a given column name.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperSkip.html" title="interface in jakarta.nosql">QueryMapper.MapperSkip</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#skip(long)" class="member-name-link">skip</a><wbr>(long&nbsp;skip)</code></div>
@@ -118,7 +131,7 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#where(java.lang.String)" class="member-name-link">where</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Starts a new condition by given a column name</div>
+<div class="block">Starts a new condition by specifying a column name.</div>
 </div>
 </div>
 </div>
@@ -141,7 +154,7 @@ <h2>Method Details</h2>
 <section class="detail" id="where(java.lang.String)">
 <h3>where</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></span>&nbsp;<span class="element-name">where</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</span></div>
-<div class="block">Starts a new condition by given a column name</div>
+<div class="block">Starts a new condition by specifying a column name.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>name</code> - the column name</dd>
@@ -161,7 +174,9 @@ <h3>skip</h3>
 <dt>Parameters:</dt>
 <dd><code>skip</code> - the first result to retrieve</dd>
 <dt>Returns:</dt>
-<dd>a query with first result defined</dd>
+<dd>a query with the first result defined</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - when skip is negative</dd>
 </dl>
 </section>
 </li>
@@ -175,6 +190,8 @@ <h3>limit</h3>
 <dd><code>limit</code> - the limit</dd>
 <dt>Returns:</dt>
 <dd>a query with the limit defined</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - when limit is negative</dd>
 </dl>
 </section>
 </li>
@@ -182,10 +199,10 @@ <h3>limit</h3>
 <section class="detail" id="orderBy(java.lang.String)">
 <h3>orderBy</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></span>&nbsp;<span class="element-name">orderBy</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</span></div>
-<div class="block">Add the order how the result will return</div>
+<div class="block">Add the order how the result will return based on a given column name.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>name</code> - the name to be ordered</dd>
+<dd><code>name</code> - the column name to be ordered</dd>
 <dt>Returns:</dt>
 <dd>a query with the sort defined</dd>
 <dt>Throws:</dt>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperLimit.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperLimit.html
index 19db6bc..4f796ea 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperLimit.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperLimit.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperLimit (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperLimit (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperLimit">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,12 +93,12 @@ <h1 title="Interface QueryMapper.MapperLimit" class="title">Interface QueryMappe
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperLimit</span><span class="extends-implements">
 extends <a href="QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></span></div>
-<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -131,7 +144,9 @@ <h3>skip</h3>
 <dt>Parameters:</dt>
 <dd><code>skip</code> - the number of elements to skip</dd>
 <dt>Returns:</dt>
-<dd>a query with first result defined</dd>
+<dd>a query with the first result defined</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - when skip is negative</dd>
 </dl>
 </section>
 </li>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html
index 1698955..fbae92d 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameCondition.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperNameCondition (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperNameCondition (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperNameCondition">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,11 +93,11 @@ <h1 title="Interface QueryMapper.MapperNameCondition" class="title">Interface Qu
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperNameCondition</span></div>
-<div class="block">Represents a condition based on a column name</div>
+<div class="block">Represents a condition based on a column name.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -103,47 +116,47 @@ <h2>Method Summary</h2>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#between(T,T)" class="member-name-link">between</a><wbr>(T&nbsp;valueA,
  T&nbsp;valueB)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a condition where the column name provided is between the provided values</div>
+<div class="block">Creates a condition where the specified column name is between the provided values.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#eq(T)" class="member-name-link">eq</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a condition where the column name provided is equal to the provided value</div>
+<div class="block">Creates a condition where the specified column name equals the provided value.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#gt(T)" class="member-name-link">gt</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a condition where the column name provided is greater than to the provided value</div>
+<div class="block">Creates a condition where the specified column name is greater than the provided value.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#gte(T)" class="member-name-link">gte</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a condition where the column name provided is greater than or equal to the provided value</div>
+<div class="block">Creates a condition where the specified column name is greater than or equal to the provided value.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#in(java.lang.Iterable)" class="member-name-link">in</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;values)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a condition where the column name provided is in the provided iterable values</div>
+<div class="block">Creates a condition where the specified column name is in the provided iterable values.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#like(java.lang.String)" class="member-name-link">like</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;value)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a condition where the column name provided is like to the provided value</div>
+<div class="block">Creates a condition where the specified column name is like the provided value.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#lt(T)" class="member-name-link">lt</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a condition where the column name provided is less than the provided value</div>
+<div class="block">Creates a condition where the specified column name is less than the provided value.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#lte(T)" class="member-name-link">lte</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a condition where the column name provided is less than or equal to the provided value</div>
+<div class="block">Creates a condition where the specified column name is less than or equal to the provided value.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNotCondition</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#not()" class="member-name-link">not</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a NOT condition for the column name provided.</div>
+<div class="block">Creates a NOT condition for the specified column name.</div>
 </div>
 </div>
 </div>
@@ -163,12 +176,12 @@ <h2>Method Details</h2>
 <section class="detail" id="eq(T)">
 <h3 id="eq(java.lang.Object)">eq</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></span>&nbsp;<span class="element-name">eq</span><wbr><span class="parameters">(T&nbsp;value)</span></div>
-<div class="block">Creates a condition where the column name provided is equal to the provided value</div>
+<div class="block">Creates a condition where the specified column name equals the provided value.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>value</code> - the value to the condition</dd>
+<dd><code>value</code> - the value for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperWhere</code></a></dd>
 <dt>Throws:</dt>
@@ -180,10 +193,10 @@ <h3 id="eq(java.lang.Object)">eq</h3>
 <section class="detail" id="like(java.lang.String)">
 <h3>like</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></span>&nbsp;<span class="element-name">like</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;value)</span></div>
-<div class="block">Creates a condition where the column name provided is like to the provided value</div>
+<div class="block">Creates a condition where the specified column name is like the provided value.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>value</code> - the value to the condition</dd>
+<dd><code>value</code> - the value for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperWhere</code></a></dd>
 <dt>Throws:</dt>
@@ -195,12 +208,12 @@ <h3>like</h3>
 <section class="detail" id="gt(T)">
 <h3 id="gt(java.lang.Object)">gt</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></span>&nbsp;<span class="element-name">gt</span><wbr><span class="parameters">(T&nbsp;value)</span></div>
-<div class="block">Creates a condition where the column name provided is greater than to the provided value</div>
+<div class="block">Creates a condition where the specified column name is greater than the provided value.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>value</code> - the value to the condition</dd>
+<dd><code>value</code> - the value for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperWhere</code></a></dd>
 <dt>Throws:</dt>
@@ -212,12 +225,12 @@ <h3 id="gt(java.lang.Object)">gt</h3>
 <section class="detail" id="gte(T)">
 <h3 id="gte(java.lang.Object)">gte</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></span>&nbsp;<span class="element-name">gte</span><wbr><span class="parameters">(T&nbsp;value)</span></div>
-<div class="block">Creates a condition where the column name provided is greater than or equal to the provided value</div>
+<div class="block">Creates a condition where the specified column name is greater than or equal to the provided value.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>value</code> - the value to the condition</dd>
+<dd><code>value</code> - the value for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperWhere</code></a></dd>
 <dt>Throws:</dt>
@@ -229,12 +242,12 @@ <h3 id="gte(java.lang.Object)">gte</h3>
 <section class="detail" id="lt(T)">
 <h3 id="lt(java.lang.Object)">lt</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></span>&nbsp;<span class="element-name">lt</span><wbr><span class="parameters">(T&nbsp;value)</span></div>
-<div class="block">Creates a condition where the column name provided is less than the provided value</div>
+<div class="block">Creates a condition where the specified column name is less than the provided value.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>value</code> - the value to the condition</dd>
+<dd><code>value</code> - the value for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperWhere</code></a></dd>
 <dt>Throws:</dt>
@@ -246,12 +259,12 @@ <h3 id="lt(java.lang.Object)">lt</h3>
 <section class="detail" id="lte(T)">
 <h3 id="lte(java.lang.Object)">lte</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></span>&nbsp;<span class="element-name">lte</span><wbr><span class="parameters">(T&nbsp;value)</span></div>
-<div class="block">Creates a condition where the column name provided is less than or equal to the provided value</div>
+<div class="block">Creates a condition where the specified column name is less than or equal to the provided value.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>value</code> - the value to the condition</dd>
+<dd><code>value</code> - the value for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperWhere</code></a></dd>
 <dt>Throws:</dt>
@@ -264,17 +277,17 @@ <h3 id="lte(java.lang.Object)">lte</h3>
 <h3 id="between(java.lang.Object,java.lang.Object)">between</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></span>&nbsp;<span class="element-name">between</span><wbr><span class="parameters">(T&nbsp;valueA,
  T&nbsp;valueB)</span></div>
-<div class="block">Creates a condition where the column name provided is between the provided values</div>
+<div class="block">Creates a condition where the specified column name is between the provided values.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>valueA</code> - the values within a given range</dd>
-<dd><code>valueB</code> - the values within a given range</dd>
+<dd><code>valueA</code> - the lower bound of the range</dd>
+<dd><code>valueB</code> - the upper bound of the range</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperWhere</code></a></dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when either valueA or valueB are null</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when either valueA or valueB is null</dd>
 </dl>
 </section>
 </li>
@@ -282,16 +295,16 @@ <h3 id="between(java.lang.Object,java.lang.Object)">between</h3>
 <section class="detail" id="in(java.lang.Iterable)">
 <h3>in</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></span>&nbsp;<span class="element-name">in</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;values)</span></div>
-<div class="block">Creates a condition where the column name provided is in the provided iterable values</div>
+<div class="block">Creates a condition where the specified column name is in the provided iterable values.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the type</dd>
 <dt>Parameters:</dt>
-<dd><code>values</code> - the values</dd>
+<dd><code>values</code> - the values for the condition</dd>
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperWhere</code></a></dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when value is null</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when values is null</dd>
 </dl>
 </section>
 </li>
@@ -299,7 +312,7 @@ <h3>in</h3>
 <section class="detail" id="not()">
 <h3>not</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNotCondition</a></span>&nbsp;<span class="element-name">not</span>()</div>
-<div class="block">Creates a NOT condition for the column name provided.</div>
+<div class="block">Creates a NOT condition for the specified column name.</div>
 <dl class="notes">
 <dt>Returns:</dt>
 <dd><a href="QueryMapper.MapperNotCondition.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperNotCondition</code></a></dd>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameOrder.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameOrder.html
index 030fa96..01a425f 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameOrder.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNameOrder.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperNameOrder (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperNameOrder (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperNameOrder">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,18 +93,12 @@ <h1 title="Interface QueryMapper.MapperNameOrder" class="title">Interface QueryM
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperNameOrder</span><span class="extends-implements">
 extends <a href="QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></span></div>
-<div class="block">Represents the step in the query fluent API where it's possible to:
- <ul>
-     <li>define the order of the results</li>
-     <li>or define the position of the first result</li>
-     <li>or define the maximum number of results to retrieve</li>
-     <li>or to perform the query execution</li>
- </ul></div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -114,7 +121,7 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#orderBy(java.lang.String)" class="member-name-link">orderBy</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Add the order of how the result will return based on a given column name</div>
+<div class="block">Add the order of how the result will return based on a given column name.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperSkip.html" title="interface in jakarta.nosql">QueryMapper.MapperSkip</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#skip(long)" class="member-name-link">skip</a><wbr>(long&nbsp;skip)</code></div>
@@ -142,7 +149,7 @@ <h2>Method Details</h2>
 <section class="detail" id="orderBy(java.lang.String)">
 <h3>orderBy</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></span>&nbsp;<span class="element-name">orderBy</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</span></div>
-<div class="block">Add the order of how the result will return based on a given column name</div>
+<div class="block">Add the order of how the result will return based on a given column name.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>name</code> - the column name to be ordered</dd>
@@ -162,7 +169,7 @@ <h3>skip</h3>
 <dt>Parameters:</dt>
 <dd><code>skip</code> - the first result to retrieve</dd>
 <dt>Returns:</dt>
-<dd>a query with first result defined</dd>
+<dd>a query with the first result defined</dd>
 </dl>
 </section>
 </li>
@@ -176,6 +183,8 @@ <h3>limit</h3>
 <dd><code>limit</code> - the limit</dd>
 <dt>Returns:</dt>
 <dd>a query with the limit defined</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - when limit is negative</dd>
 </dl>
 </section>
 </li>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNotCondition.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNotCondition.html
index de8c5b5..d6b741d 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNotCondition.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperNotCondition.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperNotCondition (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperNotCondition (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperNotCondition">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -36,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -53,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -76,12 +93,12 @@ <h1 title="Interface QueryMapper.MapperNotCondition" class="title">Interface Que
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperNotCondition</span><span class="extends-implements">
 extends <a href="QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></span></div>
-<div class="block">Represents a NOT condition in the delete query fluent API</div>
+<div class="block">Represents a NOT condition in the delete query fluent API.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html
index 439786e..bf833d8 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperOrder.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperOrder (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperOrder (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperOrder">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -76,11 +89,11 @@ <h1 title="Interface QueryMapper.MapperOrder" class="title">Interface QueryMappe
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperOrder</span></div>
-<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -98,12 +111,12 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#asc()" class="member-name-link">asc</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Defines the order ascending</div>
+<div class="block">Defines the order as ascending.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#desc()" class="member-name-link">desc</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Defines the order as descending</div>
+<div class="block">Defines the order as descending.</div>
 </div>
 </div>
 </div>
@@ -123,7 +136,7 @@ <h2>Method Details</h2>
 <section class="detail" id="asc()">
 <h3>asc</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></span>&nbsp;<span class="element-name">asc</span>()</div>
-<div class="block">Defines the order ascending</div>
+<div class="block">Defines the order as ascending.</div>
 <dl class="notes">
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperNameOrder</code></a> instance</dd>
@@ -134,7 +147,7 @@ <h3>asc</h3>
 <section class="detail" id="desc()">
 <h3>desc</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></span>&nbsp;<span class="element-name">desc</span>()</div>
-<div class="block">Defines the order as descending</div>
+<div class="block">Defines the order as descending.</div>
 <dl class="notes">
 <dt>Returns:</dt>
 <dd>the <a href="QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql"><code>QueryMapper.MapperNameOrder</code></a> instance</dd>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html
index f74274d..2659706 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperQueryBuild.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperQueryBuild (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperQueryBuild (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperQueryBuild">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,11 +93,11 @@ <h1 title="Interface QueryMapper.MapperQueryBuild" class="title">Interface Query
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperQueryBuild</span></div>
-<div class="block">Represents the last step of the query fluent API execution</div>
+<div class="block">Represents the last step of the query fluent API execution.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -99,20 +112,20 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;T&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;T&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#result()" class="member-name-link">result</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes the query and it returns as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link"><code>List</code></a></div>
+<div class="block">Executes the query and returns the result as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link"><code>List</code></a>.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;T&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#singleResult()" class="member-name-link">singleResult</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes the query and returns the result as a single element otherwise it will return an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html#empty()" title="class or interface in java.util" class="external-link"><code>Optional.empty()</code></a></div>
+<div class="block">Executes the query and returns the result as a single element, wrapped in an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link"><code>Optional</code></a>.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;T&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a><wbr>&lt;T&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#stream()" class="member-name-link">stream</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes the query and it returns as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a></div>
+<div class="block">Executes the query and returns the result as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a>.</div>
 </div>
 </div>
 </div>
@@ -132,12 +145,17 @@ <h2>Method Details</h2>
 <section class="detail" id="result()">
 <h3>result</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;T&gt;</span>&nbsp;<span class="element-name">result</span>()</div>
-<div class="block">Executes the query and it returns as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link"><code>List</code></a></div>
+<div class="block">Executes the query and returns the result as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link"><code>List</code></a>.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the entity type</dd>
 <dt>Returns:</dt>
 <dd>the result of the query</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - If a NoSQL database does not support a specific operation or if the
+                                       database does not support certain query conditions, an exception will be raised. For example, a wide-column
+                                       may not support the OR operator, or a document database may not support the BETWEEN operator.
+                                       The level of NoSQL database support for various conditions may vary depending on the database provider.</dd>
 </dl>
 </section>
 </li>
@@ -145,12 +163,17 @@ <h3>result</h3>
 <section class="detail" id="stream()">
 <h3>stream</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;T&gt;</span>&nbsp;<span class="element-name">stream</span>()</div>
-<div class="block">Executes the query and it returns as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a></div>
+<div class="block">Executes the query and returns the result as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a>.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the entity type</dd>
 <dt>Returns:</dt>
 <dd>the result of the query</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - If a NoSQL database does not support a specific operation or if the
+                                       database does not support certain query conditions, an exception will be raised. For example, a wide-column
+                                       may not support the OR operator, or a document database may not support the BETWEEN operator.
+                                       The level of NoSQL database support for various conditions may vary depending on the database provider.</dd>
 </dl>
 </section>
 </li>
@@ -158,12 +181,23 @@ <h3>stream</h3>
 <section class="detail" id="singleResult()">
 <h3>singleResult</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</span>&nbsp;<span class="element-name">singleResult</span>()</div>
-<div class="block">Executes the query and returns the result as a single element otherwise it will return an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html#empty()" title="class or interface in java.util" class="external-link"><code>Optional.empty()</code></a></div>
+<div class="block">Executes the query and returns the result as a single element, wrapped in an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link"><code>Optional</code></a>.
+ If the query returns exactly one result, that result is returned in the Optional.
+ If no result is found, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html#empty()" title="class or interface in java.util" class="external-link"><code>Optional.empty()</code></a> is returned.
+ If more than one result is found, an exception specific to the Jakarta NoSQL provider may be thrown.
+
+ <p>Use this method when expecting a single result from a query. It provides a safe way to handle the case
+ where zero or one result is expected, while also allowing for exceptional cases where multiple results are returned.</p></div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
+<dd><code>T</code> - the type of the entity being queried</dd>
 <dt>Returns:</dt>
-<dd>the result of the query that may have one or empty result</dd>
+<dd>an Optional containing the single result of the query, if present, or empty if no result is found</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - If a NoSQL database does not support a specific operation or if the
+                                       database does not support certain query conditions, an exception will be raised. For example, a wide-column
+                                       may not support the OR operator, or a document database may not support the BETWEEN operator.
+                                       The level of NoSQL database support for various conditions may vary depending on the database provider.</dd>
 </dl>
 </section>
 </li>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperSkip.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperSkip.html
index 7e3d528..850fe57 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperSkip.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperSkip.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperSkip (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperSkip (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperSkip">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,12 +93,12 @@ <h1 title="Interface QueryMapper.MapperSkip" class="title">Interface QueryMapper
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperSkip</span><span class="extends-implements">
 extends <a href="QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></span></div>
-<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html
index 5b8db85..2d0531d 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper.MapperWhere (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper.MapperWhere (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperWhere">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,19 +93,19 @@ <h1 title="Interface QueryMapper.MapperWhere" class="title">Interface QueryMappe
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></dd>
+<dd><code><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name type-name-label">QueryMapper.MapperWhere</span><span class="extends-implements">
 extends <a href="QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></span></div>
 <div class="block">Represents a step where it's possible to:
  <ul>
-     <li>Create a new condition performing logical conjunction (AND) by giving a column name</li>
-     <li>Or create a new condition performing logical disjunction (OR) by giving a column name</li>
-     <li>Or define the position of the first result</li>
-     <li>Or define the maximum number of results to retrieve</li>
-     <li>Or define the order of the results</li>
-     <li>Or to perform the query execution</li>
+     <li>Create a new condition performing logical conjunction (AND) by specifying a column name</li>
+     <li>Create a new condition performing logical disjunction (OR) by specifying a column name</li>
+     <li>Define the position of the first result</li>
+     <li>Define the maximum number of results to retrieve</li>
+     <li>Define the order of the results</li>
+     <li>Perform the query execution</li>
  </ul></div>
 </section>
 <section class="summary">
@@ -111,7 +124,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#and(java.lang.String)" class="member-name-link">and</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Create a new condition performing logical conjunction (AND) by giving a column name</div>
+<div class="block">Create a new condition performing logical conjunction (AND) by specifying a column name.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperLimit.html" title="interface in jakarta.nosql">QueryMapper.MapperLimit</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#limit(long)" class="member-name-link">limit</a><wbr>(long&nbsp;limit)</code></div>
@@ -121,12 +134,12 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#or(java.lang.String)" class="member-name-link">or</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Create a new condition performing logical disjunction (OR) by giving a column name</div>
+<div class="block">Create a new condition performing logical disjunction (OR) by specifying a column name.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#orderBy(java.lang.String)" class="member-name-link">orderBy</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Add the order how the result will return</div>
+<div class="block">Add the order how the result will return.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="QueryMapper.MapperSkip.html" title="interface in jakarta.nosql">QueryMapper.MapperSkip</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#skip(long)" class="member-name-link">skip</a><wbr>(long&nbsp;skip)</code></div>
@@ -154,7 +167,7 @@ <h2>Method Details</h2>
 <section class="detail" id="and(java.lang.String)">
 <h3>and</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></span>&nbsp;<span class="element-name">and</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</span></div>
-<div class="block">Create a new condition performing logical conjunction (AND) by giving a column name</div>
+<div class="block">Create a new condition performing logical conjunction (AND) by specifying a column name.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>name</code> - the column name</dd>
@@ -169,7 +182,7 @@ <h3>and</h3>
 <section class="detail" id="or(java.lang.String)">
 <h3>or</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></span>&nbsp;<span class="element-name">or</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</span></div>
-<div class="block">Create a new condition performing logical disjunction (OR) by giving a column name</div>
+<div class="block">Create a new condition performing logical disjunction (OR) by specifying a column name.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>name</code> - the column name</dd>
@@ -189,7 +202,7 @@ <h3>skip</h3>
 <dt>Parameters:</dt>
 <dd><code>skip</code> - the first result to retrieve</dd>
 <dt>Returns:</dt>
-<dd>a query with first result defined</dd>
+<dd>a query with the first result defined</dd>
 </dl>
 </section>
 </li>
@@ -210,7 +223,7 @@ <h3>limit</h3>
 <section class="detail" id="orderBy(java.lang.String)">
 <h3>orderBy</h3>
 <div class="member-signature"><span class="return-type"><a href="QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></span>&nbsp;<span class="element-name">orderBy</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</span></div>
-<div class="block">Add the order how the result will return</div>
+<div class="block">Add the order how the result will return.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>name</code> - the name to order</dd>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.html b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.html
index 0bb029f..e3a6071 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/QueryMapper.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>QueryMapper (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>QueryMapper (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -36,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li>Constr</li>
+<li>Method</li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -53,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,7 +89,23 @@ <h1 title="Interface QueryMapper" class="title">Interface QueryMapper</h1>
 <section class="class-description" id="class-description">
 <hr>
 <div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">QueryMapper</span></div>
-<div class="block">This interface holds the interfaces that compose the Fluent API for selecting and deleting NoSQL entities.</div>
+<div class="block">This interface defines the Fluent API for selecting and deleting NoSQL entities.
+ The query API provides a way to define queries using a fluent API.
+ It's important to check the compatibility of the database to see if it supports the query API.
+ For example, Key-Value databases typically do not support the query API.
+ Additionally, not all methods in the query API may be supported by all databases.
+ For instance, a document database may not support the "between" method.</div>
+<dl class="notes">
+<dt>Since:</dt>
+<dd>1.0.0</dd>
+<dt>See Also:</dt>
+<dd>
+<ul class="tag-list">
+<li><a href="Template.html#select(java.lang.Class)"><code>Template.select(Class)</code></a></li>
+<li><a href="Template.html#delete(java.lang.Class)"><code>Template.delete(Class)</code></a></li>
+</ul>
+</dd>
+</dl>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -88,85 +121,80 @@ <h2>Nested Class Summary</h2>
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="QueryMapper.MapperDeleteFrom.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteFrom</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">Represents the first step in the delete query fluent API</div>
+<div class="block">Represents the first step in the delete query fluent API.</div>
 </div>
 <div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second odd-row-color"><code><a href="QueryMapper.MapperDeleteNameCondition.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></code></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents a delete condition based on a column name</div>
+<div class="block">Represents a delete condition based on a column name.</div>
 </div>
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="QueryMapper.MapperDeleteNotCondition.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNotCondition</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">Represents a NOT delete condition in the delete query fluent API</div>
+<div class="block">Represents a NOT delete condition in the delete query fluent API.</div>
 </div>
 <div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second odd-row-color"><code><a href="QueryMapper.MapperDeleteQueryBuild.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteQueryBuild</a></code></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents the last step of the delete query fluent API execution</div>
+<div class="block">Represents the last step of the delete query fluent API execution.</div>
 </div>
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="QueryMapper.MapperDeleteWhere.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction adding one more delete condition or end up performing the built query</div>
+<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction,
+ add one more delete condition, or end up performing the built query.</div>
 </div>
 <div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second odd-row-color"><code><a href="QueryMapper.MapperFrom.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></code></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents the first step in the query fluent API</div>
+<div class="block">Represents the first step in the query fluent API.</div>
 </div>
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="QueryMapper.MapperLimit.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperLimit</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution.</div>
 </div>
 <div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second odd-row-color"><code><a href="QueryMapper.MapperNameCondition.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></code></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents a condition based on a column name</div>
+<div class="block">Represents a condition based on a column name.</div>
 </div>
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="QueryMapper.MapperNameOrder.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">Represents the step in the query fluent API where it's possible to:
- 
-     define the order of the results
-     or define the position of the first result
-     or define the maximum number of results to retrieve
-     or to perform the query execution
- </div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </div>
 <div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second odd-row-color"><code><a href="QueryMapper.MapperNotCondition.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperNotCondition</a></code></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents a NOT condition in the delete query fluent API</div>
+<div class="block">Represents a NOT condition in the delete query fluent API.</div>
 </div>
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="QueryMapper.MapperOrder.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </div>
 <div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second odd-row-color"><code><a href="QueryMapper.MapperQueryBuild.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></code></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents the last step of the query fluent API execution</div>
+<div class="block">Represents the last step of the query fluent API execution.</div>
 </div>
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="QueryMapper.MapperSkip.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperSkip</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution.</div>
 </div>
 <div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second odd-row-color"><code><a href="QueryMapper.MapperWhere.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-last odd-row-color">
 <div class="block">Represents a step where it's possible to:
  
-     Create a new condition performing logical conjunction (AND) by giving a column name
-     Or create a new condition performing logical disjunction (OR) by giving a column name
-     Or define the position of the first result
-     Or define the maximum number of results to retrieve
-     Or define the order of the results
-     Or to perform the query execution
+     Create a new condition performing logical conjunction (AND) by specifying a column name
+     Create a new condition performing logical disjunction (OR) by specifying a column name
+     Define the position of the first result
+     Define the maximum number of results to retrieve
+     Define the order of the results
+     Perform the query execution
  </div>
 </div>
 </div>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/Template.html b/javadoc/jakarta.nosql.core/jakarta/nosql/Template.html
index c225745..fab0ac2 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/Template.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/Template.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Template (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Template (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql, interface: Template">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="nav-bar-cell1-rev">Class</li>
@@ -40,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -57,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -74,16 +87,12 @@
 <h1 title="Interface Template" class="title">Interface Template</h1>
 </div>
 <section class="class-description" id="class-description">
-<dl class="notes">
-<dt>All Known Subinterfaces:</dt>
-<dd><code><a href="../../../jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html" title="interface in jakarta.nosql.column">ColumnTemplate</a></code>, <code><a href="../../../jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html" title="interface in jakarta.nosql.document">DocumentTemplate</a></code>, <code><a href="../../../jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></code></dd>
-</dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">Template</span></div>
-<div class="block">Templates are a helper class that increases productivity when performing common NoSQL operations.
+<div class="block"><code>Template</code> is a helper class that increases productivity when performing common NoSQL operations.
  The Template feature in Jakarta NoSQL simplifies the implementation of common database
  operations by providing a basic API to the underlying persistence engine.
- It follows the standard template pattern, a common design pattern used in software development.
+ It follows the standard DAO (Data Access Object) pattern, a common design pattern used in software development.
 
  <p>
  The Template pattern involves creating a skeletal structure for an algorithm, with some steps implemented and others left to be implemented by subclasses. Similarly, the
@@ -117,7 +126,8 @@ <h1 title="Interface Template" class="title">Interface Template</h1>
  template.delete(Book.class,id);
  </code></pre>
  <p>
- Furthermore, in CRUD operations, Template provides a fluent-API for either select or delete entities. Thus, Template offers the capability for search and remove beyond the ID
+ Furthermore, in CRUD (Create, Read, Update, Delete) operations, Template provides a fluent API for selecting,
+ deleting, and querying entities, offering the capability to search and remove beyond the ID
  attribute. Take a look at <a href="QueryMapper.html" title="interface in jakarta.nosql"><code>QueryMapper</code></a> for more detail about the provided fluent-API.
  </p>
  <pre><code>
@@ -154,9 +164,11 @@ <h1 title="Interface Template" class="title">Interface Template</h1>
 
  </code></pre></div>
 <dl class="notes">
+<dt>Since:</dt>
+<dd>1.0.0</dd>
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="QueryMapper.html" title="interface in jakarta.nosql"><code>QueryMapper</code></a></li>
 </ul>
 </dd>
@@ -178,7 +190,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperDeleteFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteFrom</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#delete(java.lang.Class)" class="member-name-link">delete</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">It starts a query builder using the fluent-API journey.</div>
+<div class="block">Start a query builder using the fluent API.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T,<wbr>
 K&gt;&nbsp;void</code></div>
@@ -188,54 +200,48 @@ <h2>Method Summary</h2>
 <div class="block">Deletes by ID or key.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T,<wbr>
-K&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</code></div>
+K&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;T&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#find(java.lang.Class,K)" class="member-name-link">find</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type,
  K&nbsp;id)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Finds by ID or key.</div>
+<div class="block">Retrieves an entity by its Id.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a><wbr>&lt;T&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#insert(java.lang.Iterable)" class="member-name-link">insert</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;entities)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Inserts entity, by default it's just run for each saving using
- <a href="#insert(T)"><code>insert(Object)</code></a>},
- each NoSQL vendor might replace to a more appropriate one.</div>
+<div class="block">Inserts multiple entities into the database.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a><wbr>&lt;T&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#insert(java.lang.Iterable,java.time.Duration)" class="member-name-link">insert</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;entities,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;ttl)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Inserts entities collection entity with time to live, by default it's just run for each saving using
- <a href="#insert(T,java.time.Duration)"><code>insert(Object, Duration)</code></a>,
- each NoSQL vendor might replace to a more appropriate one.</div>
+<div class="block">Inserts multiple entities into the database with the expiration date.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;T</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#insert(T)" class="member-name-link">insert</a><wbr>(T&nbsp;entity)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Inserts an entity</div>
+<div class="block">Inserts an entity into the database.</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;T</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#insert(T,java.time.Duration)" class="member-name-link">insert</a><wbr>(T&nbsp;entity,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;ttl)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Inserts entity with time to live, TTL.</div>
+<div class="block">Inserts an entity into the database with an expiration to the entity.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="QueryMapper.MapperFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#select(java.lang.Class)" class="member-name-link">select</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">It starts a query using the fluent-API journey.</div>
+<div class="block">Start a query using the fluent API.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a><wbr>&lt;T&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#update(java.lang.Iterable)" class="member-name-link">update</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;entities)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Saves entity, by default it's just run for each saving using
- <a href="#update(T)"><code>update(Object)</code></a>},
- each NoSQL vendor might replace to a more appropriate one.</div>
+<div class="block">Modifies entities that already exist in the database.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;T</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#update(T)" class="member-name-link">update</a><wbr>(T&nbsp;entity)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Updates an entity</div>
+<div class="block">Modifies an entity that already exists in the database.</div>
 </div>
 </div>
 </div>
@@ -255,16 +261,26 @@ <h2>Method Details</h2>
 <section class="detail" id="insert(T)">
 <h3 id="insert(java.lang.Object)">insert</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type">T</span>&nbsp;<span class="element-name">insert</span><wbr><span class="parameters">(T&nbsp;entity)</span></div>
-<div class="block">Inserts an entity</div>
+<div class="block">Inserts an entity into the database. If an entity of this type with the same
+ unique identifier already exists in the database and the database supports ACID transactions,
+ then this method raises an error. In databases that follow the BASE model
+ or use an append model to write data, this exception is not thrown.
+
+ <p>The entity instance returned as a result of this method must include all values that were
+ written to the database, including all automatically generated values and incremented values
+ that changed due to the insert. After invoking this method, do not continue to use the instance
+ that is supplied as a parameter. This method makes no guarantees about the state of the
+ instance that is supplied as a parameter.</p></div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
-<dd><code>T</code> - the instance type</dd>
+<dd><code>T</code> - the entity type</dd>
 <dt>Parameters:</dt>
-<dd><code>entity</code> - entity to insert</dd>
+<dd><code>entity</code> - the entity to insert. Must not be <code>null</code>.</dd>
 <dt>Returns:</dt>
-<dd>the entity saved</dd>
+<dd>the inserted entity, which may or may not be a different instance depending on whether the insert
+ caused values to be generated or automatically incremented.</dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when entity is null</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - if the entity is null.</dd>
 </dl>
 </section>
 </li>
@@ -273,17 +289,32 @@ <h3 id="insert(java.lang.Object)">insert</h3>
 <h3 id="insert(java.lang.Object,java.time.Duration)">insert</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type">T</span>&nbsp;<span class="element-name">insert</span><wbr><span class="parameters">(T&nbsp;entity,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;ttl)</span></div>
-<div class="block">Inserts entity with time to live, TTL.</div>
+<div class="block">Inserts an entity into the database with an expiration to the entity. If an entity of this type with the same
+ unique identifier already exists in the database and the database supports ACID transactions,
+ then this method raises an error. In databases that follow the BASE model
+ or use an append model to write data, this exception is not thrown.
+
+ <p>The entity instance returned as a result of this method must include all values that were
+ written to the database, including all automatically generated values and incremented values
+ that changed due to the insert. After invoking this method, do not continue to use the instance
+ that is supplied as a parameter. This method makes no guarantees about the state of the
+ instance that is supplied as a parameter.</p>
+
+ <p>Time-To-Live (TTL) is a feature provided by some NoSQL databases where data is automatically removed from the
+ database after a specified duration. When inserting an entity with a TTL, the entity will be automatically deleted
+ from the database after the specified duration has passed since its insertion. If the database does not support TTL
+ or if the TTL feature is not enabled, this operation will not have any effect on the entity's expiration.</p></div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
-<dd><code>T</code> - the instance type</dd>
+<dd><code>T</code> - the entity type</dd>
 <dt>Parameters:</dt>
-<dd><code>entity</code> - entity to insert</dd>
-<dd><code>ttl</code> - the time to live</dd>
+<dd><code>entity</code> - the entity to insert. Must not be <code>null</code>.</dd>
+<dd><code>ttl</code> - time to live</dd>
 <dt>Returns:</dt>
-<dd>the entity saved</dd>
+<dd>the inserted entity, which may or may not be a different instance depending on whether the insert caused
+ values to be generated or automatically incremented.</dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when entity or ttl is null</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - if the entity is null.</dd>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the database does not provide TTL</dd>
 </dl>
 </section>
@@ -292,18 +323,29 @@ <h3 id="insert(java.lang.Object,java.time.Duration)">insert</h3>
 <section class="detail" id="insert(java.lang.Iterable)">
 <h3>insert</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;</span>&nbsp;<span class="element-name">insert</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;entities)</span></div>
-<div class="block">Inserts entity, by default it's just run for each saving using
- <a href="#insert(T)"><code>insert(Object)</code></a>},
- each NoSQL vendor might replace to a more appropriate one.</div>
+<div class="block">Inserts multiple entities into the database. If any entity of this type with the same
+ unique identifier as any of the given entities already exists in the database and the database
+ supports ACID transactions, then this method raises an error.
+ In databases that follow the BASE model or use an append model to write data, this exception
+ is not thrown.
+
+ <p>The entities within the returned <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link"><code>Iterable</code></a> must include all values that were
+ written to the database, including all automatically generated values and incremented values
+ that changed due to the insert. After invoking this method, do not continue to use
+ the entity instances that are supplied in the parameter. This method makes no guarantees
+ about the state of the entity instances that are supplied in the parameter.
+ The position of entities within the <code>Iterable</code> return value must correspond to the
+ position of entities in the parameter based on the unique identifier of the entity.</p></div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
-<dd><code>T</code> - the instance type</dd>
+<dd><code>T</code> - the entity type</dd>
 <dt>Parameters:</dt>
-<dd><code>entities</code> - entities to insert</dd>
+<dd><code>entities</code> - entities to insert.</dd>
 <dt>Returns:</dt>
-<dd>the entity saved</dd>
+<dd>an iterable containing the inserted entities, which may or may not be different instances depending
+ on whether the insert caused values to be generated or automatically incremented.</dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when entities is null</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - if the iterable is null or any element is null.</dd>
 </dl>
 </section>
 </li>
@@ -312,20 +354,36 @@ <h3>insert</h3>
 <h3>insert</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;</span>&nbsp;<span class="element-name">insert</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;entities,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;ttl)</span></div>
-<div class="block">Inserts entities collection entity with time to live, by default it's just run for each saving using
- <a href="#insert(T,java.time.Duration)"><code>insert(Object, Duration)</code></a>,
- each NoSQL vendor might replace to a more appropriate one.</div>
+<div class="block">Inserts multiple entities into the database with the expiration date. If any entity of this type with the same
+ unique identifier as any of the given entities already exists in the database and the database
+ supports ACID transactions, then this method raises an error.
+ In databases that follow the BASE model or use an append model to write data, this exception
+ is not thrown.
+
+ <p>The entities within the returned <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link"><code>Iterable</code></a> must include all values that were
+ written to the database, including all automatically generated values and incremented values
+ that changed due to the insert. After invoking this method, do not continue to use
+ the entity instances that are supplied in the parameter. This method makes no guarantees
+ about the state of the entity instances that are supplied in the parameter.
+ The position of entities within the <code>Iterable</code> return value must correspond to the
+ position of entities in the parameter based on the unique identifier of the entity.</p>
+
+ <p>Time-To-Live (TTL) is a feature provided by some NoSQL databases where data is automatically removed from the
+ database after a specified duration. When inserting entities with a TTL, the entities will be automatically deleted
+ from the database after the specified duration has passed since their insertion. If the database does not support TTL
+ or if the TTL feature is not enabled, this operation will not have any effect on the expiration of the entities.</p></div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
-<dd><code>T</code> - the instance type</dd>
+<dd><code>T</code> - the entity type</dd>
 <dt>Parameters:</dt>
-<dd><code>entities</code> - entities to be saved</dd>
+<dd><code>entities</code> - entities to insert.</dd>
 <dd><code>ttl</code> - time to live</dd>
 <dt>Returns:</dt>
-<dd>the entity saved</dd>
+<dd>an iterable containing the inserted entities, which may or may not be different instances depending
+ on whether the insert caused values to be generated or automatically incremented.</dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when entities is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the database does not provide TTL</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - if the iterable is null or any element is null.</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - if the database does not provide time-to-live for insert operations.</dd>
 </dl>
 </section>
 </li>
@@ -333,16 +391,28 @@ <h3>insert</h3>
 <section class="detail" id="update(T)">
 <h3 id="update(java.lang.Object)">update</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type">T</span>&nbsp;<span class="element-name">update</span><wbr><span class="parameters">(T&nbsp;entity)</span></div>
-<div class="block">Updates an entity</div>
+<div class="block">Modifies an entity that already exists in the database.
+
+ <p>For an update to be made, a matching entity with the same unique identifier
+ must be present in the database. In databases that use an append model to write data or
+ follow the BASE model, this method behaves the same as the <a href="#insert(T)"><code>insert(T)</code></a> method.</p>
+
+ <p>If the entity is versioned (for example, with an annotation or by
+ another convention from the entity model such as having an attribute named <code>version</code>),
+ then the version must also match. The version is automatically incremented when making
+ the update.</p>
+
+ <p>Non-matching entities are ignored and do not cause an error to be raised.</p></div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
-<dd><code>T</code> - the instance type</dd>
+<dd><code>T</code> - the entity type</dd>
 <dt>Parameters:</dt>
-<dd><code>entity</code> - entity to update</dd>
+<dd><code>entity</code> - the entity to update. Must not be <code>null</code>.</dd>
 <dt>Returns:</dt>
-<dd>the entity updated</dd>
+<dd>the updated entity, which may or may not be a different instance depending on whether the update caused
+ values to be generated or automatically incremented.</dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when entity is null</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - if the entity is null.</dd>
 </dl>
 </section>
 </li>
@@ -350,18 +420,27 @@ <h3 id="update(java.lang.Object)">update</h3>
 <section class="detail" id="update(java.lang.Iterable)">
 <h3>update</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;</span>&nbsp;<span class="element-name">update</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;entities)</span></div>
-<div class="block">Saves entity, by default it's just run for each saving using
- <a href="#update(T)"><code>update(Object)</code></a>},
- each NoSQL vendor might replace to a more appropriate one.</div>
+<div class="block">Modifies entities that already exist in the database.
+
+ <p>For an update to be made to an entity, a matching entity with the same unique identifier
+ must be present in the database. In databases that use an append model to write data or
+ follow the BASE model, this method behaves the same as the <a href="#insert(java.lang.Iterable)"><code>insert(Iterable)</code></a> method.</p>
+
+ <p>If the entity is versioned (for example, with an annotation or by
+ another convention from the entity model such as having an attribute named <code>version</code>),
+ then the version must also match. The version is automatically incremented when making
+ the update.</p>
+
+ <p>Non-matching entities are ignored and do not cause an error to be raised.</p></div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
-<dd><code>T</code> - the instance type</dd>
+<dd><code>T</code> - the entity class type</dd>
 <dt>Parameters:</dt>
-<dd><code>entities</code> - entities to update</dd>
+<dd><code>entities</code> - entities to update.</dd>
 <dt>Returns:</dt>
-<dd>the entity saved</dd>
+<dd>the number of matching entities that were found in the database to update.</dd>
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when entities is null</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - if either the iterable is null or any element is null.</dd>
 </dl>
 </section>
 </li>
@@ -371,7 +450,7 @@ <h3 id="find(java.lang.Class,java.lang.Object)">find</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T,<wbr>
 K&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</span>&nbsp;<span class="element-name">find</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type,
  K&nbsp;id)</span></div>
-<div class="block">Finds by ID or key.</div>
+<div class="block">Retrieves an entity by its Id.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the entity class type</dd>
@@ -380,7 +459,7 @@ <h3 id="find(java.lang.Class,java.lang.Object)">find</h3>
 <dd><code>type</code> - the entity class</dd>
 <dd><code>id</code> - the id value</dd>
 <dt>Returns:</dt>
-<dd>the entity instance otherwise <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html#empty()" title="class or interface in java.util" class="external-link"><code>Optional.empty()</code></a></dd>
+<dd>the entity instance, otherwise <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html#empty()" title="class or interface in java.util" class="external-link"><code>Optional.empty()</code></a></dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when either the type or id are null</dd>
 </dl>
@@ -409,7 +488,7 @@ <h3 id="delete(java.lang.Class,java.lang.Object)">delete</h3>
 <section class="detail" id="select(java.lang.Class)">
 <h3>select</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></span>&nbsp;<span class="element-name">select</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</span></div>
-<div class="block">It starts a query using the fluent-API journey. It is a mutable and non-thread-safe instance.</div>
+<div class="block">Start a query using the fluent API. The return value is a mutable and non-thread-safe instance.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the entity type</dd>
@@ -428,7 +507,7 @@ <h3>select</h3>
 <section class="detail" id="delete(java.lang.Class)">
 <h3>delete</h3>
 <div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="QueryMapper.MapperDeleteFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteFrom</a></span>&nbsp;<span class="element-name">delete</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</span></div>
-<div class="block">It starts a query builder using the fluent-API journey. It is a mutable and non-thread-safe instance.</div>
+<div class="block">Start a query builder using the fluent API. The returned value is a mutable and non-thread-safe instance.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>T</code> - the entity type</dd>
diff --git a/javadoc/jakarta.nosql.document/jakarta/nosql/document/package-use.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/AttributeConverter.html
similarity index 58%
rename from javadoc/jakarta.nosql.document/jakarta/nosql/document/package-use.html
rename to javadoc/jakarta.nosql.core/jakarta/nosql/class-use/AttributeConverter.html
index f3e3423..8f3dadf 100644
--- a/javadoc/jakarta.nosql.document/jakarta/nosql/document/package-use.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/AttributeConverter.html
@@ -1,20 +1,19 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Package jakarta.nosql.document (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.AttributeConverter (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="use: module: jakarta.nosql.document, package: jakarta.nosql.document">
-<meta name="generator" content="javadoc/PackageUseWriter">
+<meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: AttributeConverter">
+<meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
-<body class="package-use-page">
+<body class="class-use-page">
 <script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
@@ -24,23 +23,23 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../AttributeConverter.html" title="interface in jakarta.nosql">Class</a></li>
 <li class="nav-bar-cell1-rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#use">Help</a></li>
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,9 +48,9 @@
 <div class="flex-content">
 <main role="main">
 <div class="header">
-<h1 title="Uses of Package jakarta.nosql.document" class="title">Uses of Package<br>jakarta.nosql.document</h1>
+<h1 title="Uses of Interface jakarta.nosql.AttributeConverter" class="title">Uses of Interface<br>jakarta.nosql.AttributeConverter</h1>
 </div>
-No usage of jakarta.nosql.document</main>
+No usage of jakarta.nosql.AttributeConverter</main>
 <footer role="contentinfo">
 <hr>
 <p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Column.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Column.html
index 8470a28..af4a609 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Column.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Column.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Annotation Interface jakarta.nosql.Column (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Annotation Interface jakarta.nosql.Column (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Column">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../Column.html" title="annotation interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-use.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Convert.html
similarity index 58%
rename from javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-use.html
rename to javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Convert.html
index d43d7ad..1c73b7f 100644
--- a/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-use.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Convert.html
@@ -1,20 +1,19 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Package jakarta.nosql.keyvalue (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Annotation Interface jakarta.nosql.Convert (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="use: module: jakarta.nosql.keyvalue, package: jakarta.nosql.keyvalue">
-<meta name="generator" content="javadoc/PackageUseWriter">
+<meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Convert">
+<meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
-<body class="package-use-page">
+<body class="class-use-page">
 <script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
@@ -24,23 +23,23 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../Convert.html" title="annotation interface in jakarta.nosql">Class</a></li>
 <li class="nav-bar-cell1-rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#use">Help</a></li>
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,9 +48,9 @@
 <div class="flex-content">
 <main role="main">
 <div class="header">
-<h1 title="Uses of Package jakarta.nosql.keyvalue" class="title">Uses of Package<br>jakarta.nosql.keyvalue</h1>
+<h1 title="Uses of Annotation Interface jakarta.nosql.Convert" class="title">Uses of Annotation Interface<br>jakarta.nosql.Convert</h1>
 </div>
-No usage of jakarta.nosql.keyvalue</main>
+No usage of jakarta.nosql.Convert</main>
 <footer role="contentinfo">
 <hr>
 <p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
diff --git a/javadoc/jakarta.nosql.column/jakarta/nosql/column/package-tree.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/DiscriminatorColumn.html
similarity index 51%
rename from javadoc/jakarta.nosql.column/jakarta/nosql/column/package-tree.html
rename to javadoc/jakarta.nosql.core/jakarta/nosql/class-use/DiscriminatorColumn.html
index c883c31..a670786 100644
--- a/javadoc/jakarta.nosql.column/jakarta/nosql/column/package-tree.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/DiscriminatorColumn.html
@@ -1,20 +1,19 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>jakarta.nosql.column Class Hierarchy (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Annotation Interface jakarta.nosql.DiscriminatorColumn (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="tree: module: jakarta.nosql.column, package: jakarta.nosql.column">
-<meta name="generator" content="javadoc/PackageTreeWriter">
+<meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: DiscriminatorColumn">
+<meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
-<body class="package-tree-page">
+<body class="class-use-page">
 <script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
@@ -24,23 +23,23 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="nav-bar-cell1-rev">Tree</li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../DiscriminatorColumn.html" title="annotation interface in jakarta.nosql">Class</a></li>
+<li class="nav-bar-cell1-rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html#tree">Help</a></li>
+<li><a href="../../../../help-doc.html#use">Help</a></li>
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,23 +48,9 @@
 <div class="flex-content">
 <main role="main">
 <div class="header">
-<h1 class="title">Hierarchy For Package jakarta.nosql.column</h1>
-<span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../../../../overview-tree.html">All Packages</a></li>
-</ul>
+<h1 title="Uses of Annotation Interface jakarta.nosql.DiscriminatorColumn" class="title">Uses of Annotation Interface<br>jakarta.nosql.DiscriminatorColumn</h1>
 </div>
-<section class="hierarchy">
-<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
-<ul>
-<li class="circle">jakarta.nosql.<a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" class="type-name-link" title="interface in jakarta.nosql">Template</a>
-<ul>
-<li class="circle">jakarta.nosql.column.<a href="ColumnTemplate.html" class="type-name-link" title="interface in jakarta.nosql.column">ColumnTemplate</a></li>
-</ul>
-</li>
-</ul>
-</section>
-</main>
+No usage of jakarta.nosql.DiscriminatorColumn</main>
 <footer role="contentinfo">
 <hr>
 <p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/DiscriminatorValue.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/DiscriminatorValue.html
new file mode 100644
index 0000000..631c31e
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/DiscriminatorValue.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Annotation Interface jakarta.nosql.DiscriminatorValue (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: DiscriminatorValue">
+<meta name="generator" content="javadoc/ClassUseWriter">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-use-page">
+<script type="text/javascript">var pathtoroot = "../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../module-summary.html">Module</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../DiscriminatorValue.html" title="annotation interface in jakarta.nosql">Class</a></li>
+<li class="nav-bar-cell1-rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html#use">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<h1 title="Uses of Annotation Interface jakarta.nosql.DiscriminatorValue" class="title">Uses of Annotation Interface<br>jakarta.nosql.DiscriminatorValue</h1>
+</div>
+No usage of jakarta.nosql.DiscriminatorValue</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Embeddable.EmbeddableType.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Embeddable.EmbeddableType.html
new file mode 100644
index 0000000..9754c7c
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Embeddable.EmbeddableType.html
@@ -0,0 +1,87 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Enum Class jakarta.nosql.Embeddable.EmbeddableType (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Embeddable, enum: EmbeddableType">
+<meta name="generator" content="javadoc/ClassUseWriter">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-use-page">
+<script type="text/javascript">var pathtoroot = "../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../module-summary.html">Module</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Class</a></li>
+<li class="nav-bar-cell1-rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html#use">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<h1 title="Uses of Enum Class jakarta.nosql.Embeddable.EmbeddableType" class="title">Uses of Enum Class<br>jakarta.nosql.Embeddable.EmbeddableType</h1>
+</div>
+<section class="class-uses">
+<ul class="block-list">
+<li>
+<section class="detail" id="jakarta.nosql">
+<h2>Uses of <a href="../Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a> in <a href="../package-summary.html">jakarta.nosql</a></h2>
+<div class="caption"><span>Methods in <a href="../package-summary.html">jakarta.nosql</a> that return <a href="../Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code>static <a href="../Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></code></div>
+<div class="col-second even-row-color"><span class="type-name-label">Embeddable.EmbeddableType.</span><code><a href="../Embeddable.EmbeddableType.html#valueOf(java.lang.String)" class="member-name-link">valueOf</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
+<div class="col-last even-row-color">
+<div class="block">Returns the enum constant of this class with the specified name.</div>
+</div>
+<div class="col-first odd-row-color"><code>static <a href="../Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a>[]</code></div>
+<div class="col-second odd-row-color"><span class="type-name-label">Embeddable.EmbeddableType.</span><code><a href="../Embeddable.EmbeddableType.html#values()" class="member-name-link">values</a>()</code></div>
+<div class="col-last odd-row-color">
+<div class="block">Returns an array containing the constants of this enum class, in
+the order they are declared.</div>
+</div>
+</div>
+</section>
+</li>
+</ul>
+</section>
+</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Embeddable.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Embeddable.html
new file mode 100644
index 0000000..842565d
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Embeddable.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Annotation Interface jakarta.nosql.Embeddable (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Embeddable">
+<meta name="generator" content="javadoc/ClassUseWriter">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-use-page">
+<script type="text/javascript">var pathtoroot = "../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../module-summary.html">Module</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../Embeddable.html" title="annotation interface in jakarta.nosql">Class</a></li>
+<li class="nav-bar-cell1-rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html#use">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<h1 title="Uses of Annotation Interface jakarta.nosql.Embeddable" class="title">Uses of Annotation Interface<br>jakarta.nosql.Embeddable</h1>
+</div>
+No usage of jakarta.nosql.Embeddable</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Entity.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Entity.html
index 207d690..1fb676c 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Entity.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Entity.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Annotation Interface jakarta.nosql.Entity (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Annotation Interface jakarta.nosql.Entity (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Entity">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../Entity.html" title="annotation interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Id.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Id.html
index 65c4e12..c0595c6 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Id.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Id.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Annotation Interface jakarta.nosql.Id (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Annotation Interface jakarta.nosql.Id (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Id">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../Id.html" title="annotation interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Inheritance.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Inheritance.html
new file mode 100644
index 0000000..d6920ab
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Inheritance.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Annotation Interface jakarta.nosql.Inheritance (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: Inheritance">
+<meta name="generator" content="javadoc/ClassUseWriter">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-use-page">
+<script type="text/javascript">var pathtoroot = "../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../module-summary.html">Module</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../Inheritance.html" title="annotation interface in jakarta.nosql">Class</a></li>
+<li class="nav-bar-cell1-rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html#use">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<h1 title="Uses of Annotation Interface jakarta.nosql.Inheritance" class="title">Uses of Annotation Interface<br>jakarta.nosql.Inheritance</h1>
+</div>
+No usage of jakarta.nosql.Inheritance</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/MappedSuperclass.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/MappedSuperclass.html
new file mode 100644
index 0000000..6103e71
--- /dev/null
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/MappedSuperclass.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Annotation Interface jakarta.nosql.MappedSuperclass (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, annotation type: MappedSuperclass">
+<meta name="generator" content="javadoc/ClassUseWriter">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-use-page">
+<script type="text/javascript">var pathtoroot = "../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../module-summary.html">Module</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../MappedSuperclass.html" title="annotation interface in jakarta.nosql">Class</a></li>
+<li class="nav-bar-cell1-rev">Use</li>
+<li><a href="../package-tree.html">Tree</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html#use">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<h1 title="Uses of Annotation Interface jakarta.nosql.MappedSuperclass" class="title">Uses of Annotation Interface<br>jakarta.nosql.MappedSuperclass</h1>
+</div>
+No usage of jakarta.nosql.MappedSuperclass</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/jakarta.nosql.column/jakarta/nosql/column/package-use.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/MappingException.html
similarity index 59%
rename from javadoc/jakarta.nosql.column/jakarta/nosql/column/package-use.html
rename to javadoc/jakarta.nosql.core/jakarta/nosql/class-use/MappingException.html
index f44b1e9..5bbeb33 100644
--- a/javadoc/jakarta.nosql.column/jakarta/nosql/column/package-use.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/MappingException.html
@@ -1,20 +1,19 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Package jakarta.nosql.column (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Class jakarta.nosql.MappingException (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="use: module: jakarta.nosql.column, package: jakarta.nosql.column">
-<meta name="generator" content="javadoc/PackageUseWriter">
+<meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, class: MappingException">
+<meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
-<body class="package-use-page">
+<body class="class-use-page">
 <script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
@@ -24,23 +23,23 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../MappingException.html" title="class in jakarta.nosql">Class</a></li>
 <li class="nav-bar-cell1-rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../package-tree.html">Tree</a></li>
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#use">Help</a></li>
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,9 +48,9 @@
 <div class="flex-content">
 <main role="main">
 <div class="header">
-<h1 title="Uses of Package jakarta.nosql.column" class="title">Uses of Package<br>jakarta.nosql.column</h1>
+<h1 title="Uses of Class jakarta.nosql.MappingException" class="title">Uses of Class<br>jakarta.nosql.MappingException</h1>
 </div>
-No usage of jakarta.nosql.column</main>
+No usage of jakarta.nosql.MappingException</main>
 <footer role="contentinfo">
 <hr>
 <p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/NoSQLException.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/NoSQLException.html
index ad37b2d..629788d 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/NoSQLException.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/NoSQLException.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Class jakarta.nosql.NoSQLException (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Class jakarta.nosql.NoSQLException (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, class: NoSQLException">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../NoSQLException.html" title="class in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,7 +50,27 @@
 <div class="header">
 <h1 title="Uses of Class jakarta.nosql.NoSQLException" class="title">Uses of Class<br>jakarta.nosql.NoSQLException</h1>
 </div>
-No usage of jakarta.nosql.NoSQLException</main>
+<section class="class-uses">
+<ul class="block-list">
+<li>
+<section class="detail" id="jakarta.nosql">
+<h2>Uses of <a href="../NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a> in <a href="../package-summary.html">jakarta.nosql</a></h2>
+<div class="caption"><span>Subclasses of <a href="../NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a> in <a href="../package-summary.html">jakarta.nosql</a></span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Class</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code>class&nbsp;</code></div>
+<div class="col-second even-row-color"><code><a href="../MappingException.html" class="type-name-link" title="class in jakarta.nosql">MappingException</a></code></div>
+<div class="col-last even-row-color">
+<div class="block">An exception that occurs when there is a mapping error during entity mapping or persistence.</div>
+</div>
+</div>
+</section>
+</li>
+</ul>
+</section>
+</main>
 <footer role="contentinfo">
 <hr>
 <p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/PreparedStatement.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/PreparedStatement.html
deleted file mode 100644
index de40c79..0000000
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/PreparedStatement.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.PreparedStatement (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: PreparedStatement">
-<meta name="generator" content="javadoc/ClassUseWriter">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-use-page">
-<script type="text/javascript">var pathtoroot = "../../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
-<li><a href="../../../module-summary.html">Module</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../PreparedStatement.html" title="interface in jakarta.nosql">Class</a></li>
-<li class="nav-bar-cell1-rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html#use">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<div class="header">
-<h1 title="Uses of Interface jakarta.nosql.PreparedStatement" class="title">Uses of Interface<br>jakarta.nosql.PreparedStatement</h1>
-</div>
-<div class="caption"><span>Packages that use <a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-<div class="col-first odd-row-color"><a href="#jakarta.nosql.column">jakarta.nosql.column</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Defines the API to Column Family in mapping level.</div>
-</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql.document">jakarta.nosql.document</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the API to Document Collection in mapping level.</div>
-</div>
-<div class="col-first odd-row-color"><a href="#jakarta.nosql.keyvalue">jakarta.nosql.keyvalue</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Defines the API to Key-value in mapping level.</div>
-</div>
-</div>
-<section class="class-uses">
-<ul class="block-list">
-<li>
-<section class="detail" id="jakarta.nosql">
-<h2>Uses of <a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a> in <a href="../package-summary.html">jakarta.nosql</a></h2>
-<div class="caption"><span>Methods in <a href="../package-summary.html">jakarta.nosql</a> that return <a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><code><a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">PreparedStatement.</span><code><a href="../PreparedStatement.html#bind(java.lang.String,java.lang.Object)" class="member-name-link">bind</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;value)</code></div>
-<div class="col-last even-row-color">
-<div class="block">Binds an argument to a named parameter.</div>
-</div>
-</div>
-</section>
-</li>
-<li>
-<section class="detail" id="jakarta.nosql.column">
-<h2>Uses of <a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a> in <a href="../../../../jakarta.nosql.column/jakarta/nosql/column/package-summary.html">jakarta.nosql.column</a></h2>
-<div class="caption"><span>Methods in <a href="../../../../jakarta.nosql.column/jakarta/nosql/column/package-summary.html">jakarta.nosql.column</a> that return <a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><code><a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">ColumnTemplate.</span><code><a href="../../../../jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html#prepare(java.lang.String)" class="member-name-link">prepare</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</code></div>
-<div class="col-last even-row-color">
-<div class="block">Creates a <a href="../PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a> from the query</div>
-</div>
-</div>
-</section>
-</li>
-<li>
-<section class="detail" id="jakarta.nosql.document">
-<h2>Uses of <a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a> in <a href="../../../../jakarta.nosql.document/jakarta/nosql/document/package-summary.html">jakarta.nosql.document</a></h2>
-<div class="caption"><span>Methods in <a href="../../../../jakarta.nosql.document/jakarta/nosql/document/package-summary.html">jakarta.nosql.document</a> that return <a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><code><a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">DocumentTemplate.</span><code><a href="../../../../jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html#prepare(java.lang.String)" class="member-name-link">prepare</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</code></div>
-<div class="col-last even-row-color">
-<div class="block">Creates a <a href="../PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a> from the query</div>
-</div>
-</div>
-</section>
-</li>
-<li>
-<section class="detail" id="jakarta.nosql.keyvalue">
-<h2>Uses of <a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a> in <a href="../../../../jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html">jakarta.nosql.keyvalue</a></h2>
-<div class="caption"><span>Methods in <a href="../../../../jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html">jakarta.nosql.keyvalue</a> that return <a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><code>&lt;T&gt;&nbsp;<a href="../PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></code></div>
-<div class="col-second even-row-color"><span class="type-name-label">KeyValueTemplate.</span><code><a href="../../../../jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html#prepare(java.lang.String,java.lang.Class)" class="member-name-link">prepare</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</code></div>
-<div class="col-last even-row-color">
-<div class="block">Executes a query database with <a href="../PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a></div>
-</div>
-</div>
-</section>
-</li>
-</ul>
-</section>
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteFrom.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteFrom.html
index aa7e6c8..d3fb6f8 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteFrom.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteFrom.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteFrom (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteFrom (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperDeleteFrom">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperDeleteFrom.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteFrom" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperDeleteFrom</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperDeleteFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteFrom</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
@@ -73,7 +63,7 @@ <h2>Uses of <a href="../QueryMapper.MapperDeleteFrom.html" title="interface in j
 <div class="col-first even-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperDeleteFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteFrom</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">Template.</span><code><a href="../Template.html#delete(java.lang.Class)" class="member-name-link">delete</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</code></div>
 <div class="col-last even-row-color">
-<div class="block">It starts a query builder using the fluent-API journey.</div>
+<div class="block">Start a query builder using the fluent API.</div>
 </div>
 </div>
 </section>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteNameCondition.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteNameCondition.html
index b6d3029..a3420e5 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteNameCondition.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteNameCondition.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteNameCondition (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteNameCondition (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperDeleteNameCondition">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteNameCondition" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperDeleteNameCondition</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
@@ -73,7 +63,7 @@ <h2>Uses of <a href="../QueryMapper.MapperDeleteNameCondition.html" title="inter
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="../QueryMapper.MapperDeleteNotCondition.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNotCondition</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">Represents a NOT delete condition in the delete query fluent API</div>
+<div class="block">Represents a NOT delete condition in the delete query fluent API.</div>
 </div>
 </div>
 <div class="caption"><span>Methods in <a href="../package-summary.html">jakarta.nosql</a> that return <a href="../QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></span></div>
@@ -84,17 +74,17 @@ <h2>Uses of <a href="../QueryMapper.MapperDeleteNameCondition.html" title="inter
 <div class="col-first even-row-color"><code><a href="../QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperDeleteWhere.</span><code><a href="../QueryMapper.MapperDeleteWhere.html#and(java.lang.String)" class="member-name-link">and</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Create a new delete condition performing logical conjunction (AND) by giving a column name</div>
+<div class="block">Create a new delete condition performing logical conjunction (AND) by specifying a column name.</div>
 </div>
 <div class="col-first odd-row-color"><code><a href="../QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></code></div>
 <div class="col-second odd-row-color"><span class="type-name-label">QueryMapper.MapperDeleteWhere.</span><code><a href="../QueryMapper.MapperDeleteWhere.html#or(java.lang.String)" class="member-name-link">or</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Create a new delete condition performing logical disjunction (OR) by giving a column name</div>
+<div class="block">Create a new delete condition performing logical disjunction (OR) by specifying a column name.</div>
 </div>
 <div class="col-first even-row-color"><code><a href="../QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperDeleteFrom.</span><code><a href="../QueryMapper.MapperDeleteFrom.html#where(java.lang.String)" class="member-name-link">where</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Starts a new delete condition by a column name</div>
+<div class="block">Starts a new delete condition by specifying a column name.</div>
 </div>
 </div>
 </section>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteNotCondition.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteNotCondition.html
index 06688b4..ed3c82f 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteNotCondition.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteNotCondition.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteNotCondition (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteNotCondition (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperDeleteNotCondition">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperDeleteNotCondition.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteNotCondition" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperDeleteNotCondition</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperDeleteNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNotCondition</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
@@ -73,7 +63,7 @@ <h2>Uses of <a href="../QueryMapper.MapperDeleteNotCondition.html" title="interf
 <div class="col-first even-row-color"><code><a href="../QueryMapper.MapperDeleteNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNotCondition</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperDeleteNameCondition.</span><code><a href="../QueryMapper.MapperDeleteNameCondition.html#not()" class="member-name-link">not</a>()</code></div>
 <div class="col-last even-row-color">
-<div class="block">Creates a NOT delete condition for the column name provided</div>
+<div class="block">Creates a NOT delete condition for the specified column name.</div>
 </div>
 </div>
 </section>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteQueryBuild.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteQueryBuild.html
index 6c5e0de..9c7eebf 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteQueryBuild.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteQueryBuild.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteQueryBuild (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteQueryBuild (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperDeleteQueryBuild">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperDeleteQueryBuild.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteQueryBuild" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperDeleteQueryBuild</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperDeleteQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteQueryBuild</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
@@ -73,12 +63,13 @@ <h2>Uses of <a href="../QueryMapper.MapperDeleteQueryBuild.html" title="interfac
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="../QueryMapper.MapperDeleteFrom.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteFrom</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">Represents the first step in the delete query fluent API</div>
+<div class="block">Represents the first step in the delete query fluent API.</div>
 </div>
 <div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second odd-row-color"><code><a href="../QueryMapper.MapperDeleteWhere.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction adding one more delete condition or end up performing the built query</div>
+<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction,
+ add one more delete condition, or end up performing the built query.</div>
 </div>
 </div>
 </section>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteWhere.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteWhere.html
index d175277..86ff66c 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteWhere.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperDeleteWhere.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteWhere (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteWhere (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperDeleteWhere">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperDeleteWhere" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperDeleteWhere</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
@@ -74,42 +64,42 @@ <h2>Uses of <a href="../QueryMapper.MapperDeleteWhere.html" title="interface in
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperDeleteNameCondition.</span><code><a href="../QueryMapper.MapperDeleteNameCondition.html#between(T,T)" class="member-name-link">between</a><wbr>(T&nbsp;valueA,
  T&nbsp;valueB)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Creates a delete condition where the column name provided is between the provided values</div>
+<div class="block">Creates a delete condition where the specified column name is between the provided values.</div>
 </div>
 <div class="col-first odd-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second odd-row-color"><span class="type-name-label">QueryMapper.MapperDeleteNameCondition.</span><code><a href="../QueryMapper.MapperDeleteNameCondition.html#eq(T)" class="member-name-link">eq</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Creates a delete condition where the column name provided is equal to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name equals the provided value.</div>
 </div>
 <div class="col-first even-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperDeleteNameCondition.</span><code><a href="../QueryMapper.MapperDeleteNameCondition.html#gt(T)" class="member-name-link">gt</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Creates a delete condition where the column name provided is greater than to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is greater than the provided value.</div>
 </div>
 <div class="col-first odd-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second odd-row-color"><span class="type-name-label">QueryMapper.MapperDeleteNameCondition.</span><code><a href="../QueryMapper.MapperDeleteNameCondition.html#gte(T)" class="member-name-link">gte</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Creates a delete condition where the column name provided is greater than or equal to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is greater than or equal to the provided value.</div>
 </div>
 <div class="col-first even-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperDeleteNameCondition.</span><code><a href="../QueryMapper.MapperDeleteNameCondition.html#in(java.lang.Iterable)" class="member-name-link">in</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;values)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Creates a delete condition where the column name provided is in the provided iterable values</div>
+<div class="block">Creates a delete condition where the specified column name is in the provided iterable values.</div>
 </div>
 <div class="col-first odd-row-color"><code><a href="../QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second odd-row-color"><span class="type-name-label">QueryMapper.MapperDeleteNameCondition.</span><code><a href="../QueryMapper.MapperDeleteNameCondition.html#like(java.lang.String)" class="member-name-link">like</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;value)</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Creates a delete condition where the column name provided is like to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is like the provided value.</div>
 </div>
 <div class="col-first even-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperDeleteNameCondition.</span><code><a href="../QueryMapper.MapperDeleteNameCondition.html#lt(T)" class="member-name-link">lt</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Creates a delete condition where the column name provided is less than the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is less than the provided value.</div>
 </div>
 <div class="col-first odd-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></code></div>
 <div class="col-second odd-row-color"><span class="type-name-label">QueryMapper.MapperDeleteNameCondition.</span><code><a href="../QueryMapper.MapperDeleteNameCondition.html#lte(T)" class="member-name-link">lte</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Creates a delete condition where the column name provided is less than or equal to the provided value</div>
+<div class="block">Creates a delete condition where the specified column name is less than or equal to the provided value.</div>
 </div>
 </div>
 </section>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperFrom.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperFrom.html
index 7fa04ca..f02ff1c 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperFrom.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperFrom.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperFrom (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperFrom (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperFrom">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperFrom.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperFrom" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperFrom</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
@@ -73,7 +63,7 @@ <h2>Uses of <a href="../QueryMapper.MapperFrom.html" title="interface in jakarta
 <div class="col-first even-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">Template.</span><code><a href="../Template.html#select(java.lang.Class)" class="member-name-link">select</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</code></div>
 <div class="col-last even-row-color">
-<div class="block">It starts a query using the fluent-API journey.</div>
+<div class="block">Start a query using the fluent API.</div>
 </div>
 </div>
 </section>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperLimit.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperLimit.html
index 7a2636a..383a61c 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperLimit.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperLimit.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperLimit (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperLimit (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperLimit">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperLimit.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperLimit" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperLimit</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperLimit.html" title="interface in jakarta.nosql">QueryMapper.MapperLimit</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperNameCondition.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperNameCondition.html
index 19e7217..3f3d53c 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperNameCondition.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperNameCondition.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperNameCondition (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperNameCondition (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperNameCondition">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperNameCondition" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperNameCondition</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
@@ -73,7 +63,7 @@ <h2>Uses of <a href="../QueryMapper.MapperNameCondition.html" title="interface i
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="../QueryMapper.MapperNotCondition.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperNotCondition</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">Represents a NOT condition in the delete query fluent API</div>
+<div class="block">Represents a NOT condition in the delete query fluent API.</div>
 </div>
 </div>
 <div class="caption"><span>Methods in <a href="../package-summary.html">jakarta.nosql</a> that return <a href="../QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></span></div>
@@ -84,17 +74,17 @@ <h2>Uses of <a href="../QueryMapper.MapperNameCondition.html" title="interface i
 <div class="col-first even-row-color"><code><a href="../QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperWhere.</span><code><a href="../QueryMapper.MapperWhere.html#and(java.lang.String)" class="member-name-link">and</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Create a new condition performing logical conjunction (AND) by giving a column name</div>
+<div class="block">Create a new condition performing logical conjunction (AND) by specifying a column name.</div>
 </div>
 <div class="col-first odd-row-color"><code><a href="../QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></code></div>
 <div class="col-second odd-row-color"><span class="type-name-label">QueryMapper.MapperWhere.</span><code><a href="../QueryMapper.MapperWhere.html#or(java.lang.String)" class="member-name-link">or</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Create a new condition performing logical disjunction (OR) by giving a column name</div>
+<div class="block">Create a new condition performing logical disjunction (OR) by specifying a column name.</div>
 </div>
 <div class="col-first even-row-color"><code><a href="../QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperFrom.</span><code><a href="../QueryMapper.MapperFrom.html#where(java.lang.String)" class="member-name-link">where</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Starts a new condition by given a column name</div>
+<div class="block">Starts a new condition by specifying a column name.</div>
 </div>
 </div>
 </section>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperNameOrder.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperNameOrder.html
index e06d076..78cdcd4 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperNameOrder.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperNameOrder.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperNameOrder (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperNameOrder (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperNameOrder">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperNameOrder" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperNameOrder</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
@@ -73,12 +63,12 @@ <h2>Uses of <a href="../QueryMapper.MapperNameOrder.html" title="interface in ja
 <div class="col-first even-row-color"><code><a href="../QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperOrder.</span><code><a href="../QueryMapper.MapperOrder.html#asc()" class="member-name-link">asc</a>()</code></div>
 <div class="col-last even-row-color">
-<div class="block">Defines the order ascending</div>
+<div class="block">Defines the order as ascending.</div>
 </div>
 <div class="col-first odd-row-color"><code><a href="../QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></code></div>
 <div class="col-second odd-row-color"><span class="type-name-label">QueryMapper.MapperOrder.</span><code><a href="../QueryMapper.MapperOrder.html#desc()" class="member-name-link">desc</a>()</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Defines the order as descending</div>
+<div class="block">Defines the order as descending.</div>
 </div>
 </div>
 </section>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperNotCondition.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperNotCondition.html
index c104d72..9367d36 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperNotCondition.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperNotCondition.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperNotCondition (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperNotCondition (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperNotCondition">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperNotCondition.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperNotCondition" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperNotCondition</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNotCondition</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
@@ -73,7 +63,7 @@ <h2>Uses of <a href="../QueryMapper.MapperNotCondition.html" title="interface in
 <div class="col-first even-row-color"><code><a href="../QueryMapper.MapperNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNotCondition</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperNameCondition.</span><code><a href="../QueryMapper.MapperNameCondition.html#not()" class="member-name-link">not</a>()</code></div>
 <div class="col-last even-row-color">
-<div class="block">Creates a NOT condition for the column name provided.</div>
+<div class="block">Creates a NOT condition for the specified column name.</div>
 </div>
 </div>
 </section>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperOrder.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperOrder.html
index 1c41d73..2e2925e 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperOrder.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperOrder.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperOrder (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperOrder (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperOrder">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperOrder" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperOrder</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
@@ -73,17 +63,17 @@ <h2>Uses of <a href="../QueryMapper.MapperOrder.html" title="interface in jakart
 <div class="col-first even-row-color"><code><a href="../QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperFrom.</span><code><a href="../QueryMapper.MapperFrom.html#orderBy(java.lang.String)" class="member-name-link">orderBy</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Add the order how the result will return</div>
+<div class="block">Add the order how the result will return based on a given column name.</div>
 </div>
 <div class="col-first odd-row-color"><code><a href="../QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></code></div>
 <div class="col-second odd-row-color"><span class="type-name-label">QueryMapper.MapperNameOrder.</span><code><a href="../QueryMapper.MapperNameOrder.html#orderBy(java.lang.String)" class="member-name-link">orderBy</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Add the order of how the result will return based on a given column name</div>
+<div class="block">Add the order of how the result will return based on a given column name.</div>
 </div>
 <div class="col-first even-row-color"><code><a href="../QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperWhere.</span><code><a href="../QueryMapper.MapperWhere.html#orderBy(java.lang.String)" class="member-name-link">orderBy</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Add the order how the result will return</div>
+<div class="block">Add the order how the result will return.</div>
 </div>
 </div>
 </section>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperQueryBuild.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperQueryBuild.html
index f5db3a1..d7e0797 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperQueryBuild.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperQueryBuild.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperQueryBuild (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperQueryBuild (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperQueryBuild">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperQueryBuild" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperQueryBuild</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
@@ -73,40 +63,34 @@ <h2>Uses of <a href="../QueryMapper.MapperQueryBuild.html" title="interface in j
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="../QueryMapper.MapperFrom.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">Represents the first step in the query fluent API</div>
+<div class="block">Represents the first step in the query fluent API.</div>
 </div>
 <div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second odd-row-color"><code><a href="../QueryMapper.MapperLimit.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperLimit</a></code></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution.</div>
 </div>
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="../QueryMapper.MapperNameOrder.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></code></div>
 <div class="col-last even-row-color">
-<div class="block">Represents the step in the query fluent API where it's possible to:
- 
-     define the order of the results
-     or define the position of the first result
-     or define the maximum number of results to retrieve
-     or to perform the query execution
- </div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </div>
 <div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second odd-row-color"><code><a href="../QueryMapper.MapperSkip.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperSkip</a></code></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution.</div>
 </div>
 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
 <div class="col-second even-row-color"><code><a href="../QueryMapper.MapperWhere.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-last even-row-color">
 <div class="block">Represents a step where it's possible to:
  
-     Create a new condition performing logical conjunction (AND) by giving a column name
-     Or create a new condition performing logical disjunction (OR) by giving a column name
-     Or define the position of the first result
-     Or define the maximum number of results to retrieve
-     Or define the order of the results
-     Or to perform the query execution
+     Create a new condition performing logical conjunction (AND) by specifying a column name
+     Create a new condition performing logical disjunction (OR) by specifying a column name
+     Define the position of the first result
+     Define the maximum number of results to retrieve
+     Define the order of the results
+     Perform the query execution
  </div>
 </div>
 </div>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperSkip.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperSkip.html
index 5ddd4f7..5e002c6 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperSkip.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperSkip.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperSkip (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperSkip (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperSkip">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperSkip.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperSkip" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperSkip</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperSkip.html" title="interface in jakarta.nosql">QueryMapper.MapperSkip</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperWhere.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperWhere.html
index 2c845f3..da63010 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperWhere.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.MapperWhere.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper.MapperWhere (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper.MapperWhere (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper, interface: MapperWhere">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,15 +50,6 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.QueryMapper.MapperWhere" class="title">Uses of Interface<br>jakarta.nosql.QueryMapper.MapperWhere</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-</div>
 <section class="class-uses">
 <ul class="block-list">
 <li>
@@ -74,42 +64,42 @@ <h2>Uses of <a href="../QueryMapper.MapperWhere.html" title="interface in jakart
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperNameCondition.</span><code><a href="../QueryMapper.MapperNameCondition.html#between(T,T)" class="member-name-link">between</a><wbr>(T&nbsp;valueA,
  T&nbsp;valueB)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Creates a condition where the column name provided is between the provided values</div>
+<div class="block">Creates a condition where the specified column name is between the provided values.</div>
 </div>
 <div class="col-first odd-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second odd-row-color"><span class="type-name-label">QueryMapper.MapperNameCondition.</span><code><a href="../QueryMapper.MapperNameCondition.html#eq(T)" class="member-name-link">eq</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Creates a condition where the column name provided is equal to the provided value</div>
+<div class="block">Creates a condition where the specified column name equals the provided value.</div>
 </div>
 <div class="col-first even-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperNameCondition.</span><code><a href="../QueryMapper.MapperNameCondition.html#gt(T)" class="member-name-link">gt</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Creates a condition where the column name provided is greater than to the provided value</div>
+<div class="block">Creates a condition where the specified column name is greater than the provided value.</div>
 </div>
 <div class="col-first odd-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second odd-row-color"><span class="type-name-label">QueryMapper.MapperNameCondition.</span><code><a href="../QueryMapper.MapperNameCondition.html#gte(T)" class="member-name-link">gte</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Creates a condition where the column name provided is greater than or equal to the provided value</div>
+<div class="block">Creates a condition where the specified column name is greater than or equal to the provided value.</div>
 </div>
 <div class="col-first even-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperNameCondition.</span><code><a href="../QueryMapper.MapperNameCondition.html#in(java.lang.Iterable)" class="member-name-link">in</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;values)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Creates a condition where the column name provided is in the provided iterable values</div>
+<div class="block">Creates a condition where the specified column name is in the provided iterable values.</div>
 </div>
 <div class="col-first odd-row-color"><code><a href="../QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second odd-row-color"><span class="type-name-label">QueryMapper.MapperNameCondition.</span><code><a href="../QueryMapper.MapperNameCondition.html#like(java.lang.String)" class="member-name-link">like</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;value)</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Creates a condition where the column name provided is like to the provided value</div>
+<div class="block">Creates a condition where the specified column name is like the provided value.</div>
 </div>
 <div class="col-first even-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second even-row-color"><span class="type-name-label">QueryMapper.MapperNameCondition.</span><code><a href="../QueryMapper.MapperNameCondition.html#lt(T)" class="member-name-link">lt</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Creates a condition where the column name provided is less than the provided value</div>
+<div class="block">Creates a condition where the specified column name is less than the provided value.</div>
 </div>
 <div class="col-first odd-row-color"><code>&lt;T&gt;&nbsp;<a href="../QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></code></div>
 <div class="col-second odd-row-color"><span class="type-name-label">QueryMapper.MapperNameCondition.</span><code><a href="../QueryMapper.MapperNameCondition.html#lte(T)" class="member-name-link">lte</a><wbr>(T&nbsp;value)</code></div>
 <div class="col-last odd-row-color">
-<div class="block">Creates a condition where the column name provided is less than or equal to the provided value</div>
+<div class="block">Creates a condition where the specified column name is less than or equal to the provided value.</div>
 </div>
 </div>
 </section>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.html
index bd2c8c4..c5a4ef9 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/QueryMapper.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.QueryMapper (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.QueryMapper (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: QueryMapper">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../QueryMapper.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Template.html b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Template.html
index d4c4a7a..1b1d8d2 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Template.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/class-use/Template.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.Template (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Interface jakarta.nosql.Template (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql, interface: Template">
 <meta name="generator" content="javadoc/ClassUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
 <li><a href="../../../module-summary.html">Module</a></li>
 <li><a href="../package-summary.html">Package</a></li>
 <li><a href="../Template.html" title="interface in jakarta.nosql">Class</a></li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,76 +50,7 @@
 <div class="header">
 <h1 title="Uses of Interface jakarta.nosql.Template" class="title">Uses of Interface<br>jakarta.nosql.Template</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="../Template.html" title="interface in jakarta.nosql">Template</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql.column">jakarta.nosql.column</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the API to Column Family in mapping level.</div>
-</div>
-<div class="col-first odd-row-color"><a href="#jakarta.nosql.document">jakarta.nosql.document</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Defines the API to Document Collection in mapping level.</div>
-</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql.keyvalue">jakarta.nosql.keyvalue</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the API to Key-value in mapping level.</div>
-</div>
-</div>
-<section class="class-uses">
-<ul class="block-list">
-<li>
-<section class="detail" id="jakarta.nosql.column">
-<h2>Uses of <a href="../Template.html" title="interface in jakarta.nosql">Template</a> in <a href="../../../../jakarta.nosql.column/jakarta/nosql/column/package-summary.html">jakarta.nosql.column</a></h2>
-<div class="caption"><span>Subinterfaces of <a href="../Template.html" title="interface in jakarta.nosql">Template</a> in <a href="../../../../jakarta.nosql.column/jakarta/nosql/column/package-summary.html">jakarta.nosql.column</a></span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Interface</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><code>interface&nbsp;</code></div>
-<div class="col-second even-row-color"><code><a href="../../../../jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html" class="type-name-link" title="interface in jakarta.nosql.column">ColumnTemplate</a></code></div>
-<div class="col-last even-row-color">
-<div class="block"><a href="../Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Column-Family or Wide-Column databases.</div>
-</div>
-</div>
-</section>
-</li>
-<li>
-<section class="detail" id="jakarta.nosql.document">
-<h2>Uses of <a href="../Template.html" title="interface in jakarta.nosql">Template</a> in <a href="../../../../jakarta.nosql.document/jakarta/nosql/document/package-summary.html">jakarta.nosql.document</a></h2>
-<div class="caption"><span>Subinterfaces of <a href="../Template.html" title="interface in jakarta.nosql">Template</a> in <a href="../../../../jakarta.nosql.document/jakarta/nosql/document/package-summary.html">jakarta.nosql.document</a></span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Interface</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><code>interface&nbsp;</code></div>
-<div class="col-second even-row-color"><code><a href="../../../../jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html" class="type-name-link" title="interface in jakarta.nosql.document">DocumentTemplate</a></code></div>
-<div class="col-last even-row-color">
-<div class="block"><a href="../Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Document-oriented databases.</div>
-</div>
-</div>
-</section>
-</li>
-<li>
-<section class="detail" id="jakarta.nosql.keyvalue">
-<h2>Uses of <a href="../Template.html" title="interface in jakarta.nosql">Template</a> in <a href="../../../../jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html">jakarta.nosql.keyvalue</a></h2>
-<div class="caption"><span>Subinterfaces of <a href="../Template.html" title="interface in jakarta.nosql">Template</a> in <a href="../../../../jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html">jakarta.nosql.keyvalue</a></span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Interface</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><code>interface&nbsp;</code></div>
-<div class="col-second even-row-color"><code><a href="../../../../jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" class="type-name-link" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></code></div>
-<div class="col-last even-row-color">
-<div class="block"><a href="../Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Key-Value databases.</div>
-</div>
-</div>
-</section>
-</li>
-</ul>
-</section>
-</main>
+No usage of jakarta.nosql.Template</main>
 <footer role="contentinfo">
 <hr>
 <p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/package-summary.html b/javadoc/jakarta.nosql.core/jakarta/nosql/package-summary.html
index f3fc8b0..afbafc2 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/package-summary.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>jakarta.nosql (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>jakarta.nosql (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core, package: jakarta.nosql">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li class="nav-bar-cell1-rev">Package</li>
 <li>Class</li>
@@ -40,19 +34,29 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
-<li><a href="#related-package-summary">Related Packages</a>&nbsp;|&nbsp;</li>
+<li>Related Packages&nbsp;|&nbsp;</li>
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -67,145 +71,174 @@ <h1 title="Package jakarta.nosql" class="title">Package jakarta.nosql</h1>
 <hr>
 <div class="package-signature">package <span class="element-name">jakarta.nosql</span></div>
 <section class="package-description" id="package-description">
-<div class="block">Defines the core API in mapping level.
- It brings an easy interface to support NoSQL databases using as base Jakarta NoSQL.
+<div class="block">Provides classes and interfaces for integrating Java applications with various NoSQL databases.
+ <p>
+ NoSQL databases are a category of database systems that differ from traditional relational databases in their data
+ storage and retrieval mechanisms. Unlike relational databases, which organize data into tables with predefined schemas,
+ NoSQL databases use flexible data models that allow for unstructured or semi-structured data storage. These databases
+ are often preferred for their ability to handle large volumes of data, their scalability, and their flexibility in
+ accommodating evolving data schemas.
+ <p>
+ The <a href="Entity.html" title="annotation interface in jakarta.nosql"><code>Entity</code></a> annotation specifies that the class is an entity.
+ <p>
+ The <a href="Embeddable.html" title="annotation interface in jakarta.nosql"><code>Embeddable</code></a> annotation declares a class whose instances are stored as an intrinsic part of an
+ owning entity, sharing the identity of the entity.
+ <p>
+ The <a href="Id.html" title="annotation interface in jakarta.nosql"><code>Id</code></a> annotation specifies the primary key of an entity.
  <p>
- The focus of this API is on simplicity and ease of use.
- Developers should only have to know a minimal set of
- artifacts to work with the solution.
- </p></div>
+ The <a href="Column.html" title="annotation interface in jakarta.nosql"><code>Column</code></a> annotation specifies the mapping of a persistent property or field to a database column.
+ <p>
+ The <a href="Convert.html" title="annotation interface in jakarta.nosql"><code>Convert</code></a> annotation specifies how the values of a field or property are converted to a basic
+ type or a type that can be persisted by a persistence provider.
+ <p>
+ The <a href="MappedSuperclass.html" title="annotation interface in jakarta.nosql"><code>MappedSuperclass</code></a> annotation specifies a class whose mapping information is applied to entities
+ that inherit from it.
+ <p>
+ The <a href="Inheritance.html" title="annotation interface in jakarta.nosql"><code>Inheritance</code></a> annotation specifies the inheritance mapping strategy for the entity class hierarchy.
+ <p>
+ The <a href="DiscriminatorColumn.html" title="annotation interface in jakarta.nosql"><code>DiscriminatorColumn</code></a> annotation specifies the discriminator column for the inheritance mapping
+ strategy.
+ <p>
+ The <a href="DiscriminatorValue.html" title="annotation interface in jakarta.nosql"><code>DiscriminatorValue</code></a> annotation specifies the value of the discriminator column for the annotated
+ entity type.
+ <p>
+ The <a href="Template.html" title="interface in jakarta.nosql"><code>Template</code></a> interface provides methods for interacting with NoSQL databases, allowing operations
+ such as insertion, updating, querying, and deletion of entities.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
 <li>
-<div id="related-package-summary">
-<div class="caption"><span>Related Packages</span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Module</div>
-<div class="table-header col-second">Package</div>
+<div id="class-summary">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="class-summary-tab0" role="tab" aria-selected="true" aria-controls="class-summary.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="class-summary-tab1" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab1', 2)" class="table-tab">Interfaces</button><button id="class-summary-tab3" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab3', 2)" class="table-tab">Enum Classes</button><button id="class-summary-tab5" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab5', 2)" class="table-tab">Exception Classes</button><button id="class-summary-tab6" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab6', 2)" class="table-tab">Annotation Interfaces</button></div>
+<div id="class-summary.tabpanel" role="tabpanel">
+<div class="summary-table two-column-summary" aria-labelledby="class-summary-tab0">
+<div class="table-header col-first">Class</div>
 <div class="table-header col-last">Description</div>
-<div class="col-plain even-row-color"><a href="../../../jakarta.nosql.column/module-summary.html">jakarta.nosql.column</a></div>
-<div class="col-first even-row-color"><a href="../../../jakarta.nosql.column/jakarta/nosql/column/package-summary.html">jakarta.nosql.column</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the API to Column Family in mapping level.</div>
+<div class="col-first even-row-color class-summary class-summary-tab1"><a href="AttributeConverter.html" title="interface in jakarta.nosql">AttributeConverter</a>&lt;X,<wbr>Y&gt;</div>
+<div class="col-last even-row-color class-summary class-summary-tab1">
+<div class="block">A class that implements this interface can be used to convert entity attribute state into a database column
+ representation and vice versa.</div>
 </div>
-<div class="col-plain odd-row-color"><a href="../../../jakarta.nosql.document/module-summary.html">jakarta.nosql.document</a></div>
-<div class="col-first odd-row-color"><a href="../../../jakarta.nosql.document/jakarta/nosql/document/package-summary.html">jakarta.nosql.document</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Defines the API to Document Collection in mapping level.</div>
+<div class="col-first odd-row-color class-summary class-summary-tab6"><a href="Column.html" title="annotation interface in jakarta.nosql">Column</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab6">
+<div class="block">Specifies the column mapped by the annotated persistent property or field.</div>
 </div>
-<div class="col-plain even-row-color"><a href="../../../jakarta.nosql.keyvalue/module-summary.html">jakarta.nosql.keyvalue</a></div>
-<div class="col-first even-row-color"><a href="../../../jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html">jakarta.nosql.keyvalue</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the API to Key-value in mapping level.</div>
+<div class="col-first even-row-color class-summary class-summary-tab6"><a href="Convert.html" title="annotation interface in jakarta.nosql">Convert</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab6">
+<div class="block">Specifies how the values of a field or property are converted to a basic type or a type that can be persisted by a persistence provider.</div>
 </div>
+<div class="col-first odd-row-color class-summary class-summary-tab6"><a href="DiscriminatorColumn.html" title="annotation interface in jakarta.nosql">DiscriminatorColumn</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab6">
+<div class="block">Specifies the discriminator column for the mapping strategy.</div>
 </div>
+<div class="col-first even-row-color class-summary class-summary-tab6"><a href="DiscriminatorValue.html" title="annotation interface in jakarta.nosql">DiscriminatorValue</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab6">
+<div class="block">Specifies the value of the discriminator column for the annotated entity type.</div>
 </div>
-</li>
-<li>
-<div id="class-summary">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="class-summary-tab0" role="tab" aria-selected="true" aria-controls="class-summary.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="class-summary-tab1" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab1', 2)" class="table-tab">Interfaces</button><button id="class-summary-tab5" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab5', 2)" class="table-tab">Exceptions</button><button id="class-summary-tab7" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab7', 2)" class="table-tab">Annotation Interfaces</button></div>
-<div id="class-summary.tabpanel" role="tabpanel">
-<div class="summary-table two-column-summary" aria-labelledby="class-summary-tab0">
-<div class="table-header col-first">Class</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color class-summary class-summary-tab7"><a href="Column.html" title="annotation interface in jakarta.nosql">Column</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab7">
-<div class="block">Specify the mapped column for a persistent property or field.</div>
+<div class="col-first odd-row-color class-summary class-summary-tab6"><a href="Embeddable.html" title="annotation interface in jakarta.nosql">Embeddable</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab6">
+<div class="block">Declares a type whose instances are stored as an intrinsic part of an owning entity, sharing the identity of the entity.</div>
+</div>
+<div class="col-first even-row-color class-summary class-summary-tab3"><a href="Embeddable.EmbeddableType.html" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab3">
+<div class="block">Defines the strategy for how fields of the embeddable class are stored.</div>
+</div>
+<div class="col-first odd-row-color class-summary class-summary-tab6"><a href="Entity.html" title="annotation interface in jakarta.nosql">Entity</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab6">
+<div class="block">Annotates a class as an entity, representing a persistent class corresponding to a database structure.</div>
 </div>
-<div class="col-first odd-row-color class-summary class-summary-tab7"><a href="Entity.html" title="annotation interface in jakarta.nosql">Entity</a></div>
-<div class="col-last odd-row-color class-summary class-summary-tab7">
-<div class="block">Specifies that the class is an entity.</div>
+<div class="col-first even-row-color class-summary class-summary-tab6"><a href="Id.html" title="annotation interface in jakarta.nosql">Id</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab6">
+<div class="block">Identifies the primary key of an entity.</div>
 </div>
-<div class="col-first even-row-color class-summary class-summary-tab7"><a href="Id.html" title="annotation interface in jakarta.nosql">Id</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab7">
-<div class="block">Specifies the mapped field of an entity is the entity’s ID, or the Key in Key-Value databases.</div>
+<div class="col-first odd-row-color class-summary class-summary-tab6"><a href="Inheritance.html" title="annotation interface in jakarta.nosql">Inheritance</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab6">
+<div class="block">Specifies the inheritance mapping strategy for the entity class hierarchy, which descends from the annotated entity class.</div>
 </div>
-<div class="col-first odd-row-color class-summary class-summary-tab5"><a href="NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></div>
+<div class="col-first even-row-color class-summary class-summary-tab6"><a href="MappedSuperclass.html" title="annotation interface in jakarta.nosql">MappedSuperclass</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab6">
+<div class="block">Defines a class whose mapping information is applied to entities that inherit from it.</div>
+</div>
+<div class="col-first odd-row-color class-summary class-summary-tab5"><a href="MappingException.html" title="class in jakarta.nosql">MappingException</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab5">
-<div class="block">The root exception to Mapping layer</div>
+<div class="block">An exception that occurs when there is a mapping error during entity mapping or persistence.</div>
 </div>
-<div class="col-first even-row-color class-summary class-summary-tab1"><a href="PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block">Represents a precompiled Query statement.</div>
+<div class="col-first even-row-color class-summary class-summary-tab5"><a href="NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab5">
+<div class="block">Thrown by the persistence provider when a problem occurs.</div>
 </div>
 <div class="col-first odd-row-color class-summary class-summary-tab1"><a href="QueryMapper.html" title="interface in jakarta.nosql">QueryMapper</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab1">
-<div class="block">This interface holds the interfaces that compose the Fluent API for selecting and deleting NoSQL entities.</div>
+<div class="block">This interface defines the Fluent API for selecting and deleting NoSQL entities.</div>
 </div>
 <div class="col-first even-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperDeleteFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteFrom</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block">Represents the first step in the delete query fluent API</div>
+<div class="block">Represents the first step in the delete query fluent API.</div>
 </div>
 <div class="col-first odd-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperDeleteNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab1">
-<div class="block">Represents a delete condition based on a column name</div>
+<div class="block">Represents a delete condition based on a column name.</div>
 </div>
 <div class="col-first even-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperDeleteNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNotCondition</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block">Represents a NOT delete condition in the delete query fluent API</div>
+<div class="block">Represents a NOT delete condition in the delete query fluent API.</div>
 </div>
 <div class="col-first odd-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperDeleteQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteQueryBuild</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab1">
-<div class="block">Represents the last step of the delete query fluent API execution</div>
+<div class="block">Represents the last step of the delete query fluent API execution.</div>
 </div>
 <div class="col-first even-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperDeleteWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperDeleteWhere</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction adding one more delete condition or end up performing the built query</div>
+<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction,
+ add one more delete condition, or end up performing the built query.</div>
 </div>
 <div class="col-first odd-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperFrom.html" title="interface in jakarta.nosql">QueryMapper.MapperFrom</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab1">
-<div class="block">Represents the first step in the query fluent API</div>
+<div class="block">Represents the first step in the query fluent API.</div>
 </div>
 <div class="col-first even-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperLimit.html" title="interface in jakarta.nosql">QueryMapper.MapperLimit</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution.</div>
 </div>
 <div class="col-first odd-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperNameCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNameCondition</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab1">
-<div class="block">Represents a condition based on a column name</div>
+<div class="block">Represents a condition based on a column name.</div>
 </div>
 <div class="col-first even-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperNameOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperNameOrder</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block">Represents the step in the query fluent API where it's possible to:
- 
-     define the order of the results
-     or define the position of the first result
-     or define the maximum number of results to retrieve
-     or to perform the query execution
- </div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </div>
 <div class="col-first odd-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperNotCondition.html" title="interface in jakarta.nosql">QueryMapper.MapperNotCondition</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab1">
-<div class="block">Represents a NOT condition in the delete query fluent API</div>
+<div class="block">Represents a NOT condition in the delete query fluent API.</div>
 </div>
 <div class="col-first even-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperOrder.html" title="interface in jakarta.nosql">QueryMapper.MapperOrder</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </div>
 <div class="col-first odd-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperQueryBuild.html" title="interface in jakarta.nosql">QueryMapper.MapperQueryBuild</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab1">
-<div class="block">Represents the last step of the query fluent API execution</div>
+<div class="block">Represents the last step of the query fluent API execution.</div>
 </div>
 <div class="col-first even-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperSkip.html" title="interface in jakarta.nosql">QueryMapper.MapperSkip</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution.</div>
 </div>
 <div class="col-first odd-row-color class-summary class-summary-tab1"><a href="QueryMapper.MapperWhere.html" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab1">
 <div class="block">Represents a step where it's possible to:
  
-     Create a new condition performing logical conjunction (AND) by giving a column name
-     Or create a new condition performing logical disjunction (OR) by giving a column name
-     Or define the position of the first result
-     Or define the maximum number of results to retrieve
-     Or define the order of the results
-     Or to perform the query execution
+     Create a new condition performing logical conjunction (AND) by specifying a column name
+     Create a new condition performing logical disjunction (OR) by specifying a column name
+     Define the position of the first result
+     Define the maximum number of results to retrieve
+     Define the order of the results
+     Perform the query execution
  </div>
 </div>
 <div class="col-first even-row-color class-summary class-summary-tab1"><a href="Template.html" title="interface in jakarta.nosql">Template</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block">Templates are a helper class that increases productivity when performing common NoSQL operations.</div>
+<div class="block"><code>Template</code> is a helper class that increases productivity when performing common NoSQL operations.</div>
 </div>
 </div>
 </div>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/package-tree.html b/javadoc/jakarta.nosql.core/jakarta/nosql/package-tree.html
index 793746f..2966779 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/package-tree.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>jakarta.nosql Class Hierarchy (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>jakarta.nosql Class Hierarchy (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: module: jakarta.nosql.core, package: jakarta.nosql">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li>Class</li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -50,10 +49,6 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package jakarta.nosql</h1>
-<span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../../../overview-tree.html">All Packages</a></li>
-</ul>
 </div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
@@ -66,7 +61,11 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" class="type-name-link external-link" title="class or interface in java.lang">RuntimeException</a>
 <ul>
-<li class="circle">jakarta.nosql.<a href="NoSQLException.html" class="type-name-link" title="class in jakarta.nosql">NoSQLException</a></li>
+<li class="circle">jakarta.nosql.<a href="NoSQLException.html" class="type-name-link" title="class in jakarta.nosql">NoSQLException</a>
+<ul>
+<li class="circle">jakarta.nosql.<a href="MappingException.html" class="type-name-link" title="class in jakarta.nosql">MappingException</a></li>
+</ul>
+</li>
 </ul>
 </li>
 </ul>
@@ -80,7 +79,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <section class="hierarchy">
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
-<li class="circle">jakarta.nosql.<a href="PreparedStatement.html" class="type-name-link" title="interface in jakarta.nosql">PreparedStatement</a></li>
+<li class="circle">jakarta.nosql.<a href="AttributeConverter.html" class="type-name-link" title="interface in jakarta.nosql">AttributeConverter</a>&lt;X,<wbr>Y&gt;</li>
 <li class="circle">jakarta.nosql.<a href="QueryMapper.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper</a></li>
 <li class="circle">jakarta.nosql.<a href="QueryMapper.MapperDeleteNameCondition.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a>
 <ul>
@@ -115,8 +114,28 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <h2 title="Annotation Interface Hierarchy">Annotation Interface Hierarchy</h2>
 <ul>
 <li class="circle">jakarta.nosql.<a href="Column.html" class="type-name-link" title="annotation interface in jakarta.nosql">Column</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+<li class="circle">jakarta.nosql.<a href="Convert.html" class="type-name-link" title="annotation interface in jakarta.nosql">Convert</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+<li class="circle">jakarta.nosql.<a href="DiscriminatorColumn.html" class="type-name-link" title="annotation interface in jakarta.nosql">DiscriminatorColumn</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+<li class="circle">jakarta.nosql.<a href="DiscriminatorValue.html" class="type-name-link" title="annotation interface in jakarta.nosql">DiscriminatorValue</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+<li class="circle">jakarta.nosql.<a href="Embeddable.html" class="type-name-link" title="annotation interface in jakarta.nosql">Embeddable</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
 <li class="circle">jakarta.nosql.<a href="Entity.html" class="type-name-link" title="annotation interface in jakarta.nosql">Entity</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
 <li class="circle">jakarta.nosql.<a href="Id.html" class="type-name-link" title="annotation interface in jakarta.nosql">Id</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+<li class="circle">jakarta.nosql.<a href="Inheritance.html" class="type-name-link" title="annotation interface in jakarta.nosql">Inheritance</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+<li class="circle">jakarta.nosql.<a href="MappedSuperclass.html" class="type-name-link" title="annotation interface in jakarta.nosql">MappedSuperclass</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+</ul>
+</section>
+<section class="hierarchy">
+<h2 title="Enum Class Hierarchy">Enum Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" class="type-name-link external-link" title="class or interface in java.lang">Enum</a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;T&gt;, java.lang.constant.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/constant/Constable.html" title="class or interface in java.lang.constant" class="external-link">Constable</a>, java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a>)
+<ul>
+<li class="circle">jakarta.nosql.<a href="Embeddable.EmbeddableType.html" class="type-name-link" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></li>
+</ul>
+</li>
+</ul>
+</li>
 </ul>
 </section>
 </main>
diff --git a/javadoc/jakarta.nosql.core/jakarta/nosql/package-use.html b/javadoc/jakarta.nosql.core/jakarta/nosql/package-use.html
index dcd2710..d5a731f 100644
--- a/javadoc/jakarta.nosql.core/jakarta/nosql/package-use.html
+++ b/javadoc/jakarta.nosql.core/jakarta/nosql/package-use.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Package jakarta.nosql (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Uses of Package jakarta.nosql (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="use: module: jakarta.nosql.core, package: jakarta.nosql">
 <meta name="generator" content="javadoc/PackageUseWriter">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
 <li><a href="../../module-summary.html">Module</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li>Class</li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -51,27 +50,6 @@
 <div class="header">
 <h1 title="Uses of Package jakarta.nosql" class="title">Uses of Package<br>jakarta.nosql</h1>
 </div>
-<div class="caption"><span>Packages that use <a href="package-summary.html">jakarta.nosql</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-<div class="col-first odd-row-color"><a href="#jakarta.nosql.column">jakarta.nosql.column</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Defines the API to Column Family in mapping level.</div>
-</div>
-<div class="col-first even-row-color"><a href="#jakarta.nosql.document">jakarta.nosql.document</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the API to Document Collection in mapping level.</div>
-</div>
-<div class="col-first odd-row-color"><a href="#jakarta.nosql.keyvalue">jakarta.nosql.keyvalue</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Defines the API to Key-value in mapping level.</div>
-</div>
-</div>
 <section class="package-uses">
 <ul class="block-list">
 <li>
@@ -80,134 +58,82 @@ <h1 title="Uses of Package jakarta.nosql" class="title">Uses of Package<br>jakar
 <div class="summary-table two-column-summary">
 <div class="table-header col-first">Class</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="class-use/PreparedStatement.html#jakarta.nosql">PreparedStatement</a></div>
+<div class="col-first even-row-color"><a href="class-use/Embeddable.EmbeddableType.html#jakarta.nosql">Embeddable.EmbeddableType</a></div>
 <div class="col-last even-row-color">
-<div class="block">Represents a precompiled Query statement.</div>
+<div class="block">Defines the strategy for how fields of the embeddable class are stored.</div>
 </div>
-<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperDeleteFrom.html#jakarta.nosql">QueryMapper.MapperDeleteFrom</a></div>
+<div class="col-first odd-row-color"><a href="class-use/NoSQLException.html#jakarta.nosql">NoSQLException</a></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents the first step in the delete query fluent API</div>
+<div class="block">Thrown by the persistence provider when a problem occurs.</div>
 </div>
-<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperDeleteNameCondition.html#jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></div>
+<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperDeleteFrom.html#jakarta.nosql">QueryMapper.MapperDeleteFrom</a></div>
 <div class="col-last even-row-color">
-<div class="block">Represents a delete condition based on a column name</div>
+<div class="block">Represents the first step in the delete query fluent API.</div>
 </div>
-<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperDeleteNotCondition.html#jakarta.nosql">QueryMapper.MapperDeleteNotCondition</a></div>
+<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperDeleteNameCondition.html#jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents a NOT delete condition in the delete query fluent API</div>
+<div class="block">Represents a delete condition based on a column name.</div>
 </div>
-<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperDeleteQueryBuild.html#jakarta.nosql">QueryMapper.MapperDeleteQueryBuild</a></div>
+<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperDeleteNotCondition.html#jakarta.nosql">QueryMapper.MapperDeleteNotCondition</a></div>
 <div class="col-last even-row-color">
-<div class="block">Represents the last step of the delete query fluent API execution</div>
+<div class="block">Represents a NOT delete condition in the delete query fluent API.</div>
 </div>
-<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperDeleteWhere.html#jakarta.nosql">QueryMapper.MapperDeleteWhere</a></div>
+<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperDeleteQueryBuild.html#jakarta.nosql">QueryMapper.MapperDeleteQueryBuild</a></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction adding one more delete condition or end up performing the built query</div>
+<div class="block">Represents the last step of the delete query fluent API execution.</div>
 </div>
-<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperFrom.html#jakarta.nosql">QueryMapper.MapperFrom</a></div>
+<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperDeleteWhere.html#jakarta.nosql">QueryMapper.MapperDeleteWhere</a></div>
 <div class="col-last even-row-color">
-<div class="block">Represents the first step in the query fluent API</div>
+<div class="block">Represents a step where it's possible to perform a logical conjunction or disjunction,
+ add one more delete condition, or end up performing the built query.</div>
 </div>
-<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperLimit.html#jakarta.nosql">QueryMapper.MapperLimit</a></div>
+<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperFrom.html#jakarta.nosql">QueryMapper.MapperFrom</a></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution</div>
+<div class="block">Represents the first step in the query fluent API.</div>
 </div>
-<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperNameCondition.html#jakarta.nosql">QueryMapper.MapperNameCondition</a></div>
+<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperLimit.html#jakarta.nosql">QueryMapper.MapperLimit</a></div>
 <div class="col-last even-row-color">
-<div class="block">Represents a condition based on a column name</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the maximum number of results to retrieve or to perform the query execution.</div>
 </div>
-<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperNameOrder.html#jakarta.nosql">QueryMapper.MapperNameOrder</a></div>
+<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperNameCondition.html#jakarta.nosql">QueryMapper.MapperNameCondition</a></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents the step in the query fluent API where it's possible to:
- 
-     define the order of the results
-     or define the position of the first result
-     or define the maximum number of results to retrieve
-     or to perform the query execution
- </div>
+<div class="block">Represents a condition based on a column name.</div>
 </div>
-<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperNotCondition.html#jakarta.nosql">QueryMapper.MapperNotCondition</a></div>
+<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperNameOrder.html#jakarta.nosql">QueryMapper.MapperNameOrder</a></div>
 <div class="col-last even-row-color">
-<div class="block">Represents a NOT condition in the delete query fluent API</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </div>
-<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperOrder.html#jakarta.nosql">QueryMapper.MapperOrder</a></div>
+<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperNotCondition.html#jakarta.nosql">QueryMapper.MapperNotCondition</a></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution</div>
+<div class="block">Represents a NOT condition in the delete query fluent API.</div>
 </div>
-<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperQueryBuild.html#jakarta.nosql">QueryMapper.MapperQueryBuild</a></div>
+<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperOrder.html#jakarta.nosql">QueryMapper.MapperOrder</a></div>
 <div class="col-last even-row-color">
-<div class="block">Represents the last step of the query fluent API execution</div>
+<div class="block">Represents the step in the query fluent API where it's possible to define the order of the results or to perform the query execution.</div>
 </div>
-<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperSkip.html#jakarta.nosql">QueryMapper.MapperSkip</a></div>
+<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperQueryBuild.html#jakarta.nosql">QueryMapper.MapperQueryBuild</a></div>
 <div class="col-last odd-row-color">
-<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution</div>
+<div class="block">Represents the last step of the query fluent API execution.</div>
 </div>
-<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperWhere.html#jakarta.nosql">QueryMapper.MapperWhere</a></div>
+<div class="col-first even-row-color"><a href="class-use/QueryMapper.MapperSkip.html#jakarta.nosql">QueryMapper.MapperSkip</a></div>
 <div class="col-last even-row-color">
+<div class="block">Represents the step in the query fluent API where it's possible to define the position of the first result to retrieve or to perform the query execution.</div>
+</div>
+<div class="col-first odd-row-color"><a href="class-use/QueryMapper.MapperWhere.html#jakarta.nosql">QueryMapper.MapperWhere</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Represents a step where it's possible to:
  
-     Create a new condition performing logical conjunction (AND) by giving a column name
-     Or create a new condition performing logical disjunction (OR) by giving a column name
-     Or define the position of the first result
-     Or define the maximum number of results to retrieve
-     Or define the order of the results
-     Or to perform the query execution
+     Create a new condition performing logical conjunction (AND) by specifying a column name
+     Create a new condition performing logical disjunction (OR) by specifying a column name
+     Define the position of the first result
+     Define the maximum number of results to retrieve
+     Define the order of the results
+     Perform the query execution
  </div>
 </div>
 </div>
 </section>
 </li>
-<li>
-<section class="detail" id="jakarta.nosql.column">
-<div class="caption"><span>Classes in <a href="package-summary.html">jakarta.nosql</a> used by <a href="../../../jakarta.nosql.column/jakarta/nosql/column/package-summary.html">jakarta.nosql.column</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Class</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="class-use/PreparedStatement.html#jakarta.nosql.column">PreparedStatement</a></div>
-<div class="col-last even-row-color">
-<div class="block">Represents a precompiled Query statement.</div>
-</div>
-<div class="col-first odd-row-color"><a href="class-use/Template.html#jakarta.nosql.column">Template</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Templates are a helper class that increases productivity when performing common NoSQL operations.</div>
-</div>
-</div>
-</section>
-</li>
-<li>
-<section class="detail" id="jakarta.nosql.document">
-<div class="caption"><span>Classes in <a href="package-summary.html">jakarta.nosql</a> used by <a href="../../../jakarta.nosql.document/jakarta/nosql/document/package-summary.html">jakarta.nosql.document</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Class</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="class-use/PreparedStatement.html#jakarta.nosql.document">PreparedStatement</a></div>
-<div class="col-last even-row-color">
-<div class="block">Represents a precompiled Query statement.</div>
-</div>
-<div class="col-first odd-row-color"><a href="class-use/Template.html#jakarta.nosql.document">Template</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Templates are a helper class that increases productivity when performing common NoSQL operations.</div>
-</div>
-</div>
-</section>
-</li>
-<li>
-<section class="detail" id="jakarta.nosql.keyvalue">
-<div class="caption"><span>Classes in <a href="package-summary.html">jakarta.nosql</a> used by <a href="../../../jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html">jakarta.nosql.keyvalue</a></span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Class</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="class-use/PreparedStatement.html#jakarta.nosql.keyvalue">PreparedStatement</a></div>
-<div class="col-last even-row-color">
-<div class="block">Represents a precompiled Query statement.</div>
-</div>
-<div class="col-first odd-row-color"><a href="class-use/Template.html#jakarta.nosql.keyvalue">Template</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Templates are a helper class that increases productivity when performing common NoSQL operations.</div>
-</div>
-</div>
-</section>
-</li>
 </ul>
 </section>
 </main>
diff --git a/javadoc/jakarta.nosql.core/module-summary.html b/javadoc/jakarta.nosql.core/module-summary.html
index 25432f0..6ba7cf0 100644
--- a/javadoc/jakarta.nosql.core/module-summary.html
+++ b/javadoc/jakarta.nosql.core/module-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>jakarta.nosql.core (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>jakarta.nosql.core (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: module: jakarta.nosql.core">
 <meta name="generator" content="javadoc/ModuleWriterImpl">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 <script type="text/javascript" src="../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../script-dir/jquery-ui.min.js"></script>
@@ -24,21 +23,31 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../index.html">Overview</a></li>
 <li class="nav-bar-cell1-rev">Module</li>
-<li>Package</li>
+<li><a href="jakarta/nosql/package-summary.html">Package</a></li>
 <li>Class</li>
 <li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="jakarta/nosql/package-tree.html">Tree</a></li>
 <li><a href="../index-all.html">Index</a></li>
 <li><a href="../help-doc.html#module">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Module:</p>
+<ul>
+<li><a href="#module-description">Description</a></li>
+<li>Modules</li>
+<li><a href="#packages-summary">Packages</a></li>
+<li>Services</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Module:&nbsp;</li>
 <li><a href="#module-description">Description</a>&nbsp;|&nbsp;</li>
@@ -47,9 +56,9 @@
 <li>Services</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -84,7 +93,7 @@ <h2>Packages</h2>
 <div class="table-header col-last">Description</div>
 <div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="jakarta/nosql/package-summary.html">jakarta.nosql</a></div>
 <div class="col-last even-row-color package-summary-table package-summary-table-tab1">
-<div class="block">Defines the core API in mapping level.</div>
+<div class="block">Provides classes and interfaces for integrating Java applications with various NoSQL databases.</div>
 </div>
 </div>
 </div>
diff --git a/javadoc/jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html b/javadoc/jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html
deleted file mode 100644
index 3e80466..0000000
--- a/javadoc/jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html
+++ /dev/null
@@ -1,263 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>DocumentTemplate (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: module: jakarta.nosql.document, package: jakarta.nosql.document, interface: DocumentTemplate">
-<meta name="generator" content="javadoc/ClassWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
-<li><a href="../../../module-summary.html">Module</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="nav-bar-cell1-rev">Class</li>
-<li><a href="class-use/DocumentTemplate.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html#class">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method-summary">Method</a></li>
-</ul>
-<ul class="sub-nav-list">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method-detail">Method</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../../module-summary.html">jakarta.nosql.document</a></div>
-<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql.document</a></div>
-<h1 title="Interface DocumentTemplate" class="title">Interface DocumentTemplate</h1>
-</div>
-<section class="class-description" id="class-description">
-<dl class="notes">
-<dt>All Superinterfaces:</dt>
-<dd><code><a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></code></dd>
-</dl>
-<hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">DocumentTemplate</span><span class="extends-implements">
-extends <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></span></div>
-<div class="block"><a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Document-oriented databases.
-
- <p>
- These databases store data as documents, individual data sets that can be grouped into collections.
- </p>
-
- <p>
- This interface provides some methods that accepts queries in a text format to retrieve from the database but,
- <b>the query syntax belongs to each provider, thus, it is not Jakarta's NoSQL scope to define it.
- Accordingly, it might vary from implementation and NoSQL provider.</b>
- </p></div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<!-- ========== METHOD SUMMARY =========== -->
-<li>
-<section class="method-summary" id="method-summary">
-<h2>Method Summary</h2>
-<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button></div>
-<div id="method-summary-table.tabpanel" role="tabpanel">
-<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;long</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#count(java.lang.Class)" class="member-name-link">count</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;entityType)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Returns the number of elements from document collection</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>long</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#count(java.lang.String)" class="member-name-link">count</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;documentCollection)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Returns the number of elements from document collection</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#prepare(java.lang.String)" class="member-name-link">prepare</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Creates a <a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a> from the query</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;T&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#query(java.lang.String)" class="member-name-link">query</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes a query database, then bring the result as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a></div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#singleResult(java.lang.String)" class="member-name-link">singleResult</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes a query database, then bring the result as a unique result</div>
-</div>
-</div>
-</div>
-</div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-jakarta.nosql.Template">Methods inherited from interface&nbsp;jakarta.nosql.<a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></h3>
-<code><a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#delete(java.lang.Class)">delete</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#delete(java.lang.Class,K)">delete</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#find(java.lang.Class,K)">find</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#insert(java.lang.Iterable)">insert</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#insert(java.lang.Iterable,java.time.Duration)">insert</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#insert(T)">insert</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#insert(T,java.time.Duration)">insert</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#select(java.lang.Class)">select</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#update(java.lang.Iterable)">update</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#update(T)">update</a></code></div>
-</section>
-</li>
-</ul>
-</section>
-<section class="details">
-<ul class="details-list">
-<!-- ============ METHOD DETAIL ========== -->
-<li>
-<section class="method-details" id="method-detail">
-<h2>Method Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="count(java.lang.String)">
-<h3>count</h3>
-<div class="member-signature"><span class="return-type">long</span>&nbsp;<span class="element-name">count</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;documentCollection)</span></div>
-<div class="block">Returns the number of elements from document collection</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>documentCollection</code> - the document collection</dd>
-<dt>Returns:</dt>
-<dd>the number of elements</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when document collection is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the database dot not have support</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="count(java.lang.Class)">
-<h3>count</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type">long</span>&nbsp;<span class="element-name">count</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;entityType)</span></div>
-<div class="block">Returns the number of elements from document collection</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - entityType</dd>
-<dt>Parameters:</dt>
-<dd><code>entityType</code> - the document collection</dd>
-<dt>Returns:</dt>
-<dd>the number of elements</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when document collection is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the database dot not have support</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="query(java.lang.String)">
-<h3>query</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;T&gt;</span>&nbsp;<span class="element-name">query</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</span></div>
-<div class="block">Executes a query database, then bring the result as a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a>
-
- <p>
- <b>The query syntax belongs to each provider, thus, it is not Jakarta's NoSQL scope to define it. Accordingly, it might vary from implementation and NoSQL provider.</b>
- </p></div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>query</code> - the query</dd>
-<dt>Returns:</dt>
-<dd>the result as <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link"><code>Stream</code></a></dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when the query is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the provider does not support query by text</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="singleResult(java.lang.String)">
-<h3>singleResult</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</span>&nbsp;<span class="element-name">singleResult</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</span></div>
-<div class="block">Executes a query database, then bring the result as a unique result
-
- <p>
- <b>The query syntax belongs to each provider, thus, it is not Jakarta's NoSQL scope to define it. Accordingly, it might vary from implementation and NoSQL provider.</b>
- </p></div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>query</code> - the query</dd>
-<dt>Returns:</dt>
-<dd>the result as <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link"><code>Optional</code></a></dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when the query is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the provider does not support query by text</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="prepare(java.lang.String)">
-<h3>prepare</h3>
-<div class="member-signature"><span class="return-type"><a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></span>&nbsp;<span class="element-name">prepare</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</span></div>
-<div class="block">Creates a <a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a> from the query
-
- <p>
- <b>The query syntax belongs to each provider, thus, it is not Jakarta's NoSQL scope to define it. Accordingly, it might vary from implementation and NoSQL provider.</b>
- </p></div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>query</code> - the query</dd>
-<dt>Returns:</dt>
-<dd>a <a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a> instance</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when the query is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the provider does not support query by text</dd>
-</dl>
-</section>
-</li>
-</ul>
-</section>
-</li>
-</ul>
-</section>
-<!-- ========= END OF CLASS DATA ========= -->
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.document/jakarta/nosql/document/class-use/DocumentTemplate.html b/javadoc/jakarta.nosql.document/jakarta/nosql/document/class-use/DocumentTemplate.html
deleted file mode 100644
index b1603cd..0000000
--- a/javadoc/jakarta.nosql.document/jakarta/nosql/document/class-use/DocumentTemplate.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.document.DocumentTemplate (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="use: module: jakarta.nosql.document, package: jakarta.nosql.document, interface: DocumentTemplate">
-<meta name="generator" content="javadoc/ClassUseWriter">
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-<script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-use-page">
-<script type="text/javascript">var pathtoroot = "../../../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../../index.html">Overview</a></li>
-<li><a href="../../../../module-summary.html">Module</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../DocumentTemplate.html" title="interface in jakarta.nosql.document">Class</a></li>
-<li class="nav-bar-cell1-rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html#use">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<div class="header">
-<h1 title="Uses of Interface jakarta.nosql.document.DocumentTemplate" class="title">Uses of Interface<br>jakarta.nosql.document.DocumentTemplate</h1>
-</div>
-No usage of jakarta.nosql.document.DocumentTemplate</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.document/jakarta/nosql/document/package-summary.html b/javadoc/jakarta.nosql.document/jakarta/nosql/document/package-summary.html
deleted file mode 100644
index b6d064b..0000000
--- a/javadoc/jakarta.nosql.document/jakarta/nosql/document/package-summary.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>jakarta.nosql.document (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: module: jakarta.nosql.document, package: jakarta.nosql.document">
-<meta name="generator" content="javadoc/PackageWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="package-declaration-page">
-<script type="text/javascript">var pathtoroot = "../../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
-<li><a href="../../../module-summary.html">Module</a></li>
-<li class="nav-bar-cell1-rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html#package">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Package:&nbsp;</li>
-<li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
-<li><a href="#related-package-summary">Related Packages</a>&nbsp;|&nbsp;</li>
-<li><a href="#class-summary">Classes and Interfaces</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<div class="header">
-<div class="sub-title"><span class="module-label-in-package">Module</span>&nbsp;<a href="../../../module-summary.html">jakarta.nosql.document</a></div>
-<h1 title="Package jakarta.nosql.document" class="title">Package jakarta.nosql.document</h1>
-</div>
-<hr>
-<div class="package-signature">package <span class="element-name">jakarta.nosql.document</span></div>
-<section class="package-description" id="package-description">
-<div class="block">Defines the API to Document Collection in mapping level. This API going to focus in domain, in other words, ubiquitous language.
- <p>
- A document-oriented database, or document store, is a computer program designed for storing, retrieving, and managing document-oriented information,
- also known as semi-structured data. Document-oriented databases are one of the main categories of NoSQL databases,
- and the popularity of the term "document-oriented database" has grown with the use of the term NoSQL itself.
- </p>
- <p>
- XML databases are a subclass of document-oriented databases that are optimized to work with XML documents.
- </p>
- <p>
- Graph databases are similar, but add another layer, the relationship, which allows them to link documents for rapid traversal.
- </p>
- <p>
- Document-oriented databases are inherently a subclass of the key-value store, another NoSQL database concept.
- </p>
- <p>
- The difference lies in the way the data is processed; in a key-value store the data is considered to be inherently opaque to the database, whereas a document-oriented system
- relies on internal structure in the document in order to extract metadata that the database engine uses for further optimization.
- </p>
- <p>
- Although the difference is often moot due to tools in the systems, conceptually the document-store is designed to offer a richer experience with modern programming techniques.
- </p>
- <p>
- Document databases contrast strongly with the traditional relational database (RDB).
- Relational databases generally store data in separate tables that are defined by the programmer, and a single object may be spread across several tables.
- Document databases store all information for a given object in a single instance in the database, and every stored
- object can be different from every other.
- This makes mapping objects into the database a simple task, normally eliminating anything similar to an
- object-relational mapping. This makes document stores attractive
- for programming web applications, which are subject to continual change in place, and where speed of deployment is an important issue.
- </p></div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<li>
-<div id="related-package-summary">
-<div class="caption"><span>Related Packages</span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Module</div>
-<div class="table-header col-second">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-plain even-row-color"><a href="../../../../jakarta.nosql.core/module-summary.html">jakarta.nosql.core</a></div>
-<div class="col-first even-row-color"><a href="../../../../jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-<div class="col-plain odd-row-color"><a href="../../../../jakarta.nosql.column/module-summary.html">jakarta.nosql.column</a></div>
-<div class="col-first odd-row-color"><a href="../../../../jakarta.nosql.column/jakarta/nosql/column/package-summary.html">jakarta.nosql.column</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Defines the API to Column Family in mapping level.</div>
-</div>
-<div class="col-plain even-row-color"><a href="../../../../jakarta.nosql.keyvalue/module-summary.html">jakarta.nosql.keyvalue</a></div>
-<div class="col-first even-row-color"><a href="../../../../jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html">jakarta.nosql.keyvalue</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the API to Key-value in mapping level.</div>
-</div>
-</div>
-</div>
-</li>
-<li>
-<div id="class-summary">
-<div class="caption"><span>Interfaces</span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Class</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color class-summary class-summary-tab1"><a href="DocumentTemplate.html" title="interface in jakarta.nosql.document">DocumentTemplate</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block"><a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Document-oriented databases.</div>
-</div>
-</div>
-</div>
-</li>
-</ul>
-</section>
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.document/jakarta/nosql/document/package-tree.html b/javadoc/jakarta.nosql.document/jakarta/nosql/document/package-tree.html
deleted file mode 100644
index 628eec9..0000000
--- a/javadoc/jakarta.nosql.document/jakarta/nosql/document/package-tree.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>jakarta.nosql.document Class Hierarchy (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="tree: module: jakarta.nosql.document, package: jakarta.nosql.document">
-<meta name="generator" content="javadoc/PackageTreeWriter">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="package-tree-page">
-<script type="text/javascript">var pathtoroot = "../../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
-<li><a href="../../../module-summary.html">Module</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="nav-bar-cell1-rev">Tree</li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html#tree">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<div class="header">
-<h1 class="title">Hierarchy For Package jakarta.nosql.document</h1>
-<span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../../../../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<section class="hierarchy">
-<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
-<ul>
-<li class="circle">jakarta.nosql.<a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" class="type-name-link" title="interface in jakarta.nosql">Template</a>
-<ul>
-<li class="circle">jakarta.nosql.document.<a href="DocumentTemplate.html" class="type-name-link" title="interface in jakarta.nosql.document">DocumentTemplate</a></li>
-</ul>
-</li>
-</ul>
-</section>
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.document/module-summary.html b/javadoc/jakarta.nosql.document/module-summary.html
deleted file mode 100644
index 3aa005f..0000000
--- a/javadoc/jakarta.nosql.document/module-summary.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>jakarta.nosql.document (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: module: jakarta.nosql.document">
-<meta name="generator" content="javadoc/ModuleWriterImpl">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-<script type="text/javascript" src="../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="module-declaration-page">
-<script type="text/javascript">var pathtoroot = "../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../index.html">Overview</a></li>
-<li class="nav-bar-cell1-rev">Module</li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../index-all.html">Index</a></li>
-<li><a href="../help-doc.html#module">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Module:&nbsp;</li>
-<li><a href="#module-description">Description</a>&nbsp;|&nbsp;</li>
-<li>Modules&nbsp;|&nbsp;</li>
-<li><a href="#packages-summary">Packages</a>&nbsp;|&nbsp;</li>
-<li>Services</li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<div class="header">
-<h1 title="Module jakarta.nosql.document" class="title">Module jakarta.nosql.document</h1>
-</div>
-<hr>
-<div class="module-signature">module <span class="element-name">jakarta.nosql.document</span></div>
-<section class="module-description" id="module-description">
-<!-- ============ MODULE DESCRIPTION =========== -->
-<div class="block">The Jakarta NoSQL document module.
- <p>
- A document-oriented database, or document store, is a computer program designed for storing, retrieving, and managing document-oriented information,
- also known as semi-structured data. Document-oriented databases are one of the main categories of NoSQL databases,
- and the popularity of the term "document-oriented database" has grown with the use of the term NoSQL itself.
- </p></div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<li>
-<section class="packages-summary" id="packages-summary">
-<!-- ============ PACKAGES SUMMARY =========== -->
-<h2>Packages</h2>
-<div id="package-summary-table">
-<div class="caption"><span>Exports</span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="jakarta/nosql/document/package-summary.html">jakarta.nosql.document</a></div>
-<div class="col-last even-row-color package-summary-table package-summary-table-tab1">
-<div class="block">Defines the API to Document Collection in mapping level.</div>
-</div>
-</div>
-</div>
-</section>
-</li>
-</ul>
-</section>
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html b/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html
deleted file mode 100644
index a9c2087..0000000
--- a/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html
+++ /dev/null
@@ -1,444 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>KeyValueTemplate (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: module: jakarta.nosql.keyvalue, package: jakarta.nosql.keyvalue, interface: KeyValueTemplate">
-<meta name="generator" content="javadoc/ClassWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
-<li><a href="../../../module-summary.html">Module</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="nav-bar-cell1-rev">Class</li>
-<li><a href="class-use/KeyValueTemplate.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html#class">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method-summary">Method</a></li>
-</ul>
-<ul class="sub-nav-list">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method-detail">Method</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="sub-title"><span class="module-label-in-type">Module</span>&nbsp;<a href="../../../module-summary.html">jakarta.nosql.keyvalue</a></div>
-<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">jakarta.nosql.keyvalue</a></div>
-<h1 title="Interface KeyValueTemplate" class="title">Interface KeyValueTemplate</h1>
-</div>
-<section class="class-description" id="class-description">
-<dl class="notes">
-<dt>All Superinterfaces:</dt>
-<dd><code><a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></code></dd>
-</dl>
-<hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name type-name-label">KeyValueTemplate</span><span class="extends-implements">
-extends <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></span></div>
-<div class="block"><a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Key-Value databases.
-
- <p>
- These databases store data as key-value pairs, where each key represents a unique identifier
- for a piece of data.
- </p>
-
- <p>
- This interface provides some methods that accepts queries in a text format to retrieve from the database but,
- <b>the query syntax belongs to each provider, thus, it is not Jakarta's NoSQL scope to define it.
- Accordingly, it might vary from implementation and NoSQL provider.</b>
- </p></div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<!-- ========== METHOD SUMMARY =========== -->
-<li>
-<section class="method-summary" id="method-summary">
-<h2>Method Summary</h2>
-<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button><button id="method-summary-table-tab5" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab5', 3)" class="table-tab">Default Methods</button></div>
-<div id="method-summary-table.tabpanel" role="tabpanel">
-<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;K&gt;&nbsp;void</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#delete(java.lang.Iterable)" class="member-name-link">delete</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;K&gt;&nbsp;keys)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Removes entities from keys</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;K&gt;&nbsp;void</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#delete(K)" class="member-name-link">delete</a><wbr>(K&nbsp;key)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Removes an entity from key</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;K,<wbr>
-T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#get(java.lang.Iterable,java.lang.Class)" class="member-name-link">get</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;K&gt;&nbsp;keys,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Finds a list of values from keys</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;K,<wbr>
-T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#get(K,java.lang.Class)" class="member-name-link">get</a><wbr>(K&nbsp;key,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Finds the Value from a key</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getSingleResult(java.lang.String,java.lang.Class)" class="member-name-link">getSingleResult</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes a query database then returns as single result</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#prepare(java.lang.String,java.lang.Class)" class="member-name-link">prepare</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes a query database with <a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a></div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#put(java.lang.Iterable)" class="member-name-link">put</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;entities)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">Saves the <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link"><code>Iterable</code></a> of entities</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#put(java.lang.Iterable,java.time.Duration)" class="member-name-link">put</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;entities,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;ttl)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">Saves the <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link"><code>Iterable</code></a> of entities with a defined time to live</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;T</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#put(T)" class="member-name-link">put</a><wbr>(T&nbsp;entity)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Saves the entity</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;T</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#put(T,java.time.Duration)" class="member-name-link">put</a><wbr>(T&nbsp;entity,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;ttl)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Saves the entity with time to live</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>void</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#query(java.lang.String)" class="member-name-link">query</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes a query database and don't return result, e.g.: when the query is either <b>remove</b> or
- <b>put</b></div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;T&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#query(java.lang.String,java.lang.Class)" class="member-name-link">query</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Executes a query database.</div>
-</div>
-</div>
-</div>
-</div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-jakarta.nosql.Template">Methods inherited from interface&nbsp;jakarta.nosql.<a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql">Template</a></h3>
-<code><a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#delete(java.lang.Class)">delete</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#delete(java.lang.Class,K)">delete</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#find(java.lang.Class,K)">find</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#insert(java.lang.Iterable)">insert</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#insert(java.lang.Iterable,java.time.Duration)">insert</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#insert(T)">insert</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#insert(T,java.time.Duration)">insert</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#select(java.lang.Class)">select</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#update(java.lang.Iterable)">update</a>, <a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html#update(T)">update</a></code></div>
-</section>
-</li>
-</ul>
-</section>
-<section class="details">
-<ul class="details-list">
-<!-- ============ METHOD DETAIL ========== -->
-<li>
-<section class="method-details" id="method-detail">
-<h2>Method Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="put(T)">
-<h3 id="put(java.lang.Object)">put</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type">T</span>&nbsp;<span class="element-name">put</span><wbr><span class="parameters">(T&nbsp;entity)</span></div>
-<div class="block">Saves the entity</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>entity</code> - the entity to be inserted</dd>
-<dt>Returns:</dt>
-<dd>the entity</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when entity is null</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="put(T,java.time.Duration)">
-<h3 id="put(java.lang.Object,java.time.Duration)">put</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type">T</span>&nbsp;<span class="element-name">put</span><wbr><span class="parameters">(T&nbsp;entity,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;ttl)</span></div>
-<div class="block">Saves the entity with time to live</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>entity</code> - the entity to be inserted</dd>
-<dd><code>ttl</code> - the defined time to live</dd>
-<dt>Returns:</dt>
-<dd>the entity</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when entity is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when expired time is not supported</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="put(java.lang.Iterable)">
-<h3>put</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;</span>&nbsp;<span class="element-name">put</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;entities)</span></div>
-<div class="block">Saves the <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link"><code>Iterable</code></a> of entities</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>entities</code> - keys to be inserted</dd>
-<dt>Returns:</dt>
-<dd>the entities</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when the iterable is null</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="put(java.lang.Iterable,java.time.Duration)">
-<h3>put</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;</span>&nbsp;<span class="element-name">put</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;&nbsp;entities,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;ttl)</span></div>
-<div class="block">Saves the <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link"><code>Iterable</code></a> of entities with a defined time to live</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>entities</code> - entities to be insert</dd>
-<dd><code>ttl</code> - the time to entity expire</dd>
-<dt>Returns:</dt>
-<dd>the entities</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when the iterable is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when expired time is not supported</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="get(K,java.lang.Class)">
-<h3 id="get(java.lang.Object,java.lang.Class)">get</h3>
-<div class="member-signature"><span class="type-parameters">&lt;K,<wbr>
-T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</span>&nbsp;<span class="element-name">get</span><wbr><span class="parameters">(K&nbsp;key,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</span></div>
-<div class="block">Finds the Value from a key</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>K</code> - the key type</dd>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>key</code> - the key</dd>
-<dd><code>type</code> - the entity class to convert the result</dd>
-<dt>Returns:</dt>
-<dd>the <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link"><code>Optional</code></a> when is not found will return a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html#empty()" title="class or interface in java.util" class="external-link"><code>Optional.empty()</code></a></dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when the key is null</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="query(java.lang.String,java.lang.Class)">
-<h3>query</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;T&gt;</span>&nbsp;<span class="element-name">query</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</span></div>
-<div class="block">Executes a query database.
-
- <p>
- <b>The query syntax belongs to each provider, thus, it is not Jakarta's NoSQL scope to define it. Accordingly, it might vary from implementation and NoSQL provider.</b>
- </p></div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>query</code> - the query</dd>
-<dd><code>type</code> - the entity class</dd>
-<dt>Returns:</dt>
-<dd>the result list, if either <b>put</b> or <b>remove</b> it will return empty</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when query is null, if the query is <b>get</b> the entity class is required</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the provider does not support query by text</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getSingleResult(java.lang.String,java.lang.Class)">
-<h3>getSingleResult</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;</span>&nbsp;<span class="element-name">getSingleResult</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</span></div>
-<div class="block">Executes a query database then returns as single result
-
- <p>
- <b>The query syntax belongs to each provider, thus, it is not Jakarta's NoSQL scope to define it. Accordingly, it might vary from implementation and NoSQL provider.</b>
- </p></div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>query</code> - the query</dd>
-<dd><code>type</code> - the entity class</dd>
-<dt>Returns:</dt>
-<dd>the result <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link"><code>Optional</code></a>, if either <b>put</b> or <b>remove</b> it will return <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html#empty()" title="class or interface in java.util" class="external-link"><code>Optional.empty()</code></a></dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when query is null, if the query is <b>get</b> the entity class is required</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the provider does not support query by text</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="query(java.lang.String)">
-<h3>query</h3>
-<div class="member-signature"><span class="return-type">void</span>&nbsp;<span class="element-name">query</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query)</span></div>
-<div class="block">Executes a query database and don't return result, e.g.: when the query is either <b>remove</b> or
- <b>put</b></div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>query</code> - the query</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when query is null</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the provider does not support query by text</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="prepare(java.lang.String,java.lang.Class)">
-<h3>prepare</h3>
-<div class="member-signature"><span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql">PreparedStatement</a></span>&nbsp;<span class="element-name">prepare</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;query,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</span></div>
-<div class="block">Executes a query database with <a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a>
-
- <p>
- <b>The query syntax belongs to each provider, thus, it is not Jakarta's NoSQL scope to define it. Accordingly, it might vary from implementation and NoSQL provider.</b>
- </p></div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>query</code> - the query</dd>
-<dd><code>type</code> - the entity class</dd>
-<dt>Returns:</dt>
-<dd>a <a href="../../../../jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" title="interface in jakarta.nosql"><code>PreparedStatement</code></a> instance</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when query is null, if the query is <b>get</b> the entity class is required</dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/UnsupportedOperationException.html" title="class or interface in java.lang" class="external-link">UnsupportedOperationException</a></code> - when the provider does not support query by text</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="get(java.lang.Iterable,java.lang.Class)">
-<h3>get</h3>
-<div class="member-signature"><span class="type-parameters">&lt;K,<wbr>
-T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;T&gt;</span>&nbsp;<span class="element-name">get</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;K&gt;&nbsp;keys,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;T&gt;&nbsp;type)</span></div>
-<div class="block">Finds a list of values from keys</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>K</code> - the key type</dd>
-<dd><code>T</code> - the entity type</dd>
-<dt>Parameters:</dt>
-<dd><code>type</code> - the entity class</dd>
-<dd><code>keys</code> - the keys to be used in this query</dd>
-<dt>Returns:</dt>
-<dd>the list of result</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when either the keys or the entities values are null</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="delete(K)">
-<h3 id="delete(java.lang.Object)">delete</h3>
-<div class="member-signature"><span class="type-parameters">&lt;K&gt;</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">delete</span><wbr><span class="parameters">(K&nbsp;key)</span></div>
-<div class="block">Removes an entity from key</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>K</code> - the key type</dd>
-<dt>Parameters:</dt>
-<dd><code>key</code> - the key bo be used</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when the key is null</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="delete(java.lang.Iterable)">
-<h3>delete</h3>
-<div class="member-signature"><span class="type-parameters">&lt;K&gt;</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">delete</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;K&gt;&nbsp;keys)</span></div>
-<div class="block">Removes entities from keys</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>K</code> - the key type</dd>
-<dt>Parameters:</dt>
-<dd><code>keys</code> - the keys to be used</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - when the key is null</dd>
-</dl>
-</section>
-</li>
-</ul>
-</section>
-</li>
-</ul>
-</section>
-<!-- ========= END OF CLASS DATA ========= -->
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/class-use/KeyValueTemplate.html b/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/class-use/KeyValueTemplate.html
deleted file mode 100644
index b184b4d..0000000
--- a/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/class-use/KeyValueTemplate.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>Uses of Interface jakarta.nosql.keyvalue.KeyValueTemplate (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="use: module: jakarta.nosql.keyvalue, package: jakarta.nosql.keyvalue, interface: KeyValueTemplate">
-<meta name="generator" content="javadoc/ClassUseWriter">
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-<script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-use-page">
-<script type="text/javascript">var pathtoroot = "../../../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../../index.html">Overview</a></li>
-<li><a href="../../../../module-summary.html">Module</a></li>
-<li><a href="../package-summary.html">Package</a></li>
-<li><a href="../KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">Class</a></li>
-<li class="nav-bar-cell1-rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html#use">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<div class="header">
-<h1 title="Uses of Interface jakarta.nosql.keyvalue.KeyValueTemplate" class="title">Uses of Interface<br>jakarta.nosql.keyvalue.KeyValueTemplate</h1>
-</div>
-No usage of jakarta.nosql.keyvalue.KeyValueTemplate</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html b/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html
deleted file mode 100644
index bff519e..0000000
--- a/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-summary.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>jakarta.nosql.keyvalue (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: module: jakarta.nosql.keyvalue, package: jakarta.nosql.keyvalue">
-<meta name="generator" content="javadoc/PackageWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="package-declaration-page">
-<script type="text/javascript">var pathtoroot = "../../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
-<li><a href="../../../module-summary.html">Module</a></li>
-<li class="nav-bar-cell1-rev">Package</li>
-<li>Class</li>
-<li><a href="package-use.html">Use</a></li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html#package">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Package:&nbsp;</li>
-<li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
-<li><a href="#related-package-summary">Related Packages</a>&nbsp;|&nbsp;</li>
-<li><a href="#class-summary">Classes and Interfaces</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<div class="header">
-<div class="sub-title"><span class="module-label-in-package">Module</span>&nbsp;<a href="../../../module-summary.html">jakarta.nosql.keyvalue</a></div>
-<h1 title="Package jakarta.nosql.keyvalue" class="title">Package jakarta.nosql.keyvalue</h1>
-</div>
-<hr>
-<div class="package-signature">package <span class="element-name">jakarta.nosql.keyvalue</span></div>
-<section class="package-description" id="package-description">
-<div class="block">Defines the API to Key-value in mapping level.
- <p>
- Key-value (KV) stores use the associative array (also known as a map or dictionary) as their fundamental data model.
- In this model, data is represented as a collection of key-value pairs, such that each possible key appears at most
- once in the collection.
- The key-value model is one of the simplest non-trivial data models, and richer data models are often implemented
- as an extension of it.
- </p>
- <p>
- The key-value model can be extended to a discretely ordered model that maintains keys in lexicographic order.
- This extension is computationally powerful, in that it can efficiently retrieve selective key ranges.
- </p>
- <p>
- Key-value stores can use consistency models ranging from eventual consistency to serializability. Some databases support ordering of keys.
- There are various hardware implementations, and some users maintain data in memory (RAM), while others employ solid-state drives or rotating disks.
- </p></div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<li>
-<div id="related-package-summary">
-<div class="caption"><span>Related Packages</span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Module</div>
-<div class="table-header col-second">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-plain even-row-color"><a href="../../../../jakarta.nosql.core/module-summary.html">jakarta.nosql.core</a></div>
-<div class="col-first even-row-color"><a href="../../../../jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the core API in mapping level.</div>
-</div>
-<div class="col-plain odd-row-color"><a href="../../../../jakarta.nosql.column/module-summary.html">jakarta.nosql.column</a></div>
-<div class="col-first odd-row-color"><a href="../../../../jakarta.nosql.column/jakarta/nosql/column/package-summary.html">jakarta.nosql.column</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Defines the API to Column Family in mapping level.</div>
-</div>
-<div class="col-plain even-row-color"><a href="../../../../jakarta.nosql.document/module-summary.html">jakarta.nosql.document</a></div>
-<div class="col-first even-row-color"><a href="../../../../jakarta.nosql.document/jakarta/nosql/document/package-summary.html">jakarta.nosql.document</a></div>
-<div class="col-last even-row-color">
-<div class="block">Defines the API to Document Collection in mapping level.</div>
-</div>
-</div>
-</div>
-</li>
-<li>
-<div id="class-summary">
-<div class="caption"><span>Interfaces</span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Class</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color class-summary class-summary-tab1"><a href="KeyValueTemplate.html" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block"><a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" title="interface in jakarta.nosql"><code>Template</code></a> specialization for Key-Value databases.</div>
-</div>
-</div>
-</div>
-</li>
-</ul>
-</section>
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-tree.html b/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-tree.html
deleted file mode 100644
index 97a7a9f..0000000
--- a/javadoc/jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-tree.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>jakarta.nosql.keyvalue Class Hierarchy (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="tree: module: jakarta.nosql.keyvalue, package: jakarta.nosql.keyvalue">
-<meta name="generator" content="javadoc/PackageTreeWriter">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="package-tree-page">
-<script type="text/javascript">var pathtoroot = "../../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../../index.html">Overview</a></li>
-<li><a href="../../../module-summary.html">Module</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li>Use</li>
-<li class="nav-bar-cell1-rev">Tree</li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html#tree">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<div class="header">
-<h1 class="title">Hierarchy For Package jakarta.nosql.keyvalue</h1>
-<span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../../../../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<section class="hierarchy">
-<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
-<ul>
-<li class="circle">jakarta.nosql.<a href="../../../../jakarta.nosql.core/jakarta/nosql/Template.html" class="type-name-link" title="interface in jakarta.nosql">Template</a>
-<ul>
-<li class="circle">jakarta.nosql.keyvalue.<a href="KeyValueTemplate.html" class="type-name-link" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></li>
-</ul>
-</li>
-</ul>
-</section>
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jakarta.nosql.keyvalue/module-summary.html b/javadoc/jakarta.nosql.keyvalue/module-summary.html
deleted file mode 100644
index 39762ef..0000000
--- a/javadoc/jakarta.nosql.keyvalue/module-summary.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>jakarta.nosql.keyvalue (api-parent 1.0.0-b7 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: module: jakarta.nosql.keyvalue">
-<meta name="generator" content="javadoc/ModuleWriterImpl">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-<script type="text/javascript" src="../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="module-declaration-page">
-<script type="text/javascript">var pathtoroot = "../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../index.html">Overview</a></li>
-<li class="nav-bar-cell1-rev">Module</li>
-<li>Package</li>
-<li>Class</li>
-<li>Use</li>
-<li><a href="../overview-tree.html">Tree</a></li>
-<li><a href="../index-all.html">Index</a></li>
-<li><a href="../help-doc.html#module">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Module:&nbsp;</li>
-<li><a href="#module-description">Description</a>&nbsp;|&nbsp;</li>
-<li>Modules&nbsp;|&nbsp;</li>
-<li><a href="#packages-summary">Packages</a>&nbsp;|&nbsp;</li>
-<li>Services</li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<div class="header">
-<h1 title="Module jakarta.nosql.keyvalue" class="title">Module jakarta.nosql.keyvalue</h1>
-</div>
-<hr>
-<div class="module-signature">module <span class="element-name">jakarta.nosql.keyvalue</span></div>
-<section class="module-description" id="module-description">
-<!-- ============ MODULE DESCRIPTION =========== -->
-<div class="block">The Jakarta NoSQL key-value module.
- <p>
- Key-value (KV) stores use the associative array (also known as a map or dictionary) as their fundamental data model.
- In this model, data is represented as a collection of key-value pairs, such that each possible key appears at most
- once in the collection.
- The key-value model is one of the simplest non-trivial data models, and richer data models are often implemented
- as an extension of it.
- </p></div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<li>
-<section class="packages-summary" id="packages-summary">
-<!-- ============ PACKAGES SUMMARY =========== -->
-<h2>Packages</h2>
-<div id="package-summary-table">
-<div class="caption"><span>Exports</span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Package</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="jakarta/nosql/keyvalue/package-summary.html">jakarta.nosql.keyvalue</a></div>
-<div class="col-last even-row-color package-summary-table package-summary-table-tab1">
-<div class="block">Defines the API to Key-value in mapping level.</div>
-</div>
-</div>
-</div>
-</section>
-</li>
-</ul>
-</section>
-</main>
-<footer role="contentinfo">
-<hr>
-<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
-</footer>
-</div>
-</div>
-</body>
-</html>
diff --git a/javadoc/jquery-ui.overrides.css b/javadoc/jquery-ui.overrides.css
deleted file mode 100644
index facf852..0000000
--- a/javadoc/jquery-ui.overrides.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active,
-a.ui-button:active,
-.ui-button:active,
-.ui-button.ui-state-active:hover {
-    /* Overrides the color of selection used in jQuery UI */
-    background: #F8981D;
-    border: 1px solid #F8981D;
-}
diff --git a/javadoc/legal/ASSEMBLY_EXCEPTION b/javadoc/legal/ASSEMBLY_EXCEPTION
index 065b8d9..4296666 100644
--- a/javadoc/legal/ASSEMBLY_EXCEPTION
+++ b/javadoc/legal/ASSEMBLY_EXCEPTION
@@ -2,8 +2,8 @@
 OPENJDK ASSEMBLY EXCEPTION
 
 The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
-openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
-General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
+openjdk.org ("OpenJDK Code") is distributed under the terms of the GNU
+General Public License <https://www.gnu.org/copyleft/gpl.html> version 2
 only ("GPL2"), with the following clarification and special exception.
 
     Linking this OpenJDK Code statically or dynamically with other code
@@ -12,7 +12,7 @@ only ("GPL2"), with the following clarification and special exception.
 
     As a special exception, Oracle gives you permission to link this
     OpenJDK Code with certain code licensed by Oracle as indicated at
-    http://openjdk.java.net/legal/exception-modules-2007-05-08.html
+    https://openjdk.org/legal/exception-modules-2007-05-08.html
     ("Designated Exception Modules") to produce an executable,
     regardless of the license terms of the Designated Exception Modules,
     and to copy and distribute the resulting executable under GPL2,
diff --git a/javadoc/legal/jqueryUI.md b/javadoc/legal/jqueryUI.md
index 8031bdb..8bda9d7 100644
--- a/javadoc/legal/jqueryUI.md
+++ b/javadoc/legal/jqueryUI.md
@@ -1,4 +1,4 @@
-## jQuery UI v1.12.1
+## jQuery UI v1.13.2
 
 ### jQuery UI License
 ```
diff --git a/javadoc/link.svg b/javadoc/link.svg
new file mode 100644
index 0000000..7ccc5ed
--- /dev/null
+++ b/javadoc/link.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.  Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
+ by Oracle in the LICENSE file that accompanied this code.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="#505050">
+    <path d="M32 239.3c18.2 16.7 57.1 15.4 74.5-1.7l30.9-32c8.3-8.8 4.8-15.1.7-19.9-4.7-3-12-8.1-20.4.5l-29.4 29.6a29.4 29.4 0 0 1-39.4.9l-8-7c-8.8-9.4-11-28.3-.8-38.8l49.8-51.3c7.2-6.6 21.3-10 36.1-2.4 6.9 5.4 15.6 15.7 26 6.2 9.9-11.2 2.9-20.4-10-29.3-18.7-12.6-52-14.8-70.4 3.8L17 154.2c-20 20.2-11.3 58 1.7 71.5a69 69 0 0 0 13.2 13.6z"/>
+    <path d="M223.2 17.5c-18.4-16.6-57.3-15.3-74.6 2l-30.8 31.9c-8.3 9-4.8 15.2-.7 20 4.8 3 12.1 8 20.5-.6 4.8-5 29.3-29.6 29.3-29.6a29.4 29.4 0 0 1 39.4-1l8 6.8c8.8 9.5 11 28.3.9 38.9l-49.6 51.4c-7.2 6.7-21.3 10.1-36.1 2.6-7-5.4-15.7-15.7-26.1-6.2-9.8 11.2-2.8 20.4 10.2 29.3 18.7 12.5 52 14.7 70.3-4l54.4-56.5c20-20.3 11.2-58-1.9-71.5a69 69 0 0 0-13.2-13.5Z"/>
+</svg>
diff --git a/javadoc/member-search-index.js b/javadoc/member-search-index.js
index da45f02..010b1c5 100644
--- a/javadoc/member-search-index.js
+++ b/javadoc/member-search-index.js
@@ -1 +1 @@
-memberSearchIndex = [{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteWhere","l":"and(String)","u":"and(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperWhere","l":"and(String)","u":"and(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperOrder","l":"asc()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"between(T, T)","u":"between(T,T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"between(T, T)","u":"between(T,T)"},{"p":"jakarta.nosql","c":"PreparedStatement","l":"bind(String, Object)","u":"bind(java.lang.String,java.lang.Object)"},{"p":"jakarta.nosql.column","c":"ColumnTemplate","l":"count(Class<T>)","u":"count(java.lang.Class)"},{"p":"jakarta.nosql.document","c":"DocumentTemplate","l":"count(Class<T>)","u":"count(java.lang.Class)"},{"p":"jakarta.nosql.column","c":"ColumnTemplate","l":"count(String)","u":"count(java.lang.String)"},{"p":"jakarta.nosql.document","c":"DocumentTemplate","l":"count(String)","u":"count(java.lang.String)"},{"p":"jakarta.nosql","c":"Template","l":"delete(Class<T>)","u":"delete(java.lang.Class)"},{"p":"jakarta.nosql","c":"Template","l":"delete(Class<T>, K)","u":"delete(java.lang.Class,K)"},{"p":"jakarta.nosql.keyvalue","c":"KeyValueTemplate","l":"delete(Iterable<K>)","u":"delete(java.lang.Iterable)"},{"p":"jakarta.nosql.keyvalue","c":"KeyValueTemplate","l":"delete(K)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperOrder","l":"desc()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"eq(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"eq(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteQueryBuild","l":"execute()"},{"p":"jakarta.nosql","c":"Template","l":"find(Class<T>, K)","u":"find(java.lang.Class,K)"},{"p":"jakarta.nosql.keyvalue","c":"KeyValueTemplate","l":"get(Iterable<K>, Class<T>)","u":"get(java.lang.Iterable,java.lang.Class)"},{"p":"jakarta.nosql.keyvalue","c":"KeyValueTemplate","l":"get(K, Class<T>)","u":"get(K,java.lang.Class)"},{"p":"jakarta.nosql.keyvalue","c":"KeyValueTemplate","l":"getSingleResult(String, Class<T>)","u":"getSingleResult(java.lang.String,java.lang.Class)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"gt(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"gt(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"gte(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"gte(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"in(Iterable<T>)","u":"in(java.lang.Iterable)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"in(Iterable<T>)","u":"in(java.lang.Iterable)"},{"p":"jakarta.nosql","c":"Template","l":"insert(Iterable<T>)","u":"insert(java.lang.Iterable)"},{"p":"jakarta.nosql","c":"Template","l":"insert(Iterable<T>, Duration)","u":"insert(java.lang.Iterable,java.time.Duration)"},{"p":"jakarta.nosql","c":"Template","l":"insert(T)"},{"p":"jakarta.nosql","c":"Template","l":"insert(T, Duration)","u":"insert(T,java.time.Duration)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"like(String)","u":"like(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"like(String)","u":"like(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperFrom","l":"limit(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameOrder","l":"limit(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperSkip","l":"limit(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperWhere","l":"limit(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"lt(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"lt(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"lte(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"lte(T)"},{"p":"jakarta.nosql","c":"NoSQLException","l":"NoSQLException()","u":"%3Cinit%3E()"},{"p":"jakarta.nosql","c":"NoSQLException","l":"NoSQLException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"jakarta.nosql","c":"NoSQLException","l":"NoSQLException(String, Throwable)","u":"%3Cinit%3E(java.lang.String,java.lang.Throwable)"},{"p":"jakarta.nosql","c":"NoSQLException","l":"NoSQLException(String, Throwable, boolean, boolean)","u":"%3Cinit%3E(java.lang.String,java.lang.Throwable,boolean,boolean)"},{"p":"jakarta.nosql","c":"NoSQLException","l":"NoSQLException(Throwable)","u":"%3Cinit%3E(java.lang.Throwable)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"not()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"not()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteWhere","l":"or(String)","u":"or(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperWhere","l":"or(String)","u":"or(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperFrom","l":"orderBy(String)","u":"orderBy(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameOrder","l":"orderBy(String)","u":"orderBy(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperWhere","l":"orderBy(String)","u":"orderBy(java.lang.String)"},{"p":"jakarta.nosql.column","c":"ColumnTemplate","l":"prepare(String)","u":"prepare(java.lang.String)"},{"p":"jakarta.nosql.document","c":"DocumentTemplate","l":"prepare(String)","u":"prepare(java.lang.String)"},{"p":"jakarta.nosql.keyvalue","c":"KeyValueTemplate","l":"prepare(String, Class<T>)","u":"prepare(java.lang.String,java.lang.Class)"},{"p":"jakarta.nosql.keyvalue","c":"KeyValueTemplate","l":"put(Iterable<T>)","u":"put(java.lang.Iterable)"},{"p":"jakarta.nosql.keyvalue","c":"KeyValueTemplate","l":"put(Iterable<T>, Duration)","u":"put(java.lang.Iterable,java.time.Duration)"},{"p":"jakarta.nosql.keyvalue","c":"KeyValueTemplate","l":"put(T)"},{"p":"jakarta.nosql.keyvalue","c":"KeyValueTemplate","l":"put(T, Duration)","u":"put(T,java.time.Duration)"},{"p":"jakarta.nosql.column","c":"ColumnTemplate","l":"query(String)","u":"query(java.lang.String)"},{"p":"jakarta.nosql.document","c":"DocumentTemplate","l":"query(String)","u":"query(java.lang.String)"},{"p":"jakarta.nosql.keyvalue","c":"KeyValueTemplate","l":"query(String)","u":"query(java.lang.String)"},{"p":"jakarta.nosql.keyvalue","c":"KeyValueTemplate","l":"query(String, Class<T>)","u":"query(java.lang.String,java.lang.Class)"},{"p":"jakarta.nosql","c":"PreparedStatement","l":"result()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperQueryBuild","l":"result()"},{"p":"jakarta.nosql","c":"Template","l":"select(Class<T>)","u":"select(java.lang.Class)"},{"p":"jakarta.nosql","c":"PreparedStatement","l":"singleResult()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperQueryBuild","l":"singleResult()"},{"p":"jakarta.nosql.column","c":"ColumnTemplate","l":"singleResult(String)","u":"singleResult(java.lang.String)"},{"p":"jakarta.nosql.document","c":"DocumentTemplate","l":"singleResult(String)","u":"singleResult(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperFrom","l":"skip(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperLimit","l":"skip(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameOrder","l":"skip(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperWhere","l":"skip(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperQueryBuild","l":"stream()"},{"p":"jakarta.nosql","c":"Template","l":"update(Iterable<T>)","u":"update(java.lang.Iterable)"},{"p":"jakarta.nosql","c":"Template","l":"update(T)"},{"p":"jakarta.nosql","c":"Column","l":"value()"},{"p":"jakarta.nosql","c":"Entity","l":"value()"},{"p":"jakarta.nosql","c":"Id","l":"value()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteFrom","l":"where(String)","u":"where(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperFrom","l":"where(String)","u":"where(java.lang.String)"}];updateSearchResults();
\ No newline at end of file
+memberSearchIndex = [{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteWhere","l":"and(String)","u":"and(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperWhere","l":"and(String)","u":"and(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperOrder","l":"asc()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"between(T, T)","u":"between(T,T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"between(T, T)","u":"between(T,T)"},{"p":"jakarta.nosql","c":"AttributeConverter","l":"convertToDatabaseColumn(X)"},{"p":"jakarta.nosql","c":"AttributeConverter","l":"convertToEntityAttribute(Y)"},{"p":"jakarta.nosql","c":"DiscriminatorColumn","l":"DEFAULT_DISCRIMINATOR_COLUMN"},{"p":"jakarta.nosql","c":"Template","l":"delete(Class<T>)","u":"delete(java.lang.Class)"},{"p":"jakarta.nosql","c":"Template","l":"delete(Class<T>, K)","u":"delete(java.lang.Class,K)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperOrder","l":"desc()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"eq(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"eq(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteQueryBuild","l":"execute()"},{"p":"jakarta.nosql","c":"Template","l":"find(Class<T>, K)","u":"find(java.lang.Class,K)"},{"p":"jakarta.nosql","c":"Embeddable.EmbeddableType","l":"FLAT"},{"p":"jakarta.nosql","c":"Embeddable.EmbeddableType","l":"GROUPING"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"gt(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"gt(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"gte(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"gte(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"in(Iterable<T>)","u":"in(java.lang.Iterable)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"in(Iterable<T>)","u":"in(java.lang.Iterable)"},{"p":"jakarta.nosql","c":"Template","l":"insert(Iterable<T>)","u":"insert(java.lang.Iterable)"},{"p":"jakarta.nosql","c":"Template","l":"insert(Iterable<T>, Duration)","u":"insert(java.lang.Iterable,java.time.Duration)"},{"p":"jakarta.nosql","c":"Template","l":"insert(T)"},{"p":"jakarta.nosql","c":"Template","l":"insert(T, Duration)","u":"insert(T,java.time.Duration)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"like(String)","u":"like(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"like(String)","u":"like(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperFrom","l":"limit(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameOrder","l":"limit(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperSkip","l":"limit(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperWhere","l":"limit(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"lt(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"lt(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"lte(T)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"lte(T)"},{"p":"jakarta.nosql","c":"MappingException","l":"MappingException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"jakarta.nosql","c":"MappingException","l":"MappingException(String, Throwable)","u":"%3Cinit%3E(java.lang.String,java.lang.Throwable)"},{"p":"jakarta.nosql","c":"MappingException","l":"MappingException(Throwable)","u":"%3Cinit%3E(java.lang.Throwable)"},{"p":"jakarta.nosql","c":"NoSQLException","l":"NoSQLException()","u":"%3Cinit%3E()"},{"p":"jakarta.nosql","c":"NoSQLException","l":"NoSQLException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"jakarta.nosql","c":"NoSQLException","l":"NoSQLException(String, Throwable)","u":"%3Cinit%3E(java.lang.String,java.lang.Throwable)"},{"p":"jakarta.nosql","c":"NoSQLException","l":"NoSQLException(String, Throwable, boolean, boolean)","u":"%3Cinit%3E(java.lang.String,java.lang.Throwable,boolean,boolean)"},{"p":"jakarta.nosql","c":"NoSQLException","l":"NoSQLException(Throwable)","u":"%3Cinit%3E(java.lang.Throwable)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteNameCondition","l":"not()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameCondition","l":"not()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteWhere","l":"or(String)","u":"or(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperWhere","l":"or(String)","u":"or(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperFrom","l":"orderBy(String)","u":"orderBy(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameOrder","l":"orderBy(String)","u":"orderBy(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperWhere","l":"orderBy(String)","u":"orderBy(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperQueryBuild","l":"result()"},{"p":"jakarta.nosql","c":"Template","l":"select(Class<T>)","u":"select(java.lang.Class)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperQueryBuild","l":"singleResult()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperFrom","l":"skip(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperLimit","l":"skip(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperNameOrder","l":"skip(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperWhere","l":"skip(long)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperQueryBuild","l":"stream()"},{"p":"jakarta.nosql","c":"Column","l":"udt()"},{"p":"jakarta.nosql","c":"Template","l":"update(Iterable<T>)","u":"update(java.lang.Iterable)"},{"p":"jakarta.nosql","c":"Template","l":"update(T)"},{"p":"jakarta.nosql","c":"Column","l":"value()"},{"p":"jakarta.nosql","c":"Convert","l":"value()"},{"p":"jakarta.nosql","c":"DiscriminatorColumn","l":"value()"},{"p":"jakarta.nosql","c":"DiscriminatorValue","l":"value()"},{"p":"jakarta.nosql","c":"Embeddable","l":"value()"},{"p":"jakarta.nosql","c":"Entity","l":"value()"},{"p":"jakarta.nosql","c":"Id","l":"value()"},{"p":"jakarta.nosql","c":"Embeddable.EmbeddableType","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"jakarta.nosql","c":"Embeddable.EmbeddableType","l":"values()"},{"p":"jakarta.nosql","c":"QueryMapper.MapperDeleteFrom","l":"where(String)","u":"where(java.lang.String)"},{"p":"jakarta.nosql","c":"QueryMapper.MapperFrom","l":"where(String)","u":"where(java.lang.String)"}];updateSearchResults();
\ No newline at end of file
diff --git a/javadoc/module-search-index.js b/javadoc/module-search-index.js
index da5302a..380b087 100644
--- a/javadoc/module-search-index.js
+++ b/javadoc/module-search-index.js
@@ -1 +1 @@
-moduleSearchIndex = [{"l":"jakarta.nosql.column"},{"l":"jakarta.nosql.core"},{"l":"jakarta.nosql.document"},{"l":"jakarta.nosql.keyvalue"}];updateSearchResults();
\ No newline at end of file
+moduleSearchIndex = [{"l":"jakarta.nosql.core"}];updateSearchResults();
\ No newline at end of file
diff --git a/javadoc/overview-summary.html b/javadoc/overview-summary.html
deleted file mode 100644
index aa0d2dd..0000000
--- a/javadoc/overview-summary.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>api-parent 1.0.0-b7 API</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="index redirect">
-<meta name="generator" content="javadoc/IndexRedirectWriter">
-<link rel="canonical" href="index.html">
-<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
-<script type="text/javascript">window.location.replace('index.html')</script>
-<noscript>
-<meta http-equiv="Refresh" content="0;index.html">
-</noscript>
-</head>
-<body class="index-redirect-page">
-<main role="main">
-<noscript>
-<p>JavaScript is disabled on your browser.</p>
-</noscript>
-<p><a href="index.html">index.html</a></p>
-</main>
-</body>
-</html>
diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html
index ac881ee..8bf21d6 100644
--- a/javadoc/overview-tree.html
+++ b/javadoc/overview-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Class Hierarchy (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Class Hierarchy (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="class tree">
 <meta name="generator" content="javadoc/TreeWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,10 +23,9 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="index.html">Overview</a></li>
 <li>Module</li>
 <li>Package</li>
 <li>Class</li>
@@ -38,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -50,14 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For All Packages</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="jakarta.nosql.core/jakarta/nosql/package-tree.html">jakarta.nosql</a>, </li>
-<li><a href="jakarta.nosql.column/jakarta/nosql/column/package-tree.html">jakarta.nosql.column</a>, </li>
-<li><a href="jakarta.nosql.document/jakarta/nosql/document/package-tree.html">jakarta.nosql.document</a>, </li>
-<li><a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/package-tree.html">jakarta.nosql.keyvalue</a></li>
+<ul class="horizontal contents-list">
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-tree.html">jakarta.nosql</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
@@ -69,7 +65,11 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" class="type-name-link external-link" title="class or interface in java.lang">RuntimeException</a>
 <ul>
-<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" class="type-name-link" title="class in jakarta.nosql">NoSQLException</a></li>
+<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" class="type-name-link" title="class in jakarta.nosql">NoSQLException</a>
+<ul>
+<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/MappingException.html" class="type-name-link" title="class in jakarta.nosql">MappingException</a></li>
+</ul>
+</li>
 </ul>
 </li>
 </ul>
@@ -83,7 +83,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <section class="hierarchy">
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
-<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/PreparedStatement.html" class="type-name-link" title="interface in jakarta.nosql">PreparedStatement</a></li>
+<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/AttributeConverter.html" class="type-name-link" title="interface in jakarta.nosql">AttributeConverter</a>&lt;X,<wbr>Y&gt;</li>
 <li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper</a></li>
 <li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperDeleteNameCondition.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperDeleteNameCondition</a>
 <ul>
@@ -111,21 +111,35 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/QueryMapper.MapperWhere.html" class="type-name-link" title="interface in jakarta.nosql">QueryMapper.MapperWhere</a></li>
 </ul>
 </li>
-<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Template.html" class="type-name-link" title="interface in jakarta.nosql">Template</a>
-<ul>
-<li class="circle">jakarta.nosql.column.<a href="jakarta.nosql.column/jakarta/nosql/column/ColumnTemplate.html" class="type-name-link" title="interface in jakarta.nosql.column">ColumnTemplate</a></li>
-<li class="circle">jakarta.nosql.document.<a href="jakarta.nosql.document/jakarta/nosql/document/DocumentTemplate.html" class="type-name-link" title="interface in jakarta.nosql.document">DocumentTemplate</a></li>
-<li class="circle">jakarta.nosql.keyvalue.<a href="jakarta.nosql.keyvalue/jakarta/nosql/keyvalue/KeyValueTemplate.html" class="type-name-link" title="interface in jakarta.nosql.keyvalue">KeyValueTemplate</a></li>
-</ul>
-</li>
+<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Template.html" class="type-name-link" title="interface in jakarta.nosql">Template</a></li>
 </ul>
 </section>
 <section class="hierarchy">
 <h2 title="Annotation Interface Hierarchy">Annotation Interface Hierarchy</h2>
 <ul>
 <li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Column.html" class="type-name-link" title="annotation interface in jakarta.nosql">Column</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Convert.html" class="type-name-link" title="annotation interface in jakarta.nosql">Convert</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorColumn.html" class="type-name-link" title="annotation interface in jakarta.nosql">DiscriminatorColumn</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/DiscriminatorValue.html" class="type-name-link" title="annotation interface in jakarta.nosql">DiscriminatorValue</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Embeddable.html" class="type-name-link" title="annotation interface in jakarta.nosql">Embeddable</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
 <li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Entity.html" class="type-name-link" title="annotation interface in jakarta.nosql">Entity</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
 <li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Id.html" class="type-name-link" title="annotation interface in jakarta.nosql">Id</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Inheritance.html" class="type-name-link" title="annotation interface in jakarta.nosql">Inheritance</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/MappedSuperclass.html" class="type-name-link" title="annotation interface in jakarta.nosql">MappedSuperclass</a> (implements java.lang.annotation.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/Annotation.html" title="class or interface in java.lang.annotation" class="external-link">Annotation</a>)</li>
+</ul>
+</section>
+<section class="hierarchy">
+<h2 title="Enum Class Hierarchy">Enum Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" class="type-name-link external-link" title="class or interface in java.lang">Enum</a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;T&gt;, java.lang.constant.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/constant/Constable.html" title="class or interface in java.lang.constant" class="external-link">Constable</a>, java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a>)
+<ul>
+<li class="circle">jakarta.nosql.<a href="jakarta.nosql.core/jakarta/nosql/Embeddable.EmbeddableType.html" class="type-name-link" title="enum class in jakarta.nosql">Embeddable.EmbeddableType</a></li>
+</ul>
+</li>
+</ul>
+</li>
 </ul>
 </section>
 </main>
diff --git a/javadoc/package-search-index.js b/javadoc/package-search-index.js
index a2a5b65..aa37180 100644
--- a/javadoc/package-search-index.js
+++ b/javadoc/package-search-index.js
@@ -1 +1 @@
-packageSearchIndex = [{"l":"All Packages","u":"allpackages-index.html"},{"m":"jakarta.nosql.core","l":"jakarta.nosql"},{"m":"jakarta.nosql.column","l":"jakarta.nosql.column"},{"m":"jakarta.nosql.document","l":"jakarta.nosql.document"},{"m":"jakarta.nosql.keyvalue","l":"jakarta.nosql.keyvalue"}];updateSearchResults();
\ No newline at end of file
+packageSearchIndex = [{"l":"All Packages","u":"allpackages-index.html"},{"m":"jakarta.nosql.core","l":"jakarta.nosql"}];updateSearchResults();
\ No newline at end of file
diff --git a/javadoc/script-dir/jquery-ui.min.css b/javadoc/script-dir/jquery-ui.min.css
index d64539c..693327f 100644
--- a/javadoc/script-dir/jquery-ui.min.css
+++ b/javadoc/script-dir/jquery-ui.min.css
@@ -1,4 +1,4 @@
-/*! jQuery UI - v1.13.1 - 2022-05-12
+/*! jQuery UI - v1.13.2 - 2023-02-27
 * http://jqueryui.com
 * Includes: core.css, autocomplete.css, menu.css
 * Copyright jQuery Foundation and other contributors; Licensed MIT */
diff --git a/javadoc/script-dir/jquery-ui.min.js b/javadoc/script-dir/jquery-ui.min.js
index 55c2832..8166a15 100644
--- a/javadoc/script-dir/jquery-ui.min.js
+++ b/javadoc/script-dir/jquery-ui.min.js
@@ -1,6 +1,6 @@
-/*! jQuery UI - v1.13.1 - 2022-05-12
+/*! jQuery UI - v1.13.2 - 2023-02-27
 * http://jqueryui.com
 * Includes: widget.js, position.js, keycode.js, unique-id.js, widgets/autocomplete.js, widgets/menu.js
 * Copyright jQuery Foundation and other contributors; Licensed MIT */
 
-!function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)}(function(x){"use strict";x.ui=x.ui||{};x.ui.version="1.13.1";var n,i=0,l=Array.prototype.hasOwnProperty,a=Array.prototype.slice;x.cleanData=(n=x.cleanData,function(t){for(var e,i,s=0;null!=(i=t[s]);s++)(e=x._data(i,"events"))&&e.remove&&x(i).triggerHandler("remove");n(t)}),x.widget=function(t,i,e){var s,n,o,l={},a=t.split(".")[0],r=a+"-"+(t=t.split(".")[1]);return e||(e=i,i=x.Widget),Array.isArray(e)&&(e=x.extend.apply(null,[{}].concat(e))),x.expr.pseudos[r.toLowerCase()]=function(t){return!!x.data(t,r)},x[a]=x[a]||{},s=x[a][t],n=x[a][t]=function(t,e){if(!this||!this._createWidget)return new n(t,e);arguments.length&&this._createWidget(t,e)},x.extend(n,s,{version:e.version,_proto:x.extend({},e),_childConstructors:[]}),(o=new i).options=x.widget.extend({},o.options),x.each(e,function(e,s){function n(){return i.prototype[e].apply(this,arguments)}function o(t){return i.prototype[e].apply(this,t)}l[e]="function"==typeof s?function(){var t,e=this._super,i=this._superApply;return this._super=n,this._superApply=o,t=s.apply(this,arguments),this._super=e,this._superApply=i,t}:s}),n.prototype=x.widget.extend(o,{widgetEventPrefix:s&&o.widgetEventPrefix||t},l,{constructor:n,namespace:a,widgetName:t,widgetFullName:r}),s?(x.each(s._childConstructors,function(t,e){var i=e.prototype;x.widget(i.namespace+"."+i.widgetName,n,e._proto)}),delete s._childConstructors):i._childConstructors.push(n),x.widget.bridge(t,n),n},x.widget.extend=function(t){for(var e,i,s=a.call(arguments,1),n=0,o=s.length;n<o;n++)for(e in s[n])i=s[n][e],l.call(s[n],e)&&void 0!==i&&(x.isPlainObject(i)?t[e]=x.isPlainObject(t[e])?x.widget.extend({},t[e],i):x.widget.extend({},i):t[e]=i);return t},x.widget.bridge=function(o,e){var l=e.prototype.widgetFullName||o;x.fn[o]=function(i){var t="string"==typeof i,s=a.call(arguments,1),n=this;return t?this.length||"instance"!==i?this.each(function(){var t,e=x.data(this,l);return"instance"===i?(n=e,!1):e?"function"!=typeof e[i]||"_"===i.charAt(0)?x.error("no such method '"+i+"' for "+o+" widget instance"):(t=e[i].apply(e,s))!==e&&void 0!==t?(n=t&&t.jquery?n.pushStack(t.get()):t,!1):void 0:x.error("cannot call methods on "+o+" prior to initialization; attempted to call method '"+i+"'")}):n=void 0:(s.length&&(i=x.widget.extend.apply(null,[i].concat(s))),this.each(function(){var t=x.data(this,l);t?(t.option(i||{}),t._init&&t._init()):x.data(this,l,new e(i,this))})),n}},x.Widget=function(){},x.Widget._childConstructors=[],x.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(t,e){e=x(e||this.defaultElement||this)[0],this.element=x(e),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=x(),this.hoverable=x(),this.focusable=x(),this.classesElementLookup={},e!==this&&(x.data(e,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===e&&this.destroy()}}),this.document=x(e.style?e.ownerDocument:e.document||e),this.window=x(this.document[0].defaultView||this.document[0].parentWindow)),this.options=x.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:x.noop,_create:x.noop,_init:x.noop,destroy:function(){var i=this;this._destroy(),x.each(this.classesElementLookup,function(t,e){i._removeClass(e,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:x.noop,widget:function(){return this.element},option:function(t,e){var i,s,n,o=t;if(0===arguments.length)return x.widget.extend({},this.options);if("string"==typeof t)if(o={},t=(i=t.split(".")).shift(),i.length){for(s=o[t]=x.widget.extend({},this.options[t]),n=0;n<i.length-1;n++)s[i[n]]=s[i[n]]||{},s=s[i[n]];if(t=i.pop(),1===arguments.length)return void 0===s[t]?null:s[t];s[t]=e}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=e}return this._setOptions(o),this},_setOptions:function(t){for(var e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(t){var e,i,s;for(e in t)s=this.classesElementLookup[e],t[e]!==this.options.classes[e]&&s&&s.length&&(i=x(s.get()),this._removeClass(s,e),i.addClass(this._classes({element:i,keys:e,classes:t,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(n){var o=[],l=this;function t(t,e){for(var i,s=0;s<t.length;s++)i=l.classesElementLookup[t[s]]||x(),i=n.add?(function(){var i=[];n.element.each(function(t,e){x.map(l.classesElementLookup,function(t){return t}).some(function(t){return t.is(e)})||i.push(e)}),l._on(x(i),{remove:"_untrackClassesElement"})}(),x(x.uniqueSort(i.get().concat(n.element.get())))):x(i.not(n.element).get()),l.classesElementLookup[t[s]]=i,o.push(t[s]),e&&n.classes[t[s]]&&o.push(n.classes[t[s]])}return(n=x.extend({element:this.element,classes:this.options.classes||{}},n)).keys&&t(n.keys.match(/\S+/g)||[],!0),n.extra&&t(n.extra.match(/\S+/g)||[]),o.join(" ")},_untrackClassesElement:function(i){var s=this;x.each(s.classesElementLookup,function(t,e){-1!==x.inArray(i.target,e)&&(s.classesElementLookup[t]=x(e.not(i.target).get()))}),this._off(x(i.target))},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){var n="string"==typeof t||null===t,i={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s="boolean"==typeof s?s:i};return i.element.toggleClass(this._classes(i),s),this},_on:function(n,o,t){var l,a=this;"boolean"!=typeof n&&(t=o,o=n,n=!1),t?(o=l=x(o),this.bindings=this.bindings.add(o)):(t=o,o=this.element,l=this.widget()),x.each(t,function(t,e){function i(){if(n||!0!==a.options.disabled&&!x(this).hasClass("ui-state-disabled"))return("string"==typeof e?a[e]:e).apply(a,arguments)}"string"!=typeof e&&(i.guid=e.guid=e.guid||i.guid||x.guid++);var s=t.match(/^([\w:-]*)\s*(.*)$/),t=s[1]+a.eventNamespace,s=s[2];s?l.on(t,s,i):o.on(t,i)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.off(e),this.bindings=x(this.bindings.not(t).get()),this.focusable=x(this.focusable.not(t).get()),this.hoverable=x(this.hoverable.not(t).get())},_delay:function(t,e){var i=this;return setTimeout(function(){return("string"==typeof t?i[t]:t).apply(i,arguments)},e||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){this._addClass(x(t.currentTarget),null,"ui-state-hover")},mouseleave:function(t){this._removeClass(x(t.currentTarget),null,"ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){this._addClass(x(t.currentTarget),null,"ui-state-focus")},focusout:function(t){this._removeClass(x(t.currentTarget),null,"ui-state-focus")}})},_trigger:function(t,e,i){var s,n,o=this.options[t];if(i=i||{},(e=x.Event(e)).type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),e.target=this.element[0],n=e.originalEvent)for(s in n)s in e||(e[s]=n[s]);return this.element.trigger(e,i),!("function"==typeof o&&!1===o.apply(this.element[0],[e].concat(i))||e.isDefaultPrevented())}},x.each({show:"fadeIn",hide:"fadeOut"},function(o,l){x.Widget.prototype["_"+o]=function(e,t,i){var s,n=(t="string"==typeof t?{effect:t}:t)?!0!==t&&"number"!=typeof t&&t.effect||l:o;"number"==typeof(t=t||{})?t={duration:t}:!0===t&&(t={}),s=!x.isEmptyObject(t),t.complete=i,t.delay&&e.delay(t.delay),s&&x.effects&&x.effects.effect[n]?e[o](t):n!==o&&e[n]?e[n](t.duration,t.easing,i):e.queue(function(t){x(this)[o](),i&&i.call(e[0]),t()})}});var s,C,E,o,r,u,h,c,k;x.widget;function T(t,e,i){return[parseFloat(t[0])*(c.test(t[0])?e/100:1),parseFloat(t[1])*(c.test(t[1])?i/100:1)]}function A(t,e){return parseInt(x.css(t,e),10)||0}function W(t){return null!=t&&t===t.window}C=Math.max,E=Math.abs,o=/left|center|right/,r=/top|center|bottom/,u=/[\+\-]\d+(\.[\d]+)?%?/,h=/^\w+/,c=/%$/,k=x.fn.position,x.position={scrollbarWidth:function(){if(void 0!==s)return s;var t,e=x("<div style='display:block;position:absolute;width:200px;height:200px;overflow:hidden;'><div style='height:300px;width:auto;'></div></div>"),i=e.children()[0];return x("body").append(e),t=i.offsetWidth,e.css("overflow","scroll"),t===(i=i.offsetWidth)&&(i=e[0].clientWidth),e.remove(),s=t-i},getScrollInfo:function(t){var e=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),i=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),e="scroll"===e||"auto"===e&&t.width<t.element[0].scrollWidth;return{width:"scroll"===i||"auto"===i&&t.height<t.element[0].scrollHeight?x.position.scrollbarWidth():0,height:e?x.position.scrollbarWidth():0}},getWithinInfo:function(t){var e=x(t||window),i=W(e[0]),s=!!e[0]&&9===e[0].nodeType;return{element:e,isWindow:i,isDocument:s,offset:!i&&!s?x(t).offset():{left:0,top:0},scrollLeft:e.scrollLeft(),scrollTop:e.scrollTop(),width:e.outerWidth(),height:e.outerHeight()}}},x.fn.position=function(c){if(!c||!c.of)return k.apply(this,arguments);var d,f,m,p,v,t,g="string"==typeof(c=x.extend({},c)).of?x(document).find(c.of):x(c.of),_=x.position.getWithinInfo(c.within),y=x.position.getScrollInfo(_),b=(c.collision||"flip").split(" "),w={},e=9===(t=(e=g)[0]).nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:W(t)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:t.preventDefault?{width:0,height:0,offset:{top:t.pageY,left:t.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()};return g[0].preventDefault&&(c.at="left top"),f=e.width,m=e.height,v=x.extend({},p=e.offset),x.each(["my","at"],function(){var t,e,i=(c[this]||"").split(" ");(i=1===i.length?o.test(i[0])?i.concat(["center"]):r.test(i[0])?["center"].concat(i):["center","center"]:i)[0]=o.test(i[0])?i[0]:"center",i[1]=r.test(i[1])?i[1]:"center",t=u.exec(i[0]),e=u.exec(i[1]),w[this]=[t?t[0]:0,e?e[0]:0],c[this]=[h.exec(i[0])[0],h.exec(i[1])[0]]}),1===b.length&&(b[1]=b[0]),"right"===c.at[0]?v.left+=f:"center"===c.at[0]&&(v.left+=f/2),"bottom"===c.at[1]?v.top+=m:"center"===c.at[1]&&(v.top+=m/2),d=T(w.at,f,m),v.left+=d[0],v.top+=d[1],this.each(function(){var i,t,l=x(this),a=l.outerWidth(),r=l.outerHeight(),e=A(this,"marginLeft"),s=A(this,"marginTop"),n=a+e+A(this,"marginRight")+y.width,o=r+s+A(this,"marginBottom")+y.height,u=x.extend({},v),h=T(w.my,l.outerWidth(),l.outerHeight());"right"===c.my[0]?u.left-=a:"center"===c.my[0]&&(u.left-=a/2),"bottom"===c.my[1]?u.top-=r:"center"===c.my[1]&&(u.top-=r/2),u.left+=h[0],u.top+=h[1],i={marginLeft:e,marginTop:s},x.each(["left","top"],function(t,e){x.ui.position[b[t]]&&x.ui.position[b[t]][e](u,{targetWidth:f,targetHeight:m,elemWidth:a,elemHeight:r,collisionPosition:i,collisionWidth:n,collisionHeight:o,offset:[d[0]+h[0],d[1]+h[1]],my:c.my,at:c.at,within:_,elem:l})}),c.using&&(t=function(t){var e=p.left-u.left,i=e+f-a,s=p.top-u.top,n=s+m-r,o={target:{element:g,left:p.left,top:p.top,width:f,height:m},element:{element:l,left:u.left,top:u.top,width:a,height:r},horizontal:i<0?"left":0<e?"right":"center",vertical:n<0?"top":0<s?"bottom":"middle"};f<a&&E(e+i)<f&&(o.horizontal="center"),m<r&&E(s+n)<m&&(o.vertical="middle"),C(E(e),E(i))>C(E(s),E(n))?o.important="horizontal":o.important="vertical",c.using.call(this,t,o)}),l.offset(x.extend(u,{using:t}))})},x.ui.position={fit:{left:function(t,e){var i=e.within,s=i.isWindow?i.scrollLeft:i.offset.left,n=i.width,o=t.left-e.collisionPosition.marginLeft,l=s-o,a=o+e.collisionWidth-n-s;e.collisionWidth>n?0<l&&a<=0?(i=t.left+l+e.collisionWidth-n-s,t.left+=l-i):t.left=!(0<a&&l<=0)&&a<l?s+n-e.collisionWidth:s:0<l?t.left+=l:0<a?t.left-=a:t.left=C(t.left-o,t.left)},top:function(t,e){var i=e.within,s=i.isWindow?i.scrollTop:i.offset.top,n=e.within.height,o=t.top-e.collisionPosition.marginTop,l=s-o,a=o+e.collisionHeight-n-s;e.collisionHeight>n?0<l&&a<=0?(i=t.top+l+e.collisionHeight-n-s,t.top+=l-i):t.top=!(0<a&&l<=0)&&a<l?s+n-e.collisionHeight:s:0<l?t.top+=l:0<a?t.top-=a:t.top=C(t.top-o,t.top)}},flip:{left:function(t,e){var i=e.within,s=i.offset.left+i.scrollLeft,n=i.width,o=i.isWindow?i.scrollLeft:i.offset.left,l=t.left-e.collisionPosition.marginLeft,a=l-o,r=l+e.collisionWidth-n-o,u="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,i="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,l=-2*e.offset[0];a<0?((s=t.left+u+i+l+e.collisionWidth-n-s)<0||s<E(a))&&(t.left+=u+i+l):0<r&&(0<(o=t.left-e.collisionPosition.marginLeft+u+i+l-o)||E(o)<r)&&(t.left+=u+i+l)},top:function(t,e){var i=e.within,s=i.offset.top+i.scrollTop,n=i.height,o=i.isWindow?i.scrollTop:i.offset.top,l=t.top-e.collisionPosition.marginTop,a=l-o,r=l+e.collisionHeight-n-o,u="top"===e.my[1]?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,i="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,l=-2*e.offset[1];a<0?((s=t.top+u+i+l+e.collisionHeight-n-s)<0||s<E(a))&&(t.top+=u+i+l):0<r&&(0<(o=t.top-e.collisionPosition.marginTop+u+i+l-o)||E(o)<r)&&(t.top+=u+i+l)}},flipfit:{left:function(){x.ui.position.flip.left.apply(this,arguments),x.ui.position.fit.left.apply(this,arguments)},top:function(){x.ui.position.flip.top.apply(this,arguments),x.ui.position.fit.top.apply(this,arguments)}}};var t;x.ui.position,x.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},x.fn.extend({uniqueId:(t=0,function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&x(this).removeAttr("id")})}}),x.ui.safeActiveElement=function(e){var i;try{i=e.activeElement}catch(t){i=e.body}return i=!(i=i||e.body).nodeName?e.body:i},x.widget("ui.menu",{version:"1.13.1",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.lastMousePosition={x:null,y:null},this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault(),this._activateItem(t)},"click .ui-menu-item":function(t){var e=x(t.target),i=x(x.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&e.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),e.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&i.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":"_activateItem","mousemove .ui-menu-item":"_activateItem",mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this._menuItems().first();e||this.focus(t,i)},blur:function(t){this._delay(function(){x.contains(this.element[0],x.ui.safeActiveElement(this.document[0]))||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t,!0),this.mouseHandled=!1}})},_activateItem:function(t){var e,i;this.previousFilter||t.clientX===this.lastMousePosition.x&&t.clientY===this.lastMousePosition.y||(this.lastMousePosition={x:t.clientX,y:t.clientY},e=x(t.target).closest(".ui-menu-item"),i=x(t.currentTarget),e[0]===i[0]&&(i.is(".ui-state-active")||(this._removeClass(i.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(t,i))))},_destroy:function(){var t=this.element.find(".ui-menu-item").removeAttr("role aria-disabled").children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),t.children().each(function(){var t=x(this);t.data("ui-menu-submenu-caret")&&t.remove()})},_keydown:function(t){var e,i,s,n=!0;switch(t.keyCode){case x.ui.keyCode.PAGE_UP:this.previousPage(t);break;case x.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case x.ui.keyCode.HOME:this._move("first","first",t);break;case x.ui.keyCode.END:this._move("last","last",t);break;case x.ui.keyCode.UP:this.previous(t);break;case x.ui.keyCode.DOWN:this.next(t);break;case x.ui.keyCode.LEFT:this.collapse(t);break;case x.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case x.ui.keyCode.ENTER:case x.ui.keyCode.SPACE:this._activate(t);break;case x.ui.keyCode.ESCAPE:this.collapse(t);break;default:e=this.previousFilter||"",s=n=!1,i=96<=t.keyCode&&t.keyCode<=105?(t.keyCode-96).toString():String.fromCharCode(t.keyCode),clearTimeout(this.filterTimer),i===e?s=!0:i=e+i,e=this._filterMenuItems(i),(e=s&&-1!==e.index(this.active.next())?this.active.nextAll(".ui-menu-item"):e).length||(i=String.fromCharCode(t.keyCode),e=this._filterMenuItems(i)),e.length?(this.focus(t,e),this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}n&&t.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var t,e,s=this,n=this.options.icons.submenu,i=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),e=i.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=x(this),e=t.prev(),i=x("<span>").data("ui-menu-submenu-caret",!0);s._addClass(i,"ui-menu-icon","ui-icon "+n),e.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",e.attr("id"))}),this._addClass(e,"ui-menu","ui-widget ui-widget-content ui-front"),(t=i.add(this.element).find(this.options.items)).not(".ui-menu-item").each(function(){var t=x(this);s._isDivider(t)&&s._addClass(t,"ui-menu-divider","ui-widget-content")}),i=(e=t.not(".ui-menu-item, .ui-menu-divider")).children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(e,"ui-menu-item")._addClass(i,"ui-menu-item-wrapper"),t.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!x.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){var i;"icons"===t&&(i=this.element.find(".ui-menu-icon"),this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",String(t)),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),i=this.active.children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",i.attr("id")),i=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),(i=e.children(".ui-menu")).length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(t){var e,i,s;this._hasScroll()&&(i=parseFloat(x.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(x.css(this.activeMenu[0],"paddingTop"))||0,e=t.offset().top-this.activeMenu.offset().top-i-s,i=this.activeMenu.scrollTop(),s=this.activeMenu.height(),t=t.outerHeight(),e<0?this.activeMenu.scrollTop(i+e):s<e+t&&this.activeMenu.scrollTop(i+e-s+t))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(t){var e=x.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(e)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var t=i?this.element:x(e&&e.target).closest(this.element.find(".ui-menu"));t.length||(t=this.element),this._close(t),this.blur(e),this._removeClass(t.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=t},i?0:this.delay)},_close:function(t){(t=t||(this.active?this.active.parent():this.element)).find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(t){return!x(t.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this._menuItems(this.active.children(".ui-menu")).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_menuItems:function(t){return(t||this.element).find(this.options.items).filter(".ui-menu-item")},_move:function(t,e,i){var s;(s=this.active?"first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").last():this.active[t+"All"](".ui-menu-item").first():s)&&s.length&&this.active||(s=this._menuItems(this.activeMenu)[e]()),this.focus(i,s)},nextPage:function(t){var e,i,s;this.active?this.isLastItem()||(this._hasScroll()?(i=this.active.offset().top,s=this.element.innerHeight(),0===x.fn.jquery.indexOf("3.2.")&&(s+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.nextAll(".ui-menu-item").each(function(){return(e=x(this)).offset().top-i-s<0}),this.focus(t,e)):this.focus(t,this._menuItems(this.activeMenu)[this.active?"last":"first"]())):this.next(t)},previousPage:function(t){var e,i,s;this.active?this.isFirstItem()||(this._hasScroll()?(i=this.active.offset().top,s=this.element.innerHeight(),0===x.fn.jquery.indexOf("3.2.")&&(s+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.prevAll(".ui-menu-item").each(function(){return 0<(e=x(this)).offset().top-i+s}),this.focus(t,e)):this.focus(t,this._menuItems(this.activeMenu).first())):this.next(t)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||x(t.target).closest(".ui-menu-item");var e={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,e)},_filterMenuItems:function(t){var t=t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),e=new RegExp("^"+t,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return e.test(String.prototype.trim.call(x(this).children(".ui-menu-item-wrapper").text()))})}});x.widget("ui.autocomplete",{version:"1.13.1",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,liveRegionTimer:null,_create:function(){var i,s,n,t=this.element[0].nodeName.toLowerCase(),e="textarea"===t,t="input"===t;this.isMultiLine=e||!t&&this._isContentEditable(this.element),this.valueMethod=this.element[e||t?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(t){if(this.element.prop("readOnly"))s=n=i=!0;else{s=n=i=!1;var e=x.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:i=!0,this._move("previousPage",t);break;case e.PAGE_DOWN:i=!0,this._move("nextPage",t);break;case e.UP:i=!0,this._keyEvent("previous",t);break;case e.DOWN:i=!0,this._keyEvent("next",t);break;case e.ENTER:this.menu.active&&(i=!0,t.preventDefault(),this.menu.select(t));break;case e.TAB:this.menu.active&&this.menu.select(t);break;case e.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(t),t.preventDefault());break;default:s=!0,this._searchTimeout(t)}}},keypress:function(t){if(i)return i=!1,void(this.isMultiLine&&!this.menu.element.is(":visible")||t.preventDefault());if(!s){var e=x.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:this._move("previousPage",t);break;case e.PAGE_DOWN:this._move("nextPage",t);break;case e.UP:this._keyEvent("previous",t);break;case e.DOWN:this._keyEvent("next",t)}}},input:function(t){if(n)return n=!1,void t.preventDefault();this._searchTimeout(t)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){clearTimeout(this.searching),this.close(t),this._change(t)}}),this._initSource(),this.menu=x("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().attr({unselectable:"on"}).menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault()},menufocus:function(t,e){var i,s;if(this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type)))return this.menu.blur(),void this.document.one("mousemove",function(){x(t.target).trigger(t.originalEvent)});s=e.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:s})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(s.value),(i=e.item.attr("aria-label")||s.value)&&String.prototype.trim.call(i).length&&(clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(x("<div>").text(i))},100))},menuselect:function(t,e){var i=e.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==x.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",t,{item:i})&&this._value(i.value),this.term=this._value(),this.close(t),this.selectedItem=i}}),this.liveRegion=x("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(t){var e=this.menu.element[0];return t.target===this.element[0]||t.target===e||x.contains(e,t.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var t=this.options.appendTo;return t=!(t=!(t=t&&(t.jquery||t.nodeType?x(t):this.document.find(t).eq(0)))||!t[0]?this.element.closest(".ui-front, dialog"):t).length?this.document[0].body:t},_initSource:function(){var i,s,n=this;Array.isArray(this.options.source)?(i=this.options.source,this.source=function(t,e){e(x.ui.autocomplete.filter(i,t.term))}):"string"==typeof this.options.source?(s=this.options.source,this.source=function(t,e){n.xhr&&n.xhr.abort(),n.xhr=x.ajax({url:s,data:t,dataType:"json",success:function(t){e(t)},error:function(){e([])}})}):this.source=this.options.source},_searchTimeout:function(s){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),e=this.menu.element.is(":visible"),i=s.altKey||s.ctrlKey||s.metaKey||s.shiftKey;t&&(e||i)||(this.selectedItem=null,this.search(null,s))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):!1!==this._trigger("search",e)?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")}.bind(this)},__response:function(t){t=t&&this._normalize(t),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:x.map(t,function(t){return"string"==typeof t?{label:t,value:t}:x.extend({},t,{label:t.label||t.value,value:t.value||t.label})})},_suggest:function(t){var e=this.menu.element.empty();this._renderMenu(e,t),this.isNewMenu=!0,this.menu.refresh(),e.show(),this._resizeMenu(),e.position(x.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(i,t){var s=this;x.each(t,function(t,e){s._renderItemData(i,e)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(t,e){return x("<li>").append(x("<div>").text(e.label)).appendTo(t)},_move:function(t,e){if(this.menu.element.is(":visible"))return this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),void this.menu.blur()):void this.menu[t](e);this.search(null,e)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){this.isMultiLine&&!this.menu.element.is(":visible")||(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),x.extend(x.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,e){var i=new RegExp(x.ui.autocomplete.escapeRegex(e),"i");return x.grep(t,function(t){return i.test(t.label||t.value||t)})}}),x.widget("ui.autocomplete",x.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(1<t?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var e;this._superApply(arguments),this.options.disabled||this.cancelSearch||(e=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(x("<div>").text(e))},100))}});x.ui.autocomplete});
\ No newline at end of file
+!function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)}(function(x){"use strict";x.ui=x.ui||{};x.ui.version="1.13.2";var n,i=0,l=Array.prototype.hasOwnProperty,a=Array.prototype.slice;x.cleanData=(n=x.cleanData,function(t){for(var e,i,s=0;null!=(i=t[s]);s++)(e=x._data(i,"events"))&&e.remove&&x(i).triggerHandler("remove");n(t)}),x.widget=function(t,i,e){var s,n,o,l={},a=t.split(".")[0],r=a+"-"+(t=t.split(".")[1]);return e||(e=i,i=x.Widget),Array.isArray(e)&&(e=x.extend.apply(null,[{}].concat(e))),x.expr.pseudos[r.toLowerCase()]=function(t){return!!x.data(t,r)},x[a]=x[a]||{},s=x[a][t],n=x[a][t]=function(t,e){if(!this||!this._createWidget)return new n(t,e);arguments.length&&this._createWidget(t,e)},x.extend(n,s,{version:e.version,_proto:x.extend({},e),_childConstructors:[]}),(o=new i).options=x.widget.extend({},o.options),x.each(e,function(e,s){function n(){return i.prototype[e].apply(this,arguments)}function o(t){return i.prototype[e].apply(this,t)}l[e]="function"==typeof s?function(){var t,e=this._super,i=this._superApply;return this._super=n,this._superApply=o,t=s.apply(this,arguments),this._super=e,this._superApply=i,t}:s}),n.prototype=x.widget.extend(o,{widgetEventPrefix:s&&o.widgetEventPrefix||t},l,{constructor:n,namespace:a,widgetName:t,widgetFullName:r}),s?(x.each(s._childConstructors,function(t,e){var i=e.prototype;x.widget(i.namespace+"."+i.widgetName,n,e._proto)}),delete s._childConstructors):i._childConstructors.push(n),x.widget.bridge(t,n),n},x.widget.extend=function(t){for(var e,i,s=a.call(arguments,1),n=0,o=s.length;n<o;n++)for(e in s[n])i=s[n][e],l.call(s[n],e)&&void 0!==i&&(x.isPlainObject(i)?t[e]=x.isPlainObject(t[e])?x.widget.extend({},t[e],i):x.widget.extend({},i):t[e]=i);return t},x.widget.bridge=function(o,e){var l=e.prototype.widgetFullName||o;x.fn[o]=function(i){var t="string"==typeof i,s=a.call(arguments,1),n=this;return t?this.length||"instance"!==i?this.each(function(){var t,e=x.data(this,l);return"instance"===i?(n=e,!1):e?"function"!=typeof e[i]||"_"===i.charAt(0)?x.error("no such method '"+i+"' for "+o+" widget instance"):(t=e[i].apply(e,s))!==e&&void 0!==t?(n=t&&t.jquery?n.pushStack(t.get()):t,!1):void 0:x.error("cannot call methods on "+o+" prior to initialization; attempted to call method '"+i+"'")}):n=void 0:(s.length&&(i=x.widget.extend.apply(null,[i].concat(s))),this.each(function(){var t=x.data(this,l);t?(t.option(i||{}),t._init&&t._init()):x.data(this,l,new e(i,this))})),n}},x.Widget=function(){},x.Widget._childConstructors=[],x.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(t,e){e=x(e||this.defaultElement||this)[0],this.element=x(e),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=x(),this.hoverable=x(),this.focusable=x(),this.classesElementLookup={},e!==this&&(x.data(e,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===e&&this.destroy()}}),this.document=x(e.style?e.ownerDocument:e.document||e),this.window=x(this.document[0].defaultView||this.document[0].parentWindow)),this.options=x.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:x.noop,_create:x.noop,_init:x.noop,destroy:function(){var i=this;this._destroy(),x.each(this.classesElementLookup,function(t,e){i._removeClass(e,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:x.noop,widget:function(){return this.element},option:function(t,e){var i,s,n,o=t;if(0===arguments.length)return x.widget.extend({},this.options);if("string"==typeof t)if(o={},t=(i=t.split(".")).shift(),i.length){for(s=o[t]=x.widget.extend({},this.options[t]),n=0;n<i.length-1;n++)s[i[n]]=s[i[n]]||{},s=s[i[n]];if(t=i.pop(),1===arguments.length)return void 0===s[t]?null:s[t];s[t]=e}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=e}return this._setOptions(o),this},_setOptions:function(t){for(var e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(t){var e,i,s;for(e in t)s=this.classesElementLookup[e],t[e]!==this.options.classes[e]&&s&&s.length&&(i=x(s.get()),this._removeClass(s,e),i.addClass(this._classes({element:i,keys:e,classes:t,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(n){var o=[],l=this;function t(t,e){for(var i,s=0;s<t.length;s++)i=l.classesElementLookup[t[s]]||x(),i=n.add?(function(){var i=[];n.element.each(function(t,e){x.map(l.classesElementLookup,function(t){return t}).some(function(t){return t.is(e)})||i.push(e)}),l._on(x(i),{remove:"_untrackClassesElement"})}(),x(x.uniqueSort(i.get().concat(n.element.get())))):x(i.not(n.element).get()),l.classesElementLookup[t[s]]=i,o.push(t[s]),e&&n.classes[t[s]]&&o.push(n.classes[t[s]])}return(n=x.extend({element:this.element,classes:this.options.classes||{}},n)).keys&&t(n.keys.match(/\S+/g)||[],!0),n.extra&&t(n.extra.match(/\S+/g)||[]),o.join(" ")},_untrackClassesElement:function(i){var s=this;x.each(s.classesElementLookup,function(t,e){-1!==x.inArray(i.target,e)&&(s.classesElementLookup[t]=x(e.not(i.target).get()))}),this._off(x(i.target))},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){var n="string"==typeof t||null===t,i={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s="boolean"==typeof s?s:i};return i.element.toggleClass(this._classes(i),s),this},_on:function(n,o,t){var l,a=this;"boolean"!=typeof n&&(t=o,o=n,n=!1),t?(o=l=x(o),this.bindings=this.bindings.add(o)):(t=o,o=this.element,l=this.widget()),x.each(t,function(t,e){function i(){if(n||!0!==a.options.disabled&&!x(this).hasClass("ui-state-disabled"))return("string"==typeof e?a[e]:e).apply(a,arguments)}"string"!=typeof e&&(i.guid=e.guid=e.guid||i.guid||x.guid++);var s=t.match(/^([\w:-]*)\s*(.*)$/),t=s[1]+a.eventNamespace,s=s[2];s?l.on(t,s,i):o.on(t,i)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.off(e),this.bindings=x(this.bindings.not(t).get()),this.focusable=x(this.focusable.not(t).get()),this.hoverable=x(this.hoverable.not(t).get())},_delay:function(t,e){var i=this;return setTimeout(function(){return("string"==typeof t?i[t]:t).apply(i,arguments)},e||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){this._addClass(x(t.currentTarget),null,"ui-state-hover")},mouseleave:function(t){this._removeClass(x(t.currentTarget),null,"ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){this._addClass(x(t.currentTarget),null,"ui-state-focus")},focusout:function(t){this._removeClass(x(t.currentTarget),null,"ui-state-focus")}})},_trigger:function(t,e,i){var s,n,o=this.options[t];if(i=i||{},(e=x.Event(e)).type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),e.target=this.element[0],n=e.originalEvent)for(s in n)s in e||(e[s]=n[s]);return this.element.trigger(e,i),!("function"==typeof o&&!1===o.apply(this.element[0],[e].concat(i))||e.isDefaultPrevented())}},x.each({show:"fadeIn",hide:"fadeOut"},function(o,l){x.Widget.prototype["_"+o]=function(e,t,i){var s,n=(t="string"==typeof t?{effect:t}:t)?!0!==t&&"number"!=typeof t&&t.effect||l:o;"number"==typeof(t=t||{})?t={duration:t}:!0===t&&(t={}),s=!x.isEmptyObject(t),t.complete=i,t.delay&&e.delay(t.delay),s&&x.effects&&x.effects.effect[n]?e[o](t):n!==o&&e[n]?e[n](t.duration,t.easing,i):e.queue(function(t){x(this)[o](),i&&i.call(e[0]),t()})}});var s,C,E,o,r,u,h,c,k;x.widget;function T(t,e,i){return[parseFloat(t[0])*(c.test(t[0])?e/100:1),parseFloat(t[1])*(c.test(t[1])?i/100:1)]}function A(t,e){return parseInt(x.css(t,e),10)||0}function W(t){return null!=t&&t===t.window}C=Math.max,E=Math.abs,o=/left|center|right/,r=/top|center|bottom/,u=/[\+\-]\d+(\.[\d]+)?%?/,h=/^\w+/,c=/%$/,k=x.fn.position,x.position={scrollbarWidth:function(){if(void 0!==s)return s;var t,e=x("<div style='display:block;position:absolute;width:200px;height:200px;overflow:hidden;'><div style='height:300px;width:auto;'></div></div>"),i=e.children()[0];return x("body").append(e),t=i.offsetWidth,e.css("overflow","scroll"),t===(i=i.offsetWidth)&&(i=e[0].clientWidth),e.remove(),s=t-i},getScrollInfo:function(t){var e=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),i=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),e="scroll"===e||"auto"===e&&t.width<t.element[0].scrollWidth;return{width:"scroll"===i||"auto"===i&&t.height<t.element[0].scrollHeight?x.position.scrollbarWidth():0,height:e?x.position.scrollbarWidth():0}},getWithinInfo:function(t){var e=x(t||window),i=W(e[0]),s=!!e[0]&&9===e[0].nodeType;return{element:e,isWindow:i,isDocument:s,offset:!i&&!s?x(t).offset():{left:0,top:0},scrollLeft:e.scrollLeft(),scrollTop:e.scrollTop(),width:e.outerWidth(),height:e.outerHeight()}}},x.fn.position=function(c){if(!c||!c.of)return k.apply(this,arguments);var d,f,m,p,v,t,g="string"==typeof(c=x.extend({},c)).of?x(document).find(c.of):x(c.of),_=x.position.getWithinInfo(c.within),y=x.position.getScrollInfo(_),b=(c.collision||"flip").split(" "),w={},e=9===(t=(e=g)[0]).nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:W(t)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:t.preventDefault?{width:0,height:0,offset:{top:t.pageY,left:t.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()};return g[0].preventDefault&&(c.at="left top"),f=e.width,m=e.height,v=x.extend({},p=e.offset),x.each(["my","at"],function(){var t,e,i=(c[this]||"").split(" ");(i=1===i.length?o.test(i[0])?i.concat(["center"]):r.test(i[0])?["center"].concat(i):["center","center"]:i)[0]=o.test(i[0])?i[0]:"center",i[1]=r.test(i[1])?i[1]:"center",t=u.exec(i[0]),e=u.exec(i[1]),w[this]=[t?t[0]:0,e?e[0]:0],c[this]=[h.exec(i[0])[0],h.exec(i[1])[0]]}),1===b.length&&(b[1]=b[0]),"right"===c.at[0]?v.left+=f:"center"===c.at[0]&&(v.left+=f/2),"bottom"===c.at[1]?v.top+=m:"center"===c.at[1]&&(v.top+=m/2),d=T(w.at,f,m),v.left+=d[0],v.top+=d[1],this.each(function(){var i,t,l=x(this),a=l.outerWidth(),r=l.outerHeight(),e=A(this,"marginLeft"),s=A(this,"marginTop"),n=a+e+A(this,"marginRight")+y.width,o=r+s+A(this,"marginBottom")+y.height,u=x.extend({},v),h=T(w.my,l.outerWidth(),l.outerHeight());"right"===c.my[0]?u.left-=a:"center"===c.my[0]&&(u.left-=a/2),"bottom"===c.my[1]?u.top-=r:"center"===c.my[1]&&(u.top-=r/2),u.left+=h[0],u.top+=h[1],i={marginLeft:e,marginTop:s},x.each(["left","top"],function(t,e){x.ui.position[b[t]]&&x.ui.position[b[t]][e](u,{targetWidth:f,targetHeight:m,elemWidth:a,elemHeight:r,collisionPosition:i,collisionWidth:n,collisionHeight:o,offset:[d[0]+h[0],d[1]+h[1]],my:c.my,at:c.at,within:_,elem:l})}),c.using&&(t=function(t){var e=p.left-u.left,i=e+f-a,s=p.top-u.top,n=s+m-r,o={target:{element:g,left:p.left,top:p.top,width:f,height:m},element:{element:l,left:u.left,top:u.top,width:a,height:r},horizontal:i<0?"left":0<e?"right":"center",vertical:n<0?"top":0<s?"bottom":"middle"};f<a&&E(e+i)<f&&(o.horizontal="center"),m<r&&E(s+n)<m&&(o.vertical="middle"),C(E(e),E(i))>C(E(s),E(n))?o.important="horizontal":o.important="vertical",c.using.call(this,t,o)}),l.offset(x.extend(u,{using:t}))})},x.ui.position={fit:{left:function(t,e){var i=e.within,s=i.isWindow?i.scrollLeft:i.offset.left,n=i.width,o=t.left-e.collisionPosition.marginLeft,l=s-o,a=o+e.collisionWidth-n-s;e.collisionWidth>n?0<l&&a<=0?(i=t.left+l+e.collisionWidth-n-s,t.left+=l-i):t.left=!(0<a&&l<=0)&&a<l?s+n-e.collisionWidth:s:0<l?t.left+=l:0<a?t.left-=a:t.left=C(t.left-o,t.left)},top:function(t,e){var i=e.within,s=i.isWindow?i.scrollTop:i.offset.top,n=e.within.height,o=t.top-e.collisionPosition.marginTop,l=s-o,a=o+e.collisionHeight-n-s;e.collisionHeight>n?0<l&&a<=0?(i=t.top+l+e.collisionHeight-n-s,t.top+=l-i):t.top=!(0<a&&l<=0)&&a<l?s+n-e.collisionHeight:s:0<l?t.top+=l:0<a?t.top-=a:t.top=C(t.top-o,t.top)}},flip:{left:function(t,e){var i=e.within,s=i.offset.left+i.scrollLeft,n=i.width,o=i.isWindow?i.scrollLeft:i.offset.left,l=t.left-e.collisionPosition.marginLeft,a=l-o,r=l+e.collisionWidth-n-o,u="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,i="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,l=-2*e.offset[0];a<0?((s=t.left+u+i+l+e.collisionWidth-n-s)<0||s<E(a))&&(t.left+=u+i+l):0<r&&(0<(o=t.left-e.collisionPosition.marginLeft+u+i+l-o)||E(o)<r)&&(t.left+=u+i+l)},top:function(t,e){var i=e.within,s=i.offset.top+i.scrollTop,n=i.height,o=i.isWindow?i.scrollTop:i.offset.top,l=t.top-e.collisionPosition.marginTop,a=l-o,r=l+e.collisionHeight-n-o,u="top"===e.my[1]?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,i="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,l=-2*e.offset[1];a<0?((s=t.top+u+i+l+e.collisionHeight-n-s)<0||s<E(a))&&(t.top+=u+i+l):0<r&&(0<(o=t.top-e.collisionPosition.marginTop+u+i+l-o)||E(o)<r)&&(t.top+=u+i+l)}},flipfit:{left:function(){x.ui.position.flip.left.apply(this,arguments),x.ui.position.fit.left.apply(this,arguments)},top:function(){x.ui.position.flip.top.apply(this,arguments),x.ui.position.fit.top.apply(this,arguments)}}};var t;x.ui.position,x.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},x.fn.extend({uniqueId:(t=0,function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&x(this).removeAttr("id")})}}),x.ui.safeActiveElement=function(e){var i;try{i=e.activeElement}catch(t){i=e.body}return i=!(i=i||e.body).nodeName?e.body:i},x.widget("ui.menu",{version:"1.13.2",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.lastMousePosition={x:null,y:null},this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault(),this._activateItem(t)},"click .ui-menu-item":function(t){var e=x(t.target),i=x(x.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&e.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),e.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&i.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":"_activateItem","mousemove .ui-menu-item":"_activateItem",mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this._menuItems().first();e||this.focus(t,i)},blur:function(t){this._delay(function(){x.contains(this.element[0],x.ui.safeActiveElement(this.document[0]))||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t,!0),this.mouseHandled=!1}})},_activateItem:function(t){var e,i;this.previousFilter||t.clientX===this.lastMousePosition.x&&t.clientY===this.lastMousePosition.y||(this.lastMousePosition={x:t.clientX,y:t.clientY},e=x(t.target).closest(".ui-menu-item"),i=x(t.currentTarget),e[0]===i[0]&&(i.is(".ui-state-active")||(this._removeClass(i.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(t,i))))},_destroy:function(){var t=this.element.find(".ui-menu-item").removeAttr("role aria-disabled").children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),t.children().each(function(){var t=x(this);t.data("ui-menu-submenu-caret")&&t.remove()})},_keydown:function(t){var e,i,s,n=!0;switch(t.keyCode){case x.ui.keyCode.PAGE_UP:this.previousPage(t);break;case x.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case x.ui.keyCode.HOME:this._move("first","first",t);break;case x.ui.keyCode.END:this._move("last","last",t);break;case x.ui.keyCode.UP:this.previous(t);break;case x.ui.keyCode.DOWN:this.next(t);break;case x.ui.keyCode.LEFT:this.collapse(t);break;case x.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case x.ui.keyCode.ENTER:case x.ui.keyCode.SPACE:this._activate(t);break;case x.ui.keyCode.ESCAPE:this.collapse(t);break;default:e=this.previousFilter||"",s=n=!1,i=96<=t.keyCode&&t.keyCode<=105?(t.keyCode-96).toString():String.fromCharCode(t.keyCode),clearTimeout(this.filterTimer),i===e?s=!0:i=e+i,e=this._filterMenuItems(i),(e=s&&-1!==e.index(this.active.next())?this.active.nextAll(".ui-menu-item"):e).length||(i=String.fromCharCode(t.keyCode),e=this._filterMenuItems(i)),e.length?(this.focus(t,e),this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}n&&t.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var t,e,s=this,n=this.options.icons.submenu,i=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),e=i.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=x(this),e=t.prev(),i=x("<span>").data("ui-menu-submenu-caret",!0);s._addClass(i,"ui-menu-icon","ui-icon "+n),e.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",e.attr("id"))}),this._addClass(e,"ui-menu","ui-widget ui-widget-content ui-front"),(t=i.add(this.element).find(this.options.items)).not(".ui-menu-item").each(function(){var t=x(this);s._isDivider(t)&&s._addClass(t,"ui-menu-divider","ui-widget-content")}),i=(e=t.not(".ui-menu-item, .ui-menu-divider")).children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(e,"ui-menu-item")._addClass(i,"ui-menu-item-wrapper"),t.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!x.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){var i;"icons"===t&&(i=this.element.find(".ui-menu-icon"),this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",String(t)),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),i=this.active.children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",i.attr("id")),i=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),(i=e.children(".ui-menu")).length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(t){var e,i,s;this._hasScroll()&&(i=parseFloat(x.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(x.css(this.activeMenu[0],"paddingTop"))||0,e=t.offset().top-this.activeMenu.offset().top-i-s,i=this.activeMenu.scrollTop(),s=this.activeMenu.height(),t=t.outerHeight(),e<0?this.activeMenu.scrollTop(i+e):s<e+t&&this.activeMenu.scrollTop(i+e-s+t))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(t){var e=x.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(e)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var t=i?this.element:x(e&&e.target).closest(this.element.find(".ui-menu"));t.length||(t=this.element),this._close(t),this.blur(e),this._removeClass(t.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=t},i?0:this.delay)},_close:function(t){(t=t||(this.active?this.active.parent():this.element)).find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(t){return!x(t.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this._menuItems(this.active.children(".ui-menu")).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_menuItems:function(t){return(t||this.element).find(this.options.items).filter(".ui-menu-item")},_move:function(t,e,i){var s;(s=this.active?"first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").last():this.active[t+"All"](".ui-menu-item").first():s)&&s.length&&this.active||(s=this._menuItems(this.activeMenu)[e]()),this.focus(i,s)},nextPage:function(t){var e,i,s;this.active?this.isLastItem()||(this._hasScroll()?(i=this.active.offset().top,s=this.element.innerHeight(),0===x.fn.jquery.indexOf("3.2.")&&(s+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.nextAll(".ui-menu-item").each(function(){return(e=x(this)).offset().top-i-s<0}),this.focus(t,e)):this.focus(t,this._menuItems(this.activeMenu)[this.active?"last":"first"]())):this.next(t)},previousPage:function(t){var e,i,s;this.active?this.isFirstItem()||(this._hasScroll()?(i=this.active.offset().top,s=this.element.innerHeight(),0===x.fn.jquery.indexOf("3.2.")&&(s+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.prevAll(".ui-menu-item").each(function(){return 0<(e=x(this)).offset().top-i+s}),this.focus(t,e)):this.focus(t,this._menuItems(this.activeMenu).first())):this.next(t)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||x(t.target).closest(".ui-menu-item");var e={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,e)},_filterMenuItems:function(t){var t=t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),e=new RegExp("^"+t,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return e.test(String.prototype.trim.call(x(this).children(".ui-menu-item-wrapper").text()))})}});x.widget("ui.autocomplete",{version:"1.13.2",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,liveRegionTimer:null,_create:function(){var i,s,n,t=this.element[0].nodeName.toLowerCase(),e="textarea"===t,t="input"===t;this.isMultiLine=e||!t&&this._isContentEditable(this.element),this.valueMethod=this.element[e||t?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(t){if(this.element.prop("readOnly"))s=n=i=!0;else{s=n=i=!1;var e=x.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:i=!0,this._move("previousPage",t);break;case e.PAGE_DOWN:i=!0,this._move("nextPage",t);break;case e.UP:i=!0,this._keyEvent("previous",t);break;case e.DOWN:i=!0,this._keyEvent("next",t);break;case e.ENTER:this.menu.active&&(i=!0,t.preventDefault(),this.menu.select(t));break;case e.TAB:this.menu.active&&this.menu.select(t);break;case e.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(t),t.preventDefault());break;default:s=!0,this._searchTimeout(t)}}},keypress:function(t){if(i)return i=!1,void(this.isMultiLine&&!this.menu.element.is(":visible")||t.preventDefault());if(!s){var e=x.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:this._move("previousPage",t);break;case e.PAGE_DOWN:this._move("nextPage",t);break;case e.UP:this._keyEvent("previous",t);break;case e.DOWN:this._keyEvent("next",t)}}},input:function(t){if(n)return n=!1,void t.preventDefault();this._searchTimeout(t)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){clearTimeout(this.searching),this.close(t),this._change(t)}}),this._initSource(),this.menu=x("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().attr({unselectable:"on"}).menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault()},menufocus:function(t,e){var i,s;if(this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type)))return this.menu.blur(),void this.document.one("mousemove",function(){x(t.target).trigger(t.originalEvent)});s=e.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:s})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(s.value),(i=e.item.attr("aria-label")||s.value)&&String.prototype.trim.call(i).length&&(clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(x("<div>").text(i))},100))},menuselect:function(t,e){var i=e.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==x.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",t,{item:i})&&this._value(i.value),this.term=this._value(),this.close(t),this.selectedItem=i}}),this.liveRegion=x("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(t){var e=this.menu.element[0];return t.target===this.element[0]||t.target===e||x.contains(e,t.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var t=this.options.appendTo;return t=!(t=!(t=t&&(t.jquery||t.nodeType?x(t):this.document.find(t).eq(0)))||!t[0]?this.element.closest(".ui-front, dialog"):t).length?this.document[0].body:t},_initSource:function(){var i,s,n=this;Array.isArray(this.options.source)?(i=this.options.source,this.source=function(t,e){e(x.ui.autocomplete.filter(i,t.term))}):"string"==typeof this.options.source?(s=this.options.source,this.source=function(t,e){n.xhr&&n.xhr.abort(),n.xhr=x.ajax({url:s,data:t,dataType:"json",success:function(t){e(t)},error:function(){e([])}})}):this.source=this.options.source},_searchTimeout:function(s){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),e=this.menu.element.is(":visible"),i=s.altKey||s.ctrlKey||s.metaKey||s.shiftKey;t&&(e||i)||(this.selectedItem=null,this.search(null,s))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):!1!==this._trigger("search",e)?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")}.bind(this)},__response:function(t){t=t&&this._normalize(t),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:x.map(t,function(t){return"string"==typeof t?{label:t,value:t}:x.extend({},t,{label:t.label||t.value,value:t.value||t.label})})},_suggest:function(t){var e=this.menu.element.empty();this._renderMenu(e,t),this.isNewMenu=!0,this.menu.refresh(),e.show(),this._resizeMenu(),e.position(x.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(i,t){var s=this;x.each(t,function(t,e){s._renderItemData(i,e)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(t,e){return x("<li>").append(x("<div>").text(e.label)).appendTo(t)},_move:function(t,e){if(this.menu.element.is(":visible"))return this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),void this.menu.blur()):void this.menu[t](e);this.search(null,e)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){this.isMultiLine&&!this.menu.element.is(":visible")||(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),x.extend(x.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,e){var i=new RegExp(x.ui.autocomplete.escapeRegex(e),"i");return x.grep(t,function(t){return i.test(t.label||t.value||t)})}}),x.widget("ui.autocomplete",x.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(1<t?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var e;this._superApply(arguments),this.options.disabled||this.cancelSearch||(e=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(x("<div>").text(e))},100))}});x.ui.autocomplete});
\ No newline at end of file
diff --git a/javadoc/script.js b/javadoc/script.js
index 864989c..8b9691a 100644
--- a/javadoc/script.js
+++ b/javadoc/script.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,14 @@ var packageSearchIndex;
 var typeSearchIndex;
 var memberSearchIndex;
 var tagSearchIndex;
+
+var oddRowColor = "odd-row-color";
+var evenRowColor = "even-row-color";
+var sortAsc = "sort-asc";
+var sortDesc = "sort-desc";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+
 function loadScripts(doc, tag) {
     createElem(doc, tag, 'search.js');
 
@@ -45,6 +53,93 @@ function createElem(doc, tag, path) {
     scriptElement.parentNode.insertBefore(script, scriptElement);
 }
 
+// Helper for  making content containing release names comparable lexicographically
+function makeComparable(s) {
+    return s.toLowerCase().replace(/(\d+)/g,
+        function(n, m) {
+            return ("000" + m).slice(-4);
+        });
+}
+
+// Switches between two styles depending on a condition
+function toggleStyle(classList, condition, trueStyle, falseStyle) {
+    if (condition) {
+        classList.remove(falseStyle);
+        classList.add(trueStyle);
+    } else {
+        classList.remove(trueStyle);
+        classList.add(falseStyle);
+    }
+}
+
+// Sorts the rows in a table lexicographically by the content of a specific column
+function sortTable(header, columnIndex, columns) {
+    var container = header.parentElement;
+    var descending = header.classList.contains(sortAsc);
+    container.querySelectorAll("div.table-header").forEach(
+        function(header) {
+            header.classList.remove(sortAsc);
+            header.classList.remove(sortDesc);
+        }
+    )
+    var cells = container.children;
+    var rows = [];
+    for (var i = columns; i < cells.length; i += columns) {
+        rows.push(Array.prototype.slice.call(cells, i, i + columns));
+    }
+    var comparator = function(a, b) {
+        var ka = makeComparable(a[columnIndex].textContent);
+        var kb = makeComparable(b[columnIndex].textContent);
+        if (ka < kb)
+            return descending ? 1 : -1;
+        if (ka > kb)
+            return descending ? -1 : 1;
+        return 0;
+    };
+    var sorted = rows.sort(comparator);
+    var visible = 0;
+    sorted.forEach(function(row) {
+        if (row[0].style.display !== 'none') {
+            var isEvenRow = visible++ % 2 === 0;
+        }
+        row.forEach(function(cell) {
+            toggleStyle(cell.classList, isEvenRow, evenRowColor, oddRowColor);
+            container.appendChild(cell);
+        })
+    });
+    toggleStyle(header.classList, descending, sortDesc, sortAsc);
+}
+
+// Toggles the visibility of a table category in all tables in a page
+function toggleGlobal(checkbox, selected, columns) {
+    var display = checkbox.checked ? '' : 'none';
+    document.querySelectorAll("div.table-tabs").forEach(function(t) {
+        var id = t.parentElement.getAttribute("id");
+        var selectedClass = id + "-tab" + selected;
+        // if selected is empty string it selects all uncategorized entries
+        var selectUncategorized = !Boolean(selected);
+        var visible = 0;
+        document.querySelectorAll('div.' + id)
+            .forEach(function(elem) {
+                if (selectUncategorized) {
+                    if (elem.className.indexOf(selectedClass) === -1) {
+                        elem.style.display = display;
+                    }
+                } else if (elem.classList.contains(selectedClass)) {
+                    elem.style.display = display;
+                }
+                if (elem.style.display === '') {
+                    var isEvenRow = visible++ % (columns * 2) < columns;
+                    toggleStyle(elem.classList, isEvenRow, evenRowColor, oddRowColor);
+                }
+            });
+        var displaySection = visible === 0 ? 'none' : '';
+        t.parentElement.style.display = displaySection;
+        document.querySelector("li#contents-" + id).style.display = displaySection;
+    })
+}
+
+// Shows the elements of a table belonging to a specific category
 function show(tableId, selected, columns) {
     if (tableId !== selected) {
         document.querySelectorAll('div.' + tableId + ':not(.' + selected + ')')
@@ -56,8 +151,7 @@ function show(tableId, selected, columns) {
         .forEach(function(elem, index) {
             elem.style.display = '';
             var isEvenRow = index % (columns * 2) < columns;
-            elem.classList.remove(isEvenRow ? oddRowColor : evenRowColor);
-            elem.classList.add(isEvenRow ? evenRowColor : oddRowColor);
+            toggleStyle(elem.classList, isEvenRow, evenRowColor, oddRowColor);
         });
     updateTabs(tableId, selected);
 }
@@ -105,7 +199,34 @@ function indexFilesLoaded() {
         && memberSearchIndex
         && tagSearchIndex;
 }
-
+// Copy the contents of the local snippet to the clipboard
+function copySnippet(button) {
+    copyToClipboard(button.nextElementSibling.innerText);
+    switchCopyLabel(button, button.firstElementChild);
+}
+function copyToClipboard(content) {
+    var textarea = document.createElement("textarea");
+    textarea.style.height = 0;
+    document.body.appendChild(textarea);
+    textarea.value = content;
+    textarea.select();
+    document.execCommand("copy");
+    document.body.removeChild(textarea);
+}
+function switchCopyLabel(button, span) {
+    var copied = span.getAttribute("data-copied");
+    button.classList.add("visible");
+    var initialLabel = span.innerHTML;
+    span.innerHTML = copied;
+    setTimeout(function() {
+        button.classList.remove("visible");
+        setTimeout(function() {
+            if (initialLabel !== copied) {
+                span.innerHTML = initialLabel;
+            }
+        }, 100);
+    }, 1900);
+}
 // Workaround for scroll position not being included in browser history (8249133)
 document.addEventListener("DOMContentLoaded", function(e) {
     var contentDiv = document.querySelector("div.flex-content");
@@ -117,14 +238,14 @@ document.addEventListener("DOMContentLoaded", function(e) {
     window.addEventListener("hashchange", function(e) {
         history.replaceState(contentDiv.scrollTop, document.title);
     });
+    var timeoutId;
     contentDiv.addEventListener("scroll", function(e) {
-        var timeoutID;
-        if (!timeoutID) {
-            timeoutID = setTimeout(function() {
-                history.replaceState(contentDiv.scrollTop, document.title);
-                timeoutID = null;
-            }, 100);
+        if (timeoutId) {
+            clearTimeout(timeoutId);
         }
+        timeoutId = setTimeout(function() {
+            history.replaceState(contentDiv.scrollTop, document.title);
+        }, 100);
     });
     if (!location.hash) {
         history.replaceState(contentDiv.scrollTop, document.title);
diff --git a/javadoc/search-page.js b/javadoc/search-page.js
new file mode 100644
index 0000000..540c90f
--- /dev/null
+++ b/javadoc/search-page.js
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+"use strict";
+$(function() {
+    var copy = $("#page-search-copy");
+    var expand = $("#page-search-expand");
+    var searchLink = $("span#page-search-link");
+    var redirect = $("input#search-redirect");
+    function setSearchUrlTemplate() {
+        var href = document.location.href.split(/[#?]/)[0];
+        href += "?q=" + "%s";
+        if (redirect.is(":checked")) {
+            href += "&r=1";
+        }
+        searchLink.html(href);
+        copy[0].onmouseenter();
+    }
+    function copyLink(e) {
+        copyToClipboard(this.previousSibling.innerText);
+        switchCopyLabel(this, this.lastElementChild);
+    }
+    copy.click(copyLink);
+    copy[0].onmouseenter = function() {};
+    redirect.click(setSearchUrlTemplate);
+    setSearchUrlTemplate();
+    copy.prop("disabled", false);
+    redirect.prop("disabled", false);
+    expand.click(function (e) {
+        var searchInfo = $("div.page-search-info");
+        if(this.parentElement.hasAttribute("open")) {
+            searchInfo.attr("style", "border-width: 0;");
+        } else {
+            searchInfo.attr("style", "border-width: 1px;").height(searchInfo.prop("scrollHeight"));
+        }
+    });
+});
+$(window).on("load", function() {
+    var input = $("#page-search-input");
+    var reset = $("#page-search-reset");
+    var notify = $("#page-search-notify");
+    var resultSection = $("div#result-section");
+    var resultContainer = $("div#result-container");
+    var searchTerm = "";
+    var activeTab = "";
+    var fixedTab = false;
+    var visibleTabs = [];
+    var feelingLucky = false;
+    function renderResults(result) {
+        if (!result.length) {
+            notify.html(messages.noResult);
+        } else if (result.length === 1) {
+            notify.html(messages.oneResult);
+        } else {
+            notify.html(messages.manyResults.replace("{0}", result.length));
+        }
+        resultContainer.empty();
+        var r = {
+            "types": [],
+            "members": [],
+            "packages": [],
+            "modules": [],
+            "searchTags": []
+        };
+        for (var i in result) {
+            var item = result[i];
+            var arr = r[item.category];
+            arr.push(item);
+        }
+        if (!activeTab || r[activeTab].length === 0 || !fixedTab) {
+            Object.keys(r).reduce(function(prev, curr) {
+                if (r[curr].length > 0 && r[curr][0].score > prev) {
+                    activeTab = curr;
+                    return r[curr][0].score;
+                }
+                return prev;
+            }, 0);
+        }
+        if (feelingLucky && activeTab) {
+            notify.html(messages.redirecting)
+            var firstItem = r[activeTab][0];
+            window.location = getURL(firstItem.indexItem, firstItem.category);
+            return;
+        }
+        if (result.length > 20) {
+            if (searchTerm[searchTerm.length - 1] === ".") {
+                if (activeTab === "types" && r["members"].length > r["types"].length) {
+                    activeTab = "members";
+                } else if (activeTab === "packages" && r["types"].length > r["packages"].length) {
+                    activeTab = "types";
+                }
+            }
+        }
+        var categoryCount = Object.keys(r).reduce(function(prev, curr) {
+            return prev + (r[curr].length > 0 ? 1 : 0);
+        }, 0);
+        visibleTabs = [];
+        var tabContainer = $("<div class='table-tabs'></div>").appendTo(resultContainer);
+        for (var key in r) {
+            var id = "#result-tab-" + key.replace("searchTags", "search_tags");
+            if (r[key].length) {
+                var count = r[key].length >= 1000 ? "999+" : r[key].length;
+                if (result.length > 20 && categoryCount > 1) {
+                    var button = $("<button id='result-tab-" + key
+                        + "' class='page-search-header'><span>" + categories[key] + "</span>"
+                        + "<span style='font-weight: normal'> (" + count + ")</span></button>").appendTo(tabContainer);
+                    button.click(key, function(e) {
+                        fixedTab = true;
+                        renderResult(e.data, $(this));
+                    });
+                    visibleTabs.push(key);
+                } else {
+                    $("<span class='page-search-header active-table-tab'>" + categories[key]
+                        + "<span style='font-weight: normal'> (" + count + ")</span></span>").appendTo(tabContainer);
+                    renderTable(key, r[key]).appendTo(resultContainer);
+                    tabContainer = $("<div class='table-tabs'></div>").appendTo(resultContainer);
+
+                }
+            }
+        }
+        if (activeTab && result.length > 20 && categoryCount > 1) {
+            $("button#result-tab-" + activeTab).addClass("active-table-tab");
+            renderTable(activeTab, r[activeTab]).appendTo(resultContainer);
+        }
+        resultSection.show();
+        function renderResult(category, button) {
+            activeTab = category;
+            setSearchUrl();
+            resultContainer.find("div.summary-table").remove();
+            renderTable(activeTab, r[activeTab]).appendTo(resultContainer);
+            button.siblings().removeClass("active-table-tab");
+            button.addClass("active-table-tab");
+        }
+    }
+    function selectTab(category) {
+        $("button#result-tab-" + category).click();
+    }
+    function renderTable(category, items) {
+        var table = $("<div class='summary-table'>")
+            .addClass(category === "modules"
+                ? "one-column-search-results"
+                : "two-column-search-results");
+        var col1, col2;
+        if (category === "modules") {
+            col1 = "Module";
+        } else if (category === "packages") {
+            col1 = "Module";
+            col2 = "Package";
+        } else if (category === "types") {
+            col1 = "Package";
+            col2 = "Class"
+        } else if (category === "members") {
+            col1 = "Class";
+            col2 = "Member";
+        } else if (category === "searchTags") {
+            col1 = "Location";
+            col2 = "Name";
+        }
+        $("<div class='table-header col-plain'>" + col1 + "</div>").appendTo(table);
+        if (category !== "modules") {
+            $("<div class='table-header col-plain'>" + col2 + "</div>").appendTo(table);
+        }
+        $.each(items, function(index, item) {
+            var rowColor = index % 2 ? "odd-row-color" : "even-row-color";
+            renderItem(item, table, rowColor);
+        });
+        return table;
+    }
+    function renderItem(item, table, rowColor) {
+        var label = getHighlightedText(item.input, item.boundaries, item.prefix.length, item.input.length);
+        var link = $("<a/>")
+            .attr("href",  getURL(item.indexItem, item.category))
+            .attr("tabindex", "0")
+            .addClass("search-result-link")
+            .html(label);
+        var container = getHighlightedText(item.input, item.boundaries, 0, item.prefix.length - 1);
+        if (item.category === "searchTags") {
+            container = item.indexItem.h || "";
+        }
+        if (item.category !== "modules") {
+            $("<div/>").html(container).addClass("col-plain").addClass(rowColor).appendTo(table);
+        }
+        $("<div/>").html(link).addClass("col-last").addClass(rowColor).appendTo(table);
+    }
+    var timeout;
+    function schedulePageSearch() {
+        if (timeout) {
+            clearTimeout(timeout);
+        }
+        timeout = setTimeout(function () {
+            doPageSearch()
+        }, 100);
+    }
+    function doPageSearch() {
+        setSearchUrl();
+        var term = searchTerm = input.val().trim();
+        if (term === "") {
+            notify.html(messages.enterTerm);
+            activeTab = "";
+            fixedTab = false;
+            resultContainer.empty();
+            resultSection.hide();
+        } else {
+            notify.html(messages.searching);
+            doSearch({ term: term, maxResults: 1200 }, renderResults);
+        }
+    }
+    function setSearchUrl() {
+        var query = input.val().trim();
+        var url = document.location.pathname;
+        if (query) {
+            url += "?q=" + encodeURI(query);
+            if (activeTab && fixedTab) {
+                url += "&c=" + activeTab;
+            }
+        }
+        history.replaceState({query: query}, "", url);
+    }
+    input.on("input", function(e) {
+        feelingLucky = false;
+        schedulePageSearch();
+    });
+    $(document).keydown(function(e) {
+        if ((e.ctrlKey || e.metaKey) && (e.key === "ArrowLeft" || e.key === "ArrowRight")) {
+            if (activeTab && visibleTabs.length > 1) {
+                var idx = visibleTabs.indexOf(activeTab);
+                idx += e.key === "ArrowLeft" ? visibleTabs.length - 1 : 1;
+                selectTab(visibleTabs[idx % visibleTabs.length]);
+                return false;
+            }
+        }
+    });
+    reset.click(function() {
+        notify.html(messages.enterTerm);
+        resultSection.hide();
+        activeTab = "";
+        fixedTab = false;
+        resultContainer.empty();
+        input.val('').focus();
+        setSearchUrl();
+    });
+    input.prop("disabled", false);
+    reset.prop("disabled", false);
+
+    var urlParams = new URLSearchParams(window.location.search);
+    if (urlParams.has("q")) {
+        input.val(urlParams.get("q"))
+    }
+    if (urlParams.has("c")) {
+        activeTab = urlParams.get("c");
+        fixedTab = true;
+    }
+    if (urlParams.get("r")) {
+        feelingLucky = true;
+    }
+    if (input.val()) {
+        doPageSearch();
+    } else {
+        notify.html(messages.enterTerm);
+    }
+    input.select().focus();
+});
diff --git a/javadoc/search.html b/javadoc/search.html
new file mode 100644
index 0000000..89de727
--- /dev/null
+++ b/javadoc/search.html
@@ -0,0 +1,76 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Search (Jakarta NoSQL API 1.0.0-M1 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="search">
+<meta name="generator" content="javadoc/SearchWriter">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+<script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="search-page">
+<script type="text/javascript">var pathtoroot = "./";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="jakarta.nosql.core/module-summary.html">Module</a></li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-tree.html">Tree</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html#search">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list"></div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<h1 class="title">Search</h1>
+<div>
+<input type="text" id="page-search-input" disabled placeholder="Search">
+<input type="reset" id="page-search-reset" disabled value="Reset" style="margin: 6px;">
+<details class="page-search-details">
+<summary id="page-search-expand">Additional resources</summary>
+</details>
+</div>
+<div class="page-search-info">
+<p>The <a href="help-doc.html#search">help page</a> provides an introduction to the scope and syntax of JavaDoc search.</p>
+<p>You can use the &lt;ctrl&gt; or &lt;cmd&gt; keys in combination with the left and right arrow keys to switch between result tabs in this page.</p>
+<p>The URL template below may be used to configure this page as a search engine in browsers that support this feature. It has been tested to work in Google Chrome and Mozilla Firefox. Note that other browsers may not support this feature or require a different URL format.</p>
+<span id="page-search-link">link</span><button class="copy" aria-label="Copy URL" id="page-search-copy"><img src="copy.svg" alt="Copy URL"><span data-copied="Copied!">Copy</span></button>
+<p>
+<input type="checkbox" id="search-redirect" disabled>
+<label for="search-redirect">Redirect to first result</label></p>
+</div>
+<p id="page-search-notify">Loading search index...</p>
+<div id="result-section" style="display: none;">
+<div id="result-container"></div>
+<script type="text/javascript" src="search-page.js"></script>
+</div>
+</main>
+<footer role="contentinfo">
+<hr>
+<p class="legal-copy"><small>Copyright &#169; 2017&#x2013;2020 <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.</small></p>
+</footer>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/search.js b/javadoc/search.js
index db3b2f4..d398670 100644
--- a/javadoc/search.js
+++ b/javadoc/search.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,282 +22,413 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
-var noResult = {l: "No results found"};
-var loading = {l: "Loading search index..."};
-var catModules = "Modules";
-var catPackages = "Packages";
-var catTypes = "Classes and Interfaces";
-var catMembers = "Members";
-var catSearchTags = "Search Tags";
-var highlight = "<span class=\"result-highlight\">$&</span>";
-var searchPattern = "";
-var fallbackPattern = "";
-var RANKING_THRESHOLD = 2;
-var NO_MATCH = 0xffff;
-var MIN_RESULTS = 3;
-var MAX_RESULTS = 500;
-var UNNAMED = "<Unnamed>";
+"use strict";
+const messages = {
+    enterTerm: "Enter a search term",
+    noResult: "No results found",
+    oneResult: "Found one result",
+    manyResults: "Found {0} results",
+    loading: "Loading search index...",
+    searching: "Searching...",
+    redirecting: "Redirecting to first result...",
+    linkIcon: "Link icon",
+    linkToSection: "Link to this section"
+}
+const categories = {
+    modules: "Modules",
+    packages: "Packages",
+    types: "Classes and Interfaces",
+    members: "Members",
+    searchTags: "Search Tags"
+};
+const highlight = "<span class='result-highlight'>$&</span>";
+const NO_MATCH = {};
+const MAX_RESULTS = 300;
+function checkUnnamed(name, separator) {
+    return name === "<Unnamed>" || !name ? "" : name + separator;
+}
 function escapeHtml(str) {
     return str.replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-function getHighlightedText(item, matcher, fallbackMatcher) {
-    var escapedItem = escapeHtml(item);
-    var highlighted = escapedItem.replace(matcher, highlight);
-    if (highlighted === escapedItem) {
-        highlighted = escapedItem.replace(fallbackMatcher, highlight)
+function getHighlightedText(str, boundaries, from, to) {
+    var start = from;
+    var text = "";
+    for (var i = 0; i < boundaries.length; i += 2) {
+        var b0 = boundaries[i];
+        var b1 = boundaries[i + 1];
+        if (b0 >= to || b1 <= from) {
+            continue;
+        }
+        text += escapeHtml(str.slice(start, Math.max(start, b0)));
+        text += "<span class='result-highlight'>";
+        text += escapeHtml(str.slice(Math.max(start, b0), Math.min(to, b1)));
+        text += "</span>";
+        start = Math.min(to, b1);
     }
-    return highlighted;
+    text += escapeHtml(str.slice(start, to));
+    return text;
 }
-function getURLPrefix(ui) {
-    var urlPrefix="";
+function getURLPrefix(item, category) {
+    var urlPrefix = "";
     var slash = "/";
-    if (ui.item.category === catModules) {
-        return ui.item.l + slash;
-    } else if (ui.item.category === catPackages && ui.item.m) {
-        return ui.item.m + slash;
-    } else if (ui.item.category === catTypes || ui.item.category === catMembers) {
-        if (ui.item.m) {
-            urlPrefix = ui.item.m + slash;
+    if (category === "modules") {
+        return item.l + slash;
+    } else if (category === "packages" && item.m) {
+        return item.m + slash;
+    } else if (category === "types" || category === "members") {
+        if (item.m) {
+            urlPrefix = item.m + slash;
         } else {
-            $.each(packageSearchIndex, function(index, item) {
-                if (item.m && ui.item.p === item.l) {
-                    urlPrefix = item.m + slash;
+            $.each(packageSearchIndex, function(index, it) {
+                if (it.m && item.p === it.l) {
+                    urlPrefix = it.m + slash;
                 }
             });
         }
     }
     return urlPrefix;
 }
-function createSearchPattern(term) {
-    var pattern = "";
-    var isWordToken = false;
-    term.replace(/,\s*/g, ", ").trim().split(/\s+/).forEach(function(w, index) {
-        if (index > 0) {
-            // whitespace between identifiers is significant
-            pattern += (isWordToken && /^\w/.test(w)) ? "\\s+" : "\\s*";
+function getURL(item, category) {
+    if (item.url) {
+        return item.url;
+    }
+    var url = getURLPrefix(item, category);
+    if (category === "modules") {
+        url += "module-summary.html";
+    } else if (category === "packages") {
+        if (item.u) {
+            url = item.u;
+        } else {
+            url += item.l.replace(/\./g, '/') + "/package-summary.html";
+        }
+    } else if (category === "types") {
+        if (item.u) {
+            url = item.u;
+        } else {
+            url += checkUnnamed(item.p, "/").replace(/\./g, '/') + item.l + ".html";
+        }
+    } else if (category === "members") {
+        url += checkUnnamed(item.p, "/").replace(/\./g, '/') + item.c + ".html" + "#";
+        if (item.u) {
+            url += item.u;
+        } else {
+            url += item.l;
         }
-        var tokens = w.split(/(?=[A-Z,.()<>[\/])/);
+    } else if (category === "searchTags") {
+        url += item.u;
+    }
+    item.url = url;
+    return url;
+}
+function createMatcher(term, camelCase) {
+    if (camelCase && !isUpperCase(term)) {
+        return null;  // no need for camel-case matcher for lower case query
+    }
+    var pattern = "";
+    var upperCase = [];
+    term.trim().split(/\s+/).forEach(function(w, index, array) {
+        var tokens = w.split(/(?=[A-Z,.()<>?[\/])/);
         for (var i = 0; i < tokens.length; i++) {
             var s = tokens[i];
-            if (s === "") {
-                continue;
-            }
-            pattern += $.ui.autocomplete.escapeRegex(s);
-            isWordToken =  /\w$/.test(s);
+            // ',' and '?' are the only delimiters commonly followed by space in java signatures
+            pattern += "(" + $.ui.autocomplete.escapeRegex(s).replace(/[,?]/g, "$&\\s*?") + ")";
+            upperCase.push(false);
+            var isWordToken =  /\w$/.test(s);
             if (isWordToken) {
-                pattern += "([a-z0-9_$<>\\[\\]]*?)";
+                if (i === tokens.length - 1 && index < array.length - 1) {
+                    // space in query string matches all delimiters
+                    pattern += "(.*?)";
+                    upperCase.push(isUpperCase(s[0]));
+                } else {
+                    if (!camelCase && isUpperCase(s) && s.length === 1) {
+                        pattern += "()";
+                    } else {
+                        pattern += "([a-z0-9$<>?[\\]]*?)";
+                    }
+                    upperCase.push(isUpperCase(s[0]));
+                }
+            } else {
+                pattern += "()";
+                upperCase.push(false);
             }
         }
     });
-    return pattern;
+    var re = new RegExp(pattern, "gi");
+    re.upperCase = upperCase;
+    return re;
+}
+function findMatch(matcher, input, startOfName, endOfName) {
+    var from = startOfName;
+    matcher.lastIndex = from;
+    var match = matcher.exec(input);
+    // Expand search area until we get a valid result or reach the beginning of the string
+    while (!match || match.index + match[0].length < startOfName || endOfName < match.index) {
+        if (from === 0) {
+            return NO_MATCH;
+        }
+        from = input.lastIndexOf(".", from - 2) + 1;
+        matcher.lastIndex = from;
+        match = matcher.exec(input);
+    }
+    var boundaries = [];
+    var matchEnd = match.index + match[0].length;
+    var score = 5;
+    var start = match.index;
+    var prevEnd = -1;
+    for (var i = 1; i < match.length; i += 2) {
+        var isUpper = isUpperCase(input[start]);
+        var isMatcherUpper = matcher.upperCase[i];
+        // capturing groups come in pairs, match and non-match
+        boundaries.push(start, start + match[i].length);
+        // make sure groups are anchored on a left word boundary
+        var prevChar = input[start - 1] || "";
+        var nextChar = input[start + 1] || "";
+        if (start !== 0 && !/[\W_]/.test(prevChar) && !/[\W_]/.test(input[start])) {
+            if (isUpper && (isLowerCase(prevChar) || isLowerCase(nextChar))) {
+                score -= 0.1;
+            } else if (isMatcherUpper && start === prevEnd) {
+                score -= isUpper ? 0.1 : 1.0;
+            } else {
+                return NO_MATCH;
+            }
+        }
+        prevEnd = start + match[i].length;
+        start += match[i].length + match[i + 1].length;
+
+        // lower score for parts of the name that are missing
+        if (match[i + 1] && prevEnd < endOfName) {
+            score -= rateNoise(match[i + 1]);
+        }
+    }
+    // lower score if a type name contains unmatched camel-case parts
+    if (input[matchEnd - 1] !== "." && endOfName > matchEnd)
+        score -= rateNoise(input.slice(matchEnd, endOfName));
+    score -= rateNoise(input.slice(0, Math.max(startOfName, match.index)));
+
+    if (score <= 0) {
+        return NO_MATCH;
+    }
+    return {
+        input: input,
+        score: score,
+        boundaries: boundaries
+    };
 }
-function createMatcher(pattern, flags) {
-    var isCamelCase = /[A-Z]/.test(pattern);
-    return new RegExp(pattern, flags + (isCamelCase ? "" : "i"));
+function isUpperCase(s) {
+    return s !== s.toLowerCase();
 }
-var watermark = 'Search';
-$(function() {
-    var search = $("#search-input");
-    var reset = $("#reset-button");
-    search.val('');
-    search.prop("disabled", false);
-    reset.prop("disabled", false);
-    search.val(watermark).addClass('watermark');
-    search.blur(function() {
-        if ($(this).val().length === 0) {
-            $(this).val(watermark).addClass('watermark');
+function isLowerCase(s) {
+    return s !== s.toUpperCase();
+}
+function rateNoise(str) {
+    return (str.match(/([.(])/g) || []).length / 5
+         + (str.match(/([A-Z]+)/g) || []).length / 10
+         +  str.length / 20;
+}
+function doSearch(request, response) {
+    var term = request.term.trim();
+    var maxResults = request.maxResults || MAX_RESULTS;
+    if (term.length === 0) {
+        return this.close();
+    }
+    var matcher = {
+        plainMatcher: createMatcher(term, false),
+        camelCaseMatcher: createMatcher(term, true)
+    }
+    var indexLoaded = indexFilesLoaded();
+
+    function getPrefix(item, category) {
+        switch (category) {
+            case "packages":
+                return checkUnnamed(item.m, "/");
+            case "types":
+                return checkUnnamed(item.p, ".");
+            case "members":
+                return checkUnnamed(item.p, ".") + item.c + ".";
+            default:
+                return "";
         }
-    });
-    search.on('click keydown paste', function() {
-        if ($(this).val() === watermark) {
-            $(this).val('').removeClass('watermark');
+    }
+    function useQualifiedName(category) {
+        switch (category) {
+            case "packages":
+                return /[\s/]/.test(term);
+            case "types":
+            case "members":
+                return /[\s.]/.test(term);
+            default:
+                return false;
         }
-    });
-    reset.click(function() {
-        search.val('').focus();
-    });
-    search.focus()[0].setSelectionRange(0, 0);
-});
+    }
+    function searchIndex(indexArray, category) {
+        var matches = [];
+        if (!indexArray) {
+            if (!indexLoaded) {
+                matches.push({ l: messages.loading, category: category });
+            }
+            return matches;
+        }
+        $.each(indexArray, function (i, item) {
+            var prefix = getPrefix(item, category);
+            var simpleName = item.l;
+            var qualifiedName = prefix + simpleName;
+            var useQualified = useQualifiedName(category);
+            var input = useQualified ? qualifiedName : simpleName;
+            var startOfName = useQualified ? prefix.length : 0;
+            var endOfName = category === "members" && input.indexOf("(", startOfName) > -1
+                ? input.indexOf("(", startOfName) : input.length;
+            var m = findMatch(matcher.plainMatcher, input, startOfName, endOfName);
+            if (m === NO_MATCH && matcher.camelCaseMatcher) {
+                m = findMatch(matcher.camelCaseMatcher, input, startOfName, endOfName);
+            }
+            if (m !== NO_MATCH) {
+                m.indexItem = item;
+                m.prefix = prefix;
+                m.category = category;
+                if (!useQualified) {
+                    m.input = qualifiedName;
+                    m.boundaries = m.boundaries.map(function(b) {
+                        return b + prefix.length;
+                    });
+                }
+                matches.push(m);
+            }
+            return true;
+        });
+        return matches.sort(function(e1, e2) {
+            return e2.score - e1.score;
+        }).slice(0, maxResults);
+    }
+
+    var result = searchIndex(moduleSearchIndex, "modules")
+         .concat(searchIndex(packageSearchIndex, "packages"))
+         .concat(searchIndex(typeSearchIndex, "types"))
+         .concat(searchIndex(memberSearchIndex, "members"))
+         .concat(searchIndex(tagSearchIndex, "searchTags"));
+
+    if (!indexLoaded) {
+        updateSearchResults = function() {
+            doSearch(request, response);
+        }
+    } else {
+        updateSearchResults = function() {};
+    }
+    response(result);
+}
+// JQuery search menu implementation
 $.widget("custom.catcomplete", $.ui.autocomplete, {
     _create: function() {
         this._super();
-        this.widget().menu("option", "items", "> :not(.ui-autocomplete-category)");
+        this.widget().menu("option", "items", "> .result-item");
+        // workaround for search result scrolling
+        this.menu._scrollIntoView = function _scrollIntoView( item ) {
+            var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
+            if ( this._hasScroll() ) {
+                borderTop = parseFloat( $.css( this.activeMenu[ 0 ], "borderTopWidth" ) ) || 0;
+                paddingTop = parseFloat( $.css( this.activeMenu[ 0 ], "paddingTop" ) ) || 0;
+                offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
+                scroll = this.activeMenu.scrollTop();
+                elementHeight = this.activeMenu.height() - 26;
+                itemHeight = item.outerHeight();
+
+                if ( offset < 0 ) {
+                    this.activeMenu.scrollTop( scroll + offset );
+                } else if ( offset + itemHeight > elementHeight ) {
+                    this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
+                }
+            }
+        };
     },
     _renderMenu: function(ul, items) {
-        var rMenu = this;
         var currentCategory = "";
-        rMenu.menu.bindings = $();
+        var widget = this;
+        widget.menu.bindings = $();
         $.each(items, function(index, item) {
-            var li;
             if (item.category && item.category !== currentCategory) {
-                ul.append("<li class=\"ui-autocomplete-category\">" + item.category + "</li>");
+                ul.append("<li class='ui-autocomplete-category'>" + categories[item.category] + "</li>");
                 currentCategory = item.category;
             }
-            li = rMenu._renderItemData(ul, item);
+            var li = widget._renderItemData(ul, item);
             if (item.category) {
-                li.attr("aria-label", item.category + " : " + item.l);
-                li.attr("class", "result-item");
+                li.attr("aria-label", categories[item.category] + " : " + item.l);
             } else {
                 li.attr("aria-label", item.l);
-                li.attr("class", "result-item");
             }
+            li.attr("class", "result-item");
         });
+        ul.append("<li class='ui-static-link'><a href='" + pathtoroot + "search.html?q="
+            + encodeURI(widget.term) + "'>Go to search page</a></li>");
     },
     _renderItem: function(ul, item) {
-        var label = "";
-        var matcher = createMatcher(escapeHtml(searchPattern), "g");
-        var fallbackMatcher = new RegExp(fallbackPattern, "gi")
-        if (item.category === catModules) {
-            label = getHighlightedText(item.l, matcher, fallbackMatcher);
-        } else if (item.category === catPackages) {
-            label = getHighlightedText(item.l, matcher, fallbackMatcher);
-        } else if (item.category === catTypes) {
-            label = (item.p && item.p !== UNNAMED)
-                    ? getHighlightedText(item.p + "." + item.l, matcher, fallbackMatcher)
-                    : getHighlightedText(item.l, matcher, fallbackMatcher);
-        } else if (item.category === catMembers) {
-            label = (item.p && item.p !== UNNAMED)
-                    ? getHighlightedText(item.p + "." + item.c + "." + item.l, matcher, fallbackMatcher)
-                    : getHighlightedText(item.c + "." + item.l, matcher, fallbackMatcher);
-        } else if (item.category === catSearchTags) {
-            label = getHighlightedText(item.l, matcher, fallbackMatcher);
-        } else {
-            label = item.l;
-        }
         var li = $("<li/>").appendTo(ul);
         var div = $("<div/>").appendTo(li);
-        if (item.category === catSearchTags && item.h) {
-            if (item.d) {
-                div.html(label + "<span class=\"search-tag-holder-result\"> (" + item.h + ")</span><br><span class=\"search-tag-desc-result\">"
-                                + item.d + "</span><br>");
+        var label = item.l
+            ? item.l
+            : getHighlightedText(item.input, item.boundaries, 0, item.input.length);
+        var idx = item.indexItem;
+        if (item.category === "searchTags" && idx && idx.h) {
+            if (idx.d) {
+                div.html(label + "<span class='search-tag-holder-result'> (" + idx.h + ")</span><br><span class='search-tag-desc-result'>"
+                    + idx.d + "</span><br>");
             } else {
-                div.html(label + "<span class=\"search-tag-holder-result\"> (" + item.h + ")</span>");
+                div.html(label + "<span class='search-tag-holder-result'> (" + idx.h + ")</span>");
             }
         } else {
-            if (item.m) {
-                div.html(item.m + "/" + label);
-            } else {
-                div.html(label);
-            }
+            div.html(label);
         }
         return li;
     }
 });
-function rankMatch(match, category) {
-    if (!match) {
-        return NO_MATCH;
-    }
-    var index = match.index;
-    var input = match.input;
-    var leftBoundaryMatch = 2;
-    var periferalMatch = 0;
-    // make sure match is anchored on a left word boundary
-    if (index === 0 || /\W/.test(input[index - 1]) || "_" === input[index]) {
-        leftBoundaryMatch = 0;
-    } else if ("_" === input[index - 1] || (input[index] === input[index].toUpperCase() && !/^[A-Z0-9_$]+$/.test(input))) {
-        leftBoundaryMatch = 1;
-    }
-    var matchEnd = index + match[0].length;
-    var leftParen = input.indexOf("(");
-    var endOfName = leftParen > -1 ? leftParen : input.length;
-    // exclude peripheral matches
-    if (category !== catModules && category !== catSearchTags) {
-        var delim = category === catPackages ? "/" : ".";
-        if (leftParen > -1 && leftParen < index) {
-            periferalMatch += 2;
-        } else if (input.lastIndexOf(delim, endOfName) >= matchEnd) {
-            periferalMatch += 2;
-        }
-    }
-    var delta = match[0].length === endOfName ? 0 : 1; // rank full match higher than partial match
-    for (var i = 1; i < match.length; i++) {
-        // lower ranking if parts of the name are missing
-        if (match[i])
-            delta += match[i].length;
-    }
-    if (category === catTypes) {
-        // lower ranking if a type name contains unmatched camel-case parts
-        if (/[A-Z]/.test(input.substring(matchEnd)))
-            delta += 5;
-        if (/[A-Z]/.test(input.substring(0, index)))
-            delta += 5;
-    }
-    return leftBoundaryMatch + periferalMatch + (delta / 200);
-
-}
-function doSearch(request, response) {
-    var result = [];
-    searchPattern = createSearchPattern(request.term);
-    fallbackPattern = createSearchPattern(request.term.toLowerCase());
-    if (searchPattern === "") {
-        return this.close();
-    }
-    var camelCaseMatcher = createMatcher(searchPattern, "");
-    var fallbackMatcher = new RegExp(fallbackPattern, "i");
-
-    function searchIndexWithMatcher(indexArray, matcher, category, nameFunc) {
-        if (indexArray) {
-            var newResults = [];
-            $.each(indexArray, function (i, item) {
-                item.category = category;
-                var ranking = rankMatch(matcher.exec(nameFunc(item)), category);
-                if (ranking < RANKING_THRESHOLD) {
-                    newResults.push({ranking: ranking, item: item});
-                }
-                return newResults.length <= MAX_RESULTS;
-            });
-            return newResults.sort(function(e1, e2) {
-                return e1.ranking - e2.ranking;
-            }).map(function(e) {
-                return e.item;
-            });
+$(function() {
+    var expanded = false;
+    var windowWidth;
+    function collapse() {
+        if (expanded) {
+            $("div#navbar-top").removeAttr("style");
+            $("button#navbar-toggle-button")
+                .removeClass("expanded")
+                .attr("aria-expanded", "false");
+            expanded = false;
         }
-        return [];
     }
-    function searchIndex(indexArray, category, nameFunc) {
-        var primaryResults = searchIndexWithMatcher(indexArray, camelCaseMatcher, category, nameFunc);
-        result = result.concat(primaryResults);
-        if (primaryResults.length <= MIN_RESULTS && !camelCaseMatcher.ignoreCase) {
-            var secondaryResults = searchIndexWithMatcher(indexArray, fallbackMatcher, category, nameFunc);
-            result = result.concat(secondaryResults.filter(function (item) {
-                return primaryResults.indexOf(item) === -1;
-            }));
+    $("button#navbar-toggle-button").click(function (e) {
+        if (expanded) {
+            collapse();
+        } else {
+            var navbar = $("div#navbar-top");
+            navbar.height(navbar.prop("scrollHeight"));
+            $("button#navbar-toggle-button")
+                .addClass("expanded")
+                .attr("aria-expanded", "true");
+            expanded = true;
+            windowWidth = window.innerWidth;
         }
-    }
-
-    searchIndex(moduleSearchIndex, catModules, function(item) { return item.l; });
-    searchIndex(packageSearchIndex, catPackages, function(item) {
-        return (item.m && request.term.indexOf("/") > -1)
-            ? (item.m + "/" + item.l) : item.l;
     });
-    searchIndex(typeSearchIndex, catTypes, function(item) {
-        return request.term.indexOf(".") > -1 ? item.p + "." + item.l : item.l;
+    $("ul.sub-nav-list-small li a").click(collapse);
+    $("input#search-input").focus(collapse);
+    $("main").click(collapse);
+    $("section[id] > :header, :header[id], :header:has(a[id])").each(function(idx, el) {
+        // Create anchor links for headers with an associated id attribute
+        var hdr = $(el);
+        var id = hdr.attr("id") || hdr.parent("section").attr("id") || hdr.children("a").attr("id");
+        if (id) {
+            hdr.append(" <a href='#" + id + "' class='anchor-link' aria-label='" + messages.linkToSection
+                + "'><img src='" + pathtoroot + "link.svg' alt='" + messages.linkIcon +"' tabindex='0'"
+                + " width='16' height='16'></a>");
+        }
     });
-    searchIndex(memberSearchIndex, catMembers, function(item) {
-        return request.term.indexOf(".") > -1
-            ? item.p + "." + item.c + "." + item.l : item.l;
+    $(window).on("orientationchange", collapse).on("resize", function(e) {
+        if (expanded && windowWidth !== window.innerWidth) collapse();
     });
-    searchIndex(tagSearchIndex, catSearchTags, function(item) { return item.l; });
-
-    if (!indexFilesLoaded()) {
-        updateSearchResults = function() {
-            doSearch(request, response);
-        }
-        result.unshift(loading);
-    } else {
-        updateSearchResults = function() {};
-    }
-    response(result);
-}
-$(function() {
-    $("#search-input").catcomplete({
+    var search = $("#search-input");
+    var reset = $("#reset-button");
+    search.catcomplete({
         minLength: 1,
-        delay: 300,
+        delay: 200,
         source: doSearch,
         response: function(event, ui) {
             if (!ui.content.length) {
-                ui.content.push(noResult);
+                ui.content.push({ l: messages.noResult });
             } else {
                 $("#search-input").empty();
             }
@@ -310,45 +441,18 @@ $(function() {
             collision: "flip"
         },
         select: function(event, ui) {
-            if (ui.item.category) {
-                var url = getURLPrefix(ui);
-                if (ui.item.category === catModules) {
-                    url += "module-summary.html";
-                } else if (ui.item.category === catPackages) {
-                    if (ui.item.u) {
-                        url = ui.item.u;
-                    } else {
-                        url += ui.item.l.replace(/\./g, '/') + "/package-summary.html";
-                    }
-                } else if (ui.item.category === catTypes) {
-                    if (ui.item.u) {
-                        url = ui.item.u;
-                    } else if (ui.item.p === UNNAMED) {
-                        url += ui.item.l + ".html";
-                    } else {
-                        url += ui.item.p.replace(/\./g, '/') + "/" + ui.item.l + ".html";
-                    }
-                } else if (ui.item.category === catMembers) {
-                    if (ui.item.p === UNNAMED) {
-                        url += ui.item.c + ".html" + "#";
-                    } else {
-                        url += ui.item.p.replace(/\./g, '/') + "/" + ui.item.c + ".html" + "#";
-                    }
-                    if (ui.item.u) {
-                        url += ui.item.u;
-                    } else {
-                        url += ui.item.l;
-                    }
-                } else if (ui.item.category === catSearchTags) {
-                    url += ui.item.u;
-                }
-                if (top !== window) {
-                    parent.classFrame.location = pathtoroot + url;
-                } else {
-                    window.location.href = pathtoroot + url;
-                }
+            if (ui.item.indexItem) {
+                var url = getURL(ui.item.indexItem, ui.item.category);
+                window.location.href = pathtoroot + url;
                 $("#search-input").focus();
             }
         }
     });
+    search.val('');
+    search.prop("disabled", false);
+    reset.prop("disabled", false);
+    reset.click(function() {
+        search.val('').focus();
+    });
+    search.focus();
 });
diff --git a/javadoc/serialized-form.html b/javadoc/serialized-form.html
index d689df6..c837d4c 100644
--- a/javadoc/serialized-form.html
+++ b/javadoc/serialized-form.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Serialized Form (api-parent 1.0.0-b7 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Serialized Form (Jakarta NoSQL API 1.0.0-M1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="serialized forms">
 <meta name="generator" content="javadoc/SerializedFormWriterImpl">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,23 +23,23 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="index.html">Overview</a></li>
-<li>Module</li>
-<li>Package</li>
+<li><a href="jakarta.nosql.core/module-summary.html">Module</a></li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">Package</a></li>
 <li>Class</li>
 <li>Use</li>
-<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="jakarta.nosql.core/jakarta/nosql/package-tree.html">Tree</a></li>
 <li><a href="index-all.html">Index</a></li>
 <li><a href="help-doc.html#serialized-form">Help</a></li>
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -57,8 +56,14 @@ <h1 title="Serialized Form" class="title">Serialized Form</h1>
 <h2 title="Package">Package&nbsp;<a href="jakarta.nosql.core/jakarta/nosql/package-summary.html">jakarta.nosql</a></h2>
 <ul class="block-list">
 <li>
+<section class="serialized-class-details" id="jakarta.nosql.MappingException">
+<h3>Exception Class&nbsp;<a href="jakarta.nosql.core/jakarta/nosql/MappingException.html" title="class in jakarta.nosql">jakarta.nosql.MappingException</a></h3>
+<div class="type-signature">class MappingException extends <a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">NoSQLException</a> implements <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></div>
+</section>
+</li>
+<li>
 <section class="serialized-class-details" id="jakarta.nosql.NoSQLException">
-<h3>Exception&nbsp;<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">jakarta.nosql.NoSQLException</a></h3>
+<h3>Exception Class&nbsp;<a href="jakarta.nosql.core/jakarta/nosql/NoSQLException.html" title="class in jakarta.nosql">jakarta.nosql.NoSQLException</a></h3>
 <div class="type-signature">class NoSQLException extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" title="class or interface in java.lang" class="external-link">RuntimeException</a> implements <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></div>
 </section>
 </li>
diff --git a/javadoc/stylesheet.css b/javadoc/stylesheet.css
index 4a576bd..f71489f 100644
--- a/javadoc/stylesheet.css
+++ b/javadoc/stylesheet.css
@@ -4,18 +4,73 @@
 
 @import url('resources/fonts/dejavu.css');
 
+/*
+ * These CSS custom properties (variables) define the core color and font
+ * properties used in this stylesheet.
+ */
+:root {
+    /* body, block and code fonts */
+    --body-font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif;
+    --block-font-family: 'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    --code-font-family: 'DejaVu Sans Mono', monospace;
+    /* Base font sizes for body and code elements */
+    --body-font-size: 14px;
+    --code-font-size: 14px;
+    /* Text colors for body and block elements */
+    --body-text-color: #353833;
+    --block-text-color: #474747;
+    /* Background colors for various structural elements */
+    --body-background-color: #ffffff;
+    --section-background-color: #f8f8f8;
+    --detail-background-color: #ffffff;
+    /* Colors for navigation bar and table captions */
+    --navbar-background-color: #4D7A97;
+    --navbar-text-color: #ffffff;
+    /* Background color for subnavigation and various headers */
+    --subnav-background-color: #dee3e9;
+    /* Background and text colors for selected tabs and navigation items */
+    --selected-background-color: #f8981d;
+    --selected-text-color: #253441;
+    --selected-link-color: #1f389c;
+    /* Background colors for generated tables */
+    --even-row-color: #ffffff;
+    --odd-row-color: #eeeeef;
+    /* Text color for page title */
+    --title-color: #2c4557;
+    /* Text colors for links */
+    --link-color: #4A6782;
+    --link-color-active: #bb7a2a;
+    /* Snippet colors */
+    --snippet-background-color: #ebecee;
+    --snippet-text-color: var(--block-text-color);
+    --snippet-highlight-color: #f7c590;
+    /* Border colors for structural elements and user defined tables */
+    --border-color: #ededed;
+    --table-border-color: #000000;
+    /* Search input colors */
+    --search-input-background-color: #ffffff;
+    --search-input-text-color: #000000;
+    --search-input-placeholder-color: #909090;
+    /* Highlight color for active search tag target */
+    --search-tag-highlight-color: #ffff00;
+    /* Adjustments for icon and active background colors of copy-to-clipboard buttons */
+    --copy-icon-brightness: 100%;
+    --copy-button-background-color-active: rgba(168, 168, 176, 0.3);
+    /* Colors for invalid tag notifications */
+    --invalid-tag-background-color: #ffe6e6;
+    --invalid-tag-text-color: #000000;
+}
 /*
  * Styles for individual HTML elements.
  *
  * These are styles that are specific to individual HTML elements. Changing them affects the style of a particular
  * HTML element throughout the page.
  */
-
 body {
-    background-color:#ffffff;
-    color:#353833;
-    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
-    font-size:14px;
+    background-color:var(--body-background-color);
+    color:var(--body-text-color);
+    font-family:var(--body-font-family);
+    font-size:var(--body-font-size);
     margin:0;
     padding:0;
     height:100%;
@@ -31,58 +86,59 @@ iframe {
 }
 a:link, a:visited {
     text-decoration:none;
-    color:#4A6782;
+    color:var(--link-color);
 }
 a[href]:hover, a[href]:focus {
     text-decoration:none;
-    color:#bb7a2a;
-}
-a[name] {
-    color:#353833;
+    color:var(--link-color-active);
 }
 pre {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
+    font-family:var(--code-font-family);
+    font-size:1em;
 }
 h1 {
-    font-size:20px;
+    font-size:1.428em;
 }
 h2 {
-    font-size:18px;
+    font-size:1.285em;
 }
 h3 {
-    font-size:16px;
+    font-size:1.14em;
 }
 h4 {
-    font-size:15px;
+    font-size:1.072em;
 }
 h5 {
-    font-size:14px;
+    font-size:1.001em;
 }
 h6 {
-    font-size:13px;
+    font-size:0.93em;
+}
+/* Disable font boosting for selected elements */
+h1, h2, h3, h4, h5, h6, div.member-signature {
+    max-height: 1000em;
 }
 ul {
     list-style-type:disc;
 }
 code, tt {
-    font-family:'DejaVu Sans Mono', monospace;
+    font-family:var(--code-font-family);
 }
 :not(h1, h2, h3, h4, h5, h6) > code,
 :not(h1, h2, h3, h4, h5, h6) > tt {
-    font-size:14px;
+    font-size:var(--code-font-size);
     padding-top:4px;
     margin-top:8px;
     line-height:1.4em;
 }
 dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
+    font-family:var(--code-font-family);
+    font-size:1em;
     padding-top:4px;
 }
 .summary-table dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
+    font-family:var(--code-font-family);
+    font-size:1em;
     vertical-align:top;
     padding-top:4px;
 }
@@ -90,8 +146,8 @@ sup {
     font-size:8px;
 }
 button {
-    font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif;
-    font-size: 14px;
+    font-family: var(--body-font-family);
+    font-size: 1em;
 }
 /*
  * Styles for HTML generated by javadoc.
@@ -102,74 +158,67 @@ button {
 /*
  * Styles for document title and copyright.
  */
-.clear {
-    clear:both;
-    height:0;
-    overflow:hidden;
-}
 .about-language {
     float:right;
     padding:0 21px 8px 8px;
-    font-size:11px;
+    font-size:0.915em;
     margin-top:-9px;
     height:2.9em;
 }
 .legal-copy {
     margin-left:.5em;
 }
-.tab {
-    background-color:#0066FF;
-    color:#ffffff;
-    padding:8px;
-    width:5em;
-    font-weight:bold;
-}
 /*
  * Styles for navigation bar.
  */
 @media screen {
-    .flex-box {
+    div.flex-box {
         position:fixed;
         display:flex;
         flex-direction:column;
         height: 100%;
         width: 100%;
     }
-    .flex-header {
+    header.flex-header {
         flex: 0 0 auto;
     }
-    .flex-content {
+    div.flex-content {
         flex: 1 1 auto;
         overflow-y: auto;
     }
 }
 .top-nav {
-    background-color:#4D7A97;
-    color:#FFFFFF;
+    background-color:var(--navbar-background-color);
+    color:var(--navbar-text-color);
     float:left;
-    padding:0;
     width:100%;
     clear:right;
     min-height:2.8em;
-    padding-top:10px;
+    padding:10px 0 0 0;
     overflow:hidden;
-    font-size:12px;
+    font-size:0.857em;
+}
+button#navbar-toggle-button {
+    display:none;
+}
+ul.sub-nav-list-small {
+    display: none;
 }
 .sub-nav {
-    background-color:#dee3e9;
+    background-color:var(--subnav-background-color);
     float:left;
     width:100%;
     overflow:hidden;
-    font-size:12px;
+    font-size:0.857em;
 }
 .sub-nav div {
     clear:left;
     float:left;
-    padding:0 0 5px 6px;
+    padding:6px;
     text-transform:uppercase;
 }
-.sub-nav .nav-list {
-    padding-top:5px;
+.sub-nav .sub-nav-list {
+    padding-top:4px;
 }
 ul.nav-list {
     display:block;
@@ -189,32 +238,27 @@ ul.nav-list li {
 }
 .sub-nav .nav-list-search {
     float:right;
-    margin:0 0 0 0;
-    padding:5px 6px;
+    margin:0;
+    padding:6px;
     clear:none;
-}
-.nav-list-search label {
+    text-align:right;
     position:relative;
-    right:-16px;
 }
 ul.sub-nav-list li {
     list-style:none;
     float:left;
-    padding-top:10px;
 }
 .top-nav a:link, .top-nav a:active, .top-nav a:visited {
-    color:#FFFFFF;
+    color:var(--navbar-text-color);
     text-decoration:none;
     text-transform:uppercase;
 }
 .top-nav a:hover {
-    text-decoration:none;
-    color:#bb7a2a;
-    text-transform:uppercase;
+    color:var(--link-color-active);
 }
 .nav-bar-cell1-rev {
-    background-color:#F8981D;
-    color:#253441;
+    background-color:var(--selected-background-color);
+    color:var(--selected-text-color);
     margin: auto 5px;
 }
 .skip-nav {
@@ -232,30 +276,30 @@ ul.sub-nav-list li {
     }
 }
 /*
- * Styles for page header and footer.
+ * Styles for page header.
  */
 .title {
-    color:#2c4557;
+    color:var(--title-color);
     margin:10px 0;
 }
 .sub-title {
     margin:5px 0 0 0;
 }
-.header ul {
-    margin:0 0 15px 0;
-    padding:0;
+ul.contents-list {
+    margin: 0 0 15px 0;
+    padding: 0;
+    list-style: none;
 }
-.header ul li, .footer ul li {
-    list-style:none;
-    font-size:13px;
+ul.contents-list li {
+    font-size:0.93em;
 }
 /*
  * Styles for headings.
  */
 body.class-declaration-page .summary h2,
 body.class-declaration-page .details h2,
-body.class-use-page  h2,
-body.module-declaration-page  .block-list h2 {
+body.class-use-page h2,
+body.module-declaration-page .block-list h2 {
     font-style: italic;
     padding:0;
     margin:15px 0;
@@ -263,8 +307,8 @@ body.module-declaration-page  .block-list h2 {
 body.class-declaration-page .summary h3,
 body.class-declaration-page .details h3,
 body.class-declaration-page .summary .inherited-list h2 {
-    background-color:#dee3e9;
-    border:1px solid #d0d9e0;
+    background-color:var(--subnav-background-color);
+    border:1px solid var(--border-color);
     margin:0 0 6px -8px;
     padding:7px 5px;
 }
@@ -277,16 +321,16 @@ main {
     position:relative;
 }
 dl.notes > dt {
-    font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif;
-    font-size:12px;
+    font-family: var(--body-font-family);
+    font-size:0.856em;
     font-weight:bold;
     margin:10px 0 0 0;
-    color:#4E4E4E;
+    color:var(--body-text-color);
 }
 dl.notes > dd {
     margin:5px 10px 10px 0;
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    font-size:1em;
+    font-family:var(--block-font-family)
 }
 dl.name-value > dt {
     margin-left:1px;
@@ -331,121 +375,160 @@ ul.summary-list > li {
     margin-bottom:15px;
     line-height:1.4;
 }
+ul.ref-list {
+  padding:0;
+  margin:0;
+}
+ul.ref-list > li {
+    list-style:none;
+}
 .summary-table dl, .summary-table dl dt, .summary-table dl dd {
     margin-top:0;
     margin-bottom:1px;
 }
-ul.see-list, ul.see-list-long {
+ul.tag-list, ul.tag-list-long {
     padding-left: 0;
     list-style: none;
 }
-ul.see-list li {
+ul.tag-list li {
     display: inline;
 }
-ul.see-list li:not(:last-child):after,
-ul.see-list-long li:not(:last-child):after {
+ul.tag-list li:not(:last-child):after,
+ul.tag-list-long li:not(:last-child):after
+{
     content: ", ";
     white-space: pre-wrap;
 }
+ul.preview-feature-list {
+    list-style: none;
+    margin:0;
+    padding:0.1em;
+    line-height: 1.6em;
+}
 /*
  * Styles for tables.
  */
 .summary-table, .details-table {
     width:100%;
     border-spacing:0;
-    border-left:1px solid #EEE;
-    border-right:1px solid #EEE;
-    border-bottom:1px solid #EEE;
+    border:1px solid var(--border-color);
+    border-top:0;
     padding:0;
 }
 .caption {
     position:relative;
     text-align:left;
     background-repeat:no-repeat;
-    color:#253441;
-    font-weight:bold;
+    color:var(--selected-text-color);
     clear:none;
     overflow:hidden;
-    padding:0;
-    padding-top:10px;
-    padding-left:1px;
+    padding: 10px 0 0 1px;
     margin:0;
-    white-space:pre;
 }
 .caption a:link, .caption a:visited {
-    color:#1f389c;
+    color:var(--selected-link-color);
 }
 .caption a:hover,
 .caption a:active {
-    color:#FFFFFF;
+    color:var(--navbar-text-color);
 }
 .caption span {
+    font-weight:bold;
     white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    padding-bottom:7px;
+    padding:5px 12px 7px 12px;
     display:inline-block;
     float:left;
-    background-color:#F8981D;
+    background-color:var(--selected-background-color);
     border: none;
     height:16px;
 }
 div.table-tabs {
     padding:10px 0 0 1px;
-    margin:0;
+    margin:10px 0 0 0;
 }
 div.table-tabs > button {
-   border: none;
-   cursor: pointer;
-   padding: 5px 12px 7px 12px;
-   font-weight: bold;
-   margin-right: 3px;
+    border: none;
+    cursor: pointer;
+    padding: 5px 12px 7px 12px;
+    font-weight: bold;
+    margin-right: 8px;
 }
-div.table-tabs > button.active-table-tab {
-   background: #F8981D;
-   color: #253441;
+div.table-tabs > .active-table-tab {
+    background: var(--selected-background-color);
+    color: var(--selected-text-color);
 }
 div.table-tabs > button.table-tab {
-   background: #4D7A97;
-   color: #FFFFFF;
+    background: var(--navbar-background-color);
+    color: var(--navbar-text-color);
+}
+.two-column-search-results {
+    display: grid;
+    grid-template-columns: minmax(400px, max-content) minmax(400px, auto);
+}
+div.checkboxes {
+    line-height: 2em;
+}
+div.checkboxes > span {
+    margin-left: 10px;
+}
+div.checkboxes > label {
+    margin-left: 8px;
+    white-space: nowrap;
+}
+div.checkboxes > label > input {
+    margin: 0 2px;
 }
 .two-column-summary {
     display: grid;
-    grid-template-columns: minmax(15%, max-content) minmax(15%, auto);
+    grid-template-columns: minmax(25%, max-content) minmax(25%, auto);
 }
 .three-column-summary {
     display: grid;
-    grid-template-columns: minmax(10%, max-content) minmax(15%, max-content) minmax(15%, auto);
+    grid-template-columns: minmax(15%, max-content) minmax(20%, max-content) minmax(20%, auto);
+}
+.three-column-release-summary {
+    display: grid;
+    grid-template-columns: minmax(40%, max-content) minmax(10%, max-content) minmax(40%, auto);
 }
 .four-column-summary {
     display: grid;
-    grid-template-columns: minmax(10%, max-content) minmax(10%, max-content) minmax(10%, max-content) minmax(10%, auto);
+    grid-template-columns: minmax(10%, max-content) minmax(15%, max-content) minmax(15%, max-content) minmax(15%, auto);
 }
-@media screen and (max-width: 600px) {
-    .two-column-summary {
+@media screen and (max-width: 1000px) {
+    .four-column-summary {
         display: grid;
-        grid-template-columns: 1fr;
+        grid-template-columns: minmax(15%, max-content) minmax(15%, auto);
     }
 }
 @media screen and (max-width: 800px) {
+    .two-column-search-results {
+        display: grid;
+        grid-template-columns: minmax(40%, max-content) minmax(40%, auto);
+    }
     .three-column-summary {
         display: grid;
         grid-template-columns: minmax(10%, max-content) minmax(25%, auto);
     }
-    .three-column-summary .col-last {
+    .three-column-release-summary {
+        display: grid;
+        grid-template-columns: minmax(70%, max-content) minmax(30%, max-content)
+    }
+    .three-column-summary .col-last,
+    .three-column-release-summary .col-last{
         grid-column-end: span 2;
     }
 }
-@media screen and (max-width: 1000px) {
-    .four-column-summary {
+@media screen and (max-width: 600px) {
+    .two-column-summary {
         display: grid;
-        grid-template-columns: minmax(15%, max-content) minmax(15%, auto);
+        grid-template-columns: 1fr;
     }
 }
 .summary-table > div, .details-table > div {
     text-align:left;
     padding: 8px 3px 3px 7px;
+    overflow-x: auto;
+    scrollbar-width: thin;
 }
 .col-first, .col-second, .col-last, .col-constructor-name, .col-summary-item-name {
     vertical-align:top;
@@ -454,14 +537,43 @@ div.table-tabs > button.table-tab {
     padding-bottom:3px;
 }
 .table-header {
-    background:#dee3e9;
+    background:var(--subnav-background-color);
     font-weight: bold;
 }
+/* Sortable table columns */
+.table-header[onclick] {
+    cursor: pointer;
+}
+.table-header[onclick]::after {
+    content:"";
+    display:inline-block;
+    background-image:url('data:image/svg+xml; utf8, \
+    <svg xmlns="http://www.w3.org/2000/svg" width="125" height="170"> \
+    <path d="M10.101 57.059L63.019 4.142l52.917 52.917M10.101 86.392l52.917 52.917 52.917-52.917" style="opacity:.35;"/></svg>');
+    background-size:100% 100%;
+    width:9px;
+    height:14px;
+    margin-left:4px;
+    margin-bottom:-3px;
+}
+.table-header[onclick].sort-asc::after {
+    background-image:url('data:image/svg+xml; utf8, \
+    <svg xmlns="http://www.w3.org/2000/svg" width="125" height="170"> \
+    <path d="M10.101 57.059L63.019 4.142l52.917 52.917" style="opacity:.75;"/> \
+    <path d="M10.101 86.392l52.917 52.917 52.917-52.917" style="opacity:.35;"/></svg>');
+
+}
+.table-header[onclick].sort-desc::after {
+    background-image:url('data:image/svg+xml; utf8, \
+    <svg xmlns="http://www.w3.org/2000/svg" width="125" height="170"> \
+    <path d="M10.101 57.059L63.019 4.142l52.917 52.917" style="opacity:.35;"/> \
+    <path d="M10.101 86.392l52.917 52.917 52.917-52.917" style="opacity:.75;"/></svg>');
+}
 .col-first, .col-first {
-    font-size:13px;
+    font-size:0.93em;
 }
 .col-second, .col-second, .col-last, .col-constructor-name, .col-summary-item-name, .col-last {
-    font-size:13px;
+    font-size:0.93em;
 }
 .col-first, .col-second, .col-constructor-name {
     vertical-align:top;
@@ -475,31 +587,21 @@ div.table-tabs > button.table-tab {
 .col-first a:link, .col-first a:visited,
 .col-second a:link, .col-second a:visited,
 .col-constructor-name a:link, .col-constructor-name a:visited,
-.col-summary-item-name a:link, .col-summary-item-name a:visited,
-.constant-values-container a:link, .constant-values-container a:visited,
-.all-classes-container a:link, .all-classes-container a:visited,
-.all-packages-container a:link, .all-packages-container a:visited {
+.col-summary-item-name a:link, .col-summary-item-name a:visited {
     font-weight:bold;
 }
-.table-sub-heading-color {
-    background-color:#EEEEFF;
-}
 .even-row-color, .even-row-color .table-header {
-    background-color:#FFFFFF;
+    background-color:var(--even-row-color);
 }
 .odd-row-color, .odd-row-color .table-header {
-    background-color:#EEEEEF;
+    background-color:var(--odd-row-color);
 }
 /*
  * Styles for contents.
  */
-.deprecated-content {
-    margin:0;
-    padding:10px 0;
-}
 div.block {
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    font-size:var(--body-font-size);
+    font-family:var(--block-font-family);
 }
 .col-last div {
     padding-top:0;
@@ -511,8 +613,8 @@ div.block {
 .package-signature,
 .type-signature,
 .member-signature {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
+    font-family:var(--code-font-family);
+    font-size:1em;
     margin:14px 0;
     white-space: pre-wrap;
 }
@@ -535,21 +637,17 @@ div.block {
  * Styles for formatting effect.
  */
 .source-line-no {
-    color:green;
+    /* Color of line numbers in source pages can be set via custom property below */
+    color:var(--source-linenumber-color, green);
     padding:0 30px 0 0;
 }
-h1.hidden {
-    visibility:hidden;
-    overflow:hidden;
-    font-size:10px;
-}
 .block {
     display:block;
     margin:0 10px 5px 0;
-    color:#474747;
+    color:var(--block-text-color);
 }
-.deprecated-label, .descfrm-type-label, .implementation-label, .member-name-label, .member-name-link,
-.module-label-in-package, .module-label-in-type, .override-specify-label, .package-label-in-type,
+.deprecated-label, .description-from-type-label, .implementation-label, .member-name-link,
+.module-label-in-package, .module-label-in-type, .package-label-in-type,
 .package-hierarchy-label, .type-name-label, .type-name-link, .search-tag-link, .preview-label {
     font-weight:bold;
 }
@@ -557,8 +655,8 @@ h1.hidden {
     font-style:italic;
 }
 .deprecation-block {
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    font-size:1em;
+    font-family:var(--block-font-family);
     border-style:solid;
     border-width:thin;
     border-radius:10px;
@@ -568,8 +666,8 @@ h1.hidden {
     display:inline-block;
 }
 .preview-block {
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    font-size:1em;
+    font-family:var(--block-font-family);
     border-style:solid;
     border-width:thin;
     border-radius:10px;
@@ -581,6 +679,19 @@ h1.hidden {
 div.block div.deprecation-comment {
     font-style:normal;
 }
+details.invalid-tag, span.invalid-tag {
+    font-size:1em;
+    font-family:var(--block-font-family);
+    color: var(--invalid-tag-text-color);
+    background: var(--invalid-tag-background-color);
+    border: thin solid var(--table-border-color);
+    border-radius:2px;
+    padding: 2px 4px;
+    display:inline-block;
+}
+details summary {
+    cursor: pointer;
+}
 /*
  * Styles specific to HTML5 elements.
  */
@@ -590,66 +701,93 @@ main, nav, header, footer, section {
 /*
  * Styles for javadoc search.
  */
+.ui-state-active {
+    /* Overrides the color of selection used in jQuery UI */
+    background: var(--selected-background-color);
+    border: 1px solid var(--selected-background-color);
+    color: var(--selected-text-color);
+}
 .ui-autocomplete-category {
     font-weight:bold;
     font-size:15px;
     padding:7px 0 7px 3px;
-    background-color:#4D7A97;
-    color:#FFFFFF;
-}
-.result-item {
-    font-size:13px;
+    background-color:var(--navbar-background-color);
+    color:var(--navbar-text-color);
 }
 .ui-autocomplete {
     max-height:85%;
     max-width:65%;
-    overflow-y:scroll;
-    overflow-x:scroll;
+    overflow-y:auto;
+    overflow-x:auto;
+    scrollbar-width: thin;
     white-space:nowrap;
     box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
 }
 ul.ui-autocomplete {
     position:fixed;
-    z-index:999999;
-    background-color: #FFFFFF;
+    z-index:1;
+    background-color: var(--body-background-color);
 }
-ul.ui-autocomplete  li {
+ul.ui-autocomplete li {
     float:left;
     clear:both;
-    width:100%;
-}
-.result-highlight {
-    font-weight:bold;
+    min-width:100%;
+}
+ul.ui-autocomplete li.ui-static-link {
+    position:sticky;
+    bottom:0;
+    left:0;
+    background: var(--subnav-background-color);
+    padding: 5px 0;
+    font-family: var(--body-font-family);
+    font-size: 0.93em;
+    font-weight: bolder;
+    z-index: 2;
+}
+li.ui-static-link a, li.ui-static-link a:visited {
+    text-decoration:none;
+    color:var(--link-color);
+    float:right;
+    margin-right:20px;
 }
 .ui-autocomplete .result-item {
     font-size: inherit;
 }
-#search-input {
+.ui-autocomplete .result-highlight {
+    font-weight:bold;
+}
+#search-input, #page-search-input {
     background-image:url('resources/glass.png');
     background-size:13px;
     background-repeat:no-repeat;
     background-position:2px 3px;
+    background-color: var(--search-input-background-color);
+    color: var(--search-input-text-color);
+    border-color: var(--border-color);
     padding-left:20px;
-    position:relative;
-    right:-18px;
-    width:400px;
+    width: 250px;
+    margin: 0;
+}
+#search-input {
+    margin-left: 4px;
 }
 #reset-button {
-    background-color: rgb(255,255,255);
+    background-color: transparent;
     background-image:url('resources/x.png');
-    background-position:center;
     background-repeat:no-repeat;
-    background-size:12px;
-    border:0 none;
-    width:16px;
-    height:16px;
-    position:relative;
-    left:-4px;
-    top:-4px;
-    font-size:0px;
+    background-size:contain;
+    border:0;
+    border-radius:0;
+    width:12px;
+    height:12px;
+    position:absolute;
+    right:12px;
+    top:10px;
+    font-size:0;
 }
-.watermark {
-    color:#545454;
+::placeholder {
+    color:var(--search-input-placeholder-color);
+    opacity: 1;
 }
 .search-tag-desc-result {
     font-style:italic;
@@ -660,13 +798,55 @@ ul.ui-autocomplete  li {
     font-size:12px;
 }
 .search-tag-result:target {
-    background-color:yellow;
+    background-color:var(--search-tag-highlight-color);
+}
+details.page-search-details {
+    display: inline-block;
+}
+div#result-container {
+    font-size: 1em;
+}
+div#result-container a.search-result-link {
+    padding: 0;
+    margin: 4px 0;
+    width: 100%;
 }
-.module-graph span {
+#result-container .result-highlight {
+    font-weight:bolder;
+}
+.page-search-info {
+    background-color: var(--subnav-background-color);
+    border-radius: 3px;
+    border: 0 solid var(--border-color);
+    padding: 0 8px;
+    overflow: hidden;
+    height: 0;
+    transition: all 0.2s ease;
+}
+div.table-tabs > button.table-tab {
+    background: var(--navbar-background-color);
+    color: var(--navbar-text-color);
+}
+.page-search-header {
+    padding: 5px 12px 7px 12px;
+    font-weight: bold;
+    margin-right: 3px;
+    background-color:var(--navbar-background-color);
+    color:var(--navbar-text-color);
+    display: inline-block;
+}
+button.page-search-header {
+    border: none;
+    cursor: pointer;
+}
+span#page-search-link {
+    text-decoration: underline;
+}
+.module-graph span, .sealed-graph span {
     display:none;
     position:absolute;
 }
-.module-graph:hover span {
+.module-graph:hover span, .sealed-graph:hover span {
     display:block;
     margin: -100px 0 0 100px;
     z-index: 1;
@@ -679,13 +859,13 @@ section.class-description {
 }
 .summary section[class$="-summary"], .details section[class$="-details"],
 .class-uses .detail, .serialized-class-details {
-    padding: 0px 20px 5px 10px;
-    border: 1px solid #ededed;
-    background-color: #f8f8f8;
+    padding: 0 20px 5px 10px;
+    border: 1px solid var(--border-color);
+    background-color: var(--section-background-color);
 }
 .inherited-list, section[class$="-details"] .detail {
     padding:0 0 5px 8px;
-    background-color:#ffffff;
+    background-color:var(--detail-background-color);
     border:none;
 }
 .vertical-separator {
@@ -703,7 +883,7 @@ ul.help-subtoc > li::before {
   content: "\2022" ;
   padding-right:2px;
 }
-span.help-note {
+.help-note {
     font-style: italic;
 }
 /*
@@ -731,7 +911,111 @@ main a[href*="://"]:focus::after {
         132-240 240 120 120 240-240 132 132V0z" fill="%23bb7a2a"/>\
       </svg>');
 }
-
+/*
+ * Styles for header/section anchor links
+ */
+a.anchor-link {
+    opacity: 0;
+    transition: opacity 0.1s;
+}
+:hover > a.anchor-link {
+    opacity: 80%;
+}
+a.anchor-link:hover,
+a.anchor-link:focus-visible,
+a.anchor-link.visible {
+    opacity: 100%;
+}
+a.anchor-link > img {
+    width: 0.9em;
+    height: 0.9em;
+}
+/*
+ * Styles for copy-to-clipboard buttons
+ */
+button.copy {
+    opacity: 70%;
+    border: none;
+    border-radius: 3px;
+    position: relative;
+    background:none;
+    transition: opacity 0.3s;
+    cursor: pointer;
+}
+:hover > button.copy {
+    opacity: 80%;
+}
+button.copy:hover,
+button.copy:active,
+button.copy:focus-visible,
+button.copy.visible {
+    opacity: 100%;
+}
+button.copy img {
+    position: relative;
+    background: none;
+    filter: brightness(var(--copy-icon-brightness));
+}
+button.copy:active {
+    background-color: var(--copy-button-background-color-active);
+}
+button.copy span {
+    color: var(--body-text-color);
+    position: relative;
+    top: -0.1em;
+    transition: all 0.1s;
+    font-size: 0.76rem;
+    line-height: 1.2em;
+    opacity: 0;
+}
+button.copy:hover span,
+button.copy:focus-visible span,
+button.copy.visible span {
+    opacity: 100%;
+}
+/* search page copy button */
+button#page-search-copy {
+    margin-left: 0.4em;
+    padding:0.3em;
+    top:0.13em;
+}
+button#page-search-copy img {
+    width: 1.2em;
+    height: 1.2em;
+    padding: 0.01em 0;
+    top: 0.15em;
+}
+button#page-search-copy span {
+    color: var(--body-text-color);
+    line-height: 1.2em;
+    padding: 0.2em;
+    top: -0.18em;
+}
+div.page-search-info:hover button#page-search-copy span {
+    opacity: 100%;
+}
+/* snippet copy button */
+button.snippet-copy {
+    position: absolute;
+    top: 6px;
+    right: 6px;
+    height: 1.7em;
+    padding: 2px;
+}
+button.snippet-copy img {
+    width: 18px;
+    height: 18px;
+    padding: 0.05em 0;
+}
+button.snippet-copy span {
+    line-height: 1.2em;
+    padding: 0.2em;
+    position: relative;
+    top: -0.5em;
+}
+div.snippet-container:hover button.snippet-copy span {
+    opacity: 100%;
+}
 /*
  * Styles for user-provided tables.
  *
@@ -778,67 +1062,146 @@ table.borderless > thead > tr, table.borderless > tbody > tr, table.borderless >
 }
 table.plain {
     border-collapse: collapse;
-    border: 1px solid black;
+    border: 1px solid var(--table-border-color);
 }
 table.plain > thead > tr, table.plain > tbody tr, table.plain > tr {
     background-color: transparent;
 }
 table.plain > thead > tr > th, table.plain > tbody > tr > th, table.plain > tr > th,
 table.plain > thead > tr > td, table.plain > tbody > tr > td, table.plain > tr > td {
-    border: 1px solid black;
+    border: 1px solid var(--table-border-color);
 }
 table.striped {
     border-collapse: collapse;
-    border: 1px solid black;
+    border: 1px solid var(--table-border-color);
 }
 table.striped > thead {
-    background-color: #E3E3E3;
+    background-color: var(--subnav-background-color);
 }
 table.striped > thead > tr > th, table.striped > thead > tr > td {
-    border: 1px solid black;
+    border: 1px solid var(--table-border-color);
 }
 table.striped > tbody > tr:nth-child(even) {
-    background-color: #EEE
+    background-color: var(--odd-row-color)
 }
 table.striped > tbody > tr:nth-child(odd) {
-    background-color: #FFF
+    background-color: var(--even-row-color)
 }
 table.striped > tbody > tr > th, table.striped > tbody > tr > td {
-    border-left: 1px solid black;
-    border-right: 1px solid black;
+    border-left: 1px solid var(--table-border-color);
+    border-right: 1px solid var(--table-border-color);
 }
 table.striped > tbody > tr > th {
     font-weight: normal;
 }
 /**
- * Tweak font sizes and paddings for small screens.
+ * Tweak style for small screens.
  */
-@media screen and (max-width: 1050px) {
-    #search-input {
-        width: 300px;
+@media screen and (max-width: 920px) {
+    header.flex-header {
+        max-height: 100vh;
+        overflow-y: auto;
     }
-}
-@media screen and (max-width: 800px) {
-    #search-input {
-        width: 200px;
+    div#navbar-top {
+        height: 2.8em;
+        transition: height 0.35s ease;
     }
-    .top-nav,
-    .bottom-nav {
-        font-size: 11px;
-        padding-top: 6px;
+    ul.nav-list {
+        display: block;
+        width: 40%;
+        float:left;
+        clear: left;
+        margin: 10px 0 0 0;
+        padding: 0;
     }
-    .sub-nav {
-        font-size: 11px;
+    ul.nav-list li {
+        float: none;
+        padding: 6px;
+        margin-left: 10px;
+        margin-top: 2px;
+    }
+    ul.sub-nav-list-small {
+        display:block;
+        height: 100%;
+        width: 50%;
+        float: right;
+        clear: right;
+        background-color: var(--subnav-background-color);
+        color: var(--body-text-color);
+        margin: 6px 0 0 0;
+        padding: 0;
     }
+    ul.sub-nav-list-small ul {
+        padding-left: 20px;
+    }
+    ul.sub-nav-list-small a:link, ul.sub-nav-list-small a:visited {
+        color:var(--link-color);
+    }
+    ul.sub-nav-list-small a:hover {
+        color:var(--link-color-active);
+    }
+    ul.sub-nav-list-small li {
+        list-style:none;
+        float:none;
+        padding: 6px;
+        margin-top: 1px;
+        text-transform:uppercase;
+    }
+    ul.sub-nav-list-small > li {
+        margin-left: 10px;
+    }
+    ul.sub-nav-list-small li p {
+        margin: 5px 0;
+    }
+    div#navbar-sub-list {
+        display: none;
+    }
+    .top-nav a:link, .top-nav a:active, .top-nav a:visited {
+        display: block;
+    }
+    button#navbar-toggle-button {
+        width: 3.4em;
+        height: 2.8em;
+        background-color: transparent;
+        display: block;
+        float: left;
+        border: 0;
+        margin: 0 10px;
+        cursor: pointer;
+        font-size: 10px;
+    }
+    button#navbar-toggle-button .nav-bar-toggle-icon {
+        display: block;
+        width: 24px;
+        height: 3px;
+        margin: 1px 0 4px 0;
+        border-radius: 2px;
+        transition: all 0.1s;
+        background-color: var(--navbar-text-color);
+    }
+    button#navbar-toggle-button.expanded span.nav-bar-toggle-icon:nth-child(1) {
+        transform: rotate(45deg);
+        transform-origin: 10% 10%;
+        width: 26px;
+    }
+    button#navbar-toggle-button.expanded span.nav-bar-toggle-icon:nth-child(2) {
+        opacity: 0;
+    }
+    button#navbar-toggle-button.expanded span.nav-bar-toggle-icon:nth-child(3) {
+        transform: rotate(-45deg);
+        transform-origin: 10% 90%;
+        width: 26px;
+    }
+}
+@media screen and (max-width: 800px) {
     .about-language {
         padding-right: 16px;
     }
-    ul.nav-list li,
-    .sub-nav .nav-list-search {
-        padding: 6px;
+    ul.nav-list li {
+        margin-left: 5px;
     }
-    ul.sub-nav-list li {
-        padding-top: 5px;
+    ul.sub-nav-list-small > li {
+        margin-left: 5px;
     }
     main {
         padding: 10px;
@@ -851,19 +1214,59 @@ table.striped > tbody > tr > th {
         -webkit-text-size-adjust: none;
     }
 }
-@media screen and (max-width: 500px) {
-    #search-input {
-        width: 150px;
-    }
-    .top-nav,
-    .bottom-nav {
-        font-size: 10px;
-    }
-    .sub-nav {
-        font-size: 10px;
-    }
+@media screen and (max-width: 400px) {
     .about-language {
         font-size: 10px;
         padding-right: 12px;
     }
 }
+@media screen and (max-width: 400px) {
+    .nav-list-search {
+        width: 94%;
+    }
+    #search-input, #page-search-input {
+        width: 70%;
+    }
+}
+@media screen and (max-width: 320px) {
+    .nav-list-search > label {
+        display: none;
+    }
+    .nav-list-search {
+        width: 90%;
+    }
+    #search-input, #page-search-input {
+        width: 80%;
+    }
+}
+
+pre.snippet {
+    background-color: var(--snippet-background-color);
+    color: var(--snippet-text-color);
+    padding: 10px;
+    margin: 12px 0;
+    overflow: auto;
+    white-space: pre;
+}
+div.snippet-container {
+    position: relative;
+}
+@media screen and (max-width: 800px) {
+    pre.snippet {
+        padding-top: 26px;
+    }
+    button.snippet-copy {
+        top: 4px;
+        right: 4px;
+    }
+}
+pre.snippet .italic {
+    font-style: italic;
+}
+pre.snippet .bold {
+    font-weight: bold;
+}
+pre.snippet .highlighted {
+    background-color: var(--snippet-highlight-color);
+    border-radius: 10%;
+}
diff --git a/javadoc/tag-search-index.js b/javadoc/tag-search-index.js
index f38b3cb..bf10aaf 100644
--- a/javadoc/tag-search-index.js
+++ b/javadoc/tag-search-index.js
@@ -1 +1 @@
-tagSearchIndex = [{"l":"Serialized Form","h":"","u":"serialized-form.html"}];updateSearchResults();
\ No newline at end of file
+tagSearchIndex = [{"l":"Constant Field Values","h":"","u":"constant-values.html"},{"l":"Serialized Form","h":"","u":"serialized-form.html"}];updateSearchResults();
\ No newline at end of file
diff --git a/javadoc/type-search-index.js b/javadoc/type-search-index.js
index 686843b..cd8f518 100644
--- a/javadoc/type-search-index.js
+++ b/javadoc/type-search-index.js
@@ -1 +1 @@
-typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"jakarta.nosql","l":"Column"},{"p":"jakarta.nosql.column","l":"ColumnTemplate"},{"p":"jakarta.nosql.document","l":"DocumentTemplate"},{"p":"jakarta.nosql","l":"Entity"},{"p":"jakarta.nosql","l":"Id"},{"p":"jakarta.nosql.keyvalue","l":"KeyValueTemplate"},{"p":"jakarta.nosql","l":"QueryMapper.MapperDeleteFrom"},{"p":"jakarta.nosql","l":"QueryMapper.MapperDeleteNameCondition"},{"p":"jakarta.nosql","l":"QueryMapper.MapperDeleteNotCondition"},{"p":"jakarta.nosql","l":"QueryMapper.MapperDeleteQueryBuild"},{"p":"jakarta.nosql","l":"QueryMapper.MapperDeleteWhere"},{"p":"jakarta.nosql","l":"QueryMapper.MapperFrom"},{"p":"jakarta.nosql","l":"QueryMapper.MapperLimit"},{"p":"jakarta.nosql","l":"QueryMapper.MapperNameCondition"},{"p":"jakarta.nosql","l":"QueryMapper.MapperNameOrder"},{"p":"jakarta.nosql","l":"QueryMapper.MapperNotCondition"},{"p":"jakarta.nosql","l":"QueryMapper.MapperOrder"},{"p":"jakarta.nosql","l":"QueryMapper.MapperQueryBuild"},{"p":"jakarta.nosql","l":"QueryMapper.MapperSkip"},{"p":"jakarta.nosql","l":"QueryMapper.MapperWhere"},{"p":"jakarta.nosql","l":"NoSQLException"},{"p":"jakarta.nosql","l":"PreparedStatement"},{"p":"jakarta.nosql","l":"QueryMapper"},{"p":"jakarta.nosql","l":"Template"}];updateSearchResults();
\ No newline at end of file
+typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"jakarta.nosql","l":"AttributeConverter"},{"p":"jakarta.nosql","l":"Column"},{"p":"jakarta.nosql","l":"Convert"},{"p":"jakarta.nosql","l":"DiscriminatorColumn"},{"p":"jakarta.nosql","l":"DiscriminatorValue"},{"p":"jakarta.nosql","l":"Embeddable"},{"p":"jakarta.nosql","l":"Embeddable.EmbeddableType"},{"p":"jakarta.nosql","l":"Entity"},{"p":"jakarta.nosql","l":"Id"},{"p":"jakarta.nosql","l":"Inheritance"},{"p":"jakarta.nosql","l":"MappedSuperclass"},{"p":"jakarta.nosql","l":"QueryMapper.MapperDeleteFrom"},{"p":"jakarta.nosql","l":"QueryMapper.MapperDeleteNameCondition"},{"p":"jakarta.nosql","l":"QueryMapper.MapperDeleteNotCondition"},{"p":"jakarta.nosql","l":"QueryMapper.MapperDeleteQueryBuild"},{"p":"jakarta.nosql","l":"QueryMapper.MapperDeleteWhere"},{"p":"jakarta.nosql","l":"QueryMapper.MapperFrom"},{"p":"jakarta.nosql","l":"QueryMapper.MapperLimit"},{"p":"jakarta.nosql","l":"QueryMapper.MapperNameCondition"},{"p":"jakarta.nosql","l":"QueryMapper.MapperNameOrder"},{"p":"jakarta.nosql","l":"QueryMapper.MapperNotCondition"},{"p":"jakarta.nosql","l":"QueryMapper.MapperOrder"},{"p":"jakarta.nosql","l":"QueryMapper.MapperQueryBuild"},{"p":"jakarta.nosql","l":"QueryMapper.MapperSkip"},{"p":"jakarta.nosql","l":"QueryMapper.MapperWhere"},{"p":"jakarta.nosql","l":"MappingException"},{"p":"jakarta.nosql","l":"NoSQLException"},{"p":"jakarta.nosql","l":"QueryMapper"},{"p":"jakarta.nosql","l":"Template"}];updateSearchResults();
\ No newline at end of file
