diff --git a/src/tap/config/tap_configuration_file.html b/src/tap/config/tap_configuration_file.html
index 1f5c46199b0368a591ad4f5d3a4abd7f3eaa3faa..e5a7486a982f56c218373122c3c220a5244652e6 100644
--- a/src/tap/config/tap_configuration_file.html
+++ b/src/tap/config/tap_configuration_file.html
@@ -169,11 +169,17 @@
 				<td></td>
 				<td>text</td>
 				<td>
-					<p>The translator to use in order to translate ADQL to a SQL compatible with the used DBMS and its spatial extension.</p>
-					<p>The TAP library supports only Postgresql (no spatial extension), PostgreSQL+PgSphere, SQLServer (no spatial extension) and MySQL (no spatial extension) for the moment. But you can provide your own SQL translator
-					(even if it does not have spatial features), by providing the name of a class (within brackets: {...}) that implements ADQLTranslator and which have at least an empty constructor.</p>
+					<p>The translator to use in order to translate ADQL to a SQL compatible with the
+					used DBMS and its spatial extension.</p>
+					<p>The TAP library supports only Postgresql (no spatial extension),
+					PostgreSQL+PgSphere, SQLServer (no spatial extension), MySQL (no spatial
+					extension) and H2 (no spatial extension) for the moment. But you can provide
+					your own SQL translator (even if it does not have spatial features), by
+					providing the name of a class (within brackets: {...}) that implements
+					ADQLTranslator (for instance: {apackage.MyADQLTranslator}) and which have at
+					least an empty constructor.</p>
 				</td>
-				<td><ul><li>postgres</li><li>pgsphere</li><li>sqlserver</li><li>mysql</li><li>{apackage.MyADQLTranslator}</li></ul></td>
+				<td><ul><li>postgres</li><li>pgsphere</li><li>sqlserver</li><li>mysql</li><li>h2</li><li>{apackage.MyADQLTranslator}</li></ul></td>
 			</tr>
 			<tr class="optional">
 				<td class="done">sync_fetch_size</td>
@@ -321,6 +327,13 @@
 						The property value MUST be NOT qualified. Just the item name is required.
 						The value will be used as provided (with the same case).
 					</p>
+					<p><em>
+						<strong>Note:</strong>
+						The column dbName in the database TAP_SCHEMA declaring the standard
+						TAP_SCHEMA entries (e.g. TAP_SCHEMA.schemas.dbName) is now ignored. Thus,
+						only the mapping defined here, in the configuration file, is taken into
+						account.
+					</em></p>
 				</td>
 				<td>
 					<ul>
diff --git a/src/tap/config/tap_full.properties b/src/tap/config/tap_full.properties
index f7e5f931b7bc4197ae7a102bf91c827dc0d1c1f4..2c358f42e5d0be1f737259fb155b4dd919f4abd9 100644
--- a/src/tap/config/tap_full.properties
+++ b/src/tap/config/tap_full.properties
@@ -2,7 +2,7 @@
 #                        FULL TAP CONFIGURATION FILE                           #
 #                                                                              #
 # TAP Version: 2.3                                                             #
-# Date: 5 Sept. 2018                                                           #
+# Date: 26 Oct. 2018                                                           #
 # Author: Gregory Mantelet (CDS;ARI)                                           #
 #                                                                              #
 ################################################################################ 
@@ -79,13 +79,14 @@ database_access =
 # used DBMS and its spatial extension.
 # 
 # The TAP library supports only Postgresql (no spatial extension),
-# PostgreSQL+PgSphere, SQLServer (no spatial extension) and MySQL (no spatial
-# extension) for the moment. But you can provide your own SQL translator (even
-# if it does not have spatial features), by providing the name of a class
-# (within brackets: {...}) that implements ADQLTranslator (for instance:
-# {apackage.MyADQLTranslator}) and which have at least an empty constructor.
-# 
-# Allowed values: postgres, pgsphere, sqlserver, mysql, a class name
+# PostgreSQL+PgSphere, SQLServer (no spatial extension), MySQL (no spatial
+# extension) and H2 (no spatial extension) for the moment. But you can provide
+# your own SQL translator (even if it does not have spatial features), by
+# providing the name of a class (within brackets: {...}) that implements
+# ADQLTranslator (for instance: {apackage.MyADQLTranslator}) and which have at
+# least an empty constructor.
+# 
+# Allowed values: postgres, pgsphere, sqlserver, mysql, h2, a class name
 sql_translator = postgres
 
 # [OPTIONAL]
@@ -231,6 +232,12 @@ metadata_file =
 # The property value MUST be NOT qualified. Just the item name is required.
 # The value will be used as provided (with the same case).
 #
+# Note:
+#     The column dbName in the database TAP_SCHEMA declaring the standard
+#     TAP_SCHEMA entries (e.g. TAP_SCHEMA.schemas.dbName) is now ignored. Thus,
+#     only the mapping defined here, in the configuration file, is taken into
+#     account.
+# 
 # TAP_SCHEMA = 
 
 #########
diff --git a/src/tap/db/JDBCConnection.java b/src/tap/db/JDBCConnection.java
index 8dc63ecfe1ce71a3ec1cc6420a483eabafa8dd95..ff7ce7c8320ed8dc4f378950cb0ffb370745bb22 100644
--- a/src/tap/db/JDBCConnection.java
+++ b/src/tap/db/JDBCConnection.java
@@ -181,7 +181,7 @@ import uws.service.log.UWSLog.LogLevel;
  * </i></p>
  *
  * @author Gr&eacute;gory Mantelet (CDS;ARI)
- * @version 2.1 (02/2018)
+ * @version 2.3 (10/2018)
  * @since 2.0
  */
 public class JDBCConnection implements DBConnection {