diff --git a/Example/my.cnf b/Example/my.cnf
index c1d7e53..d6a2e86 100644
--- a/Example/my.cnf
+++ b/Example/my.cnf
@@ -15,22 +15,23 @@
 
 # The following options will be passed to all MySQL clients
 [client]
-port		= 3306
-socket		= /tmp/mysql.sock
+port		   = 3306
+socket		= /run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 # The following values assume you have at least 32M ram
 
 # This was formally known as [safe_mysqld]. Both versions are currently parsed.
 [mysqld_safe]
-socket      = /tmp/mysql.sock
-nice     = 0
+socket		= /run/mysqld/mysqld.sock
+nice        = 0
 
 
 # The MySQL server
 [mysqld]
-port		= 3306
-socket		= /tmp/mysql.sock
+port		   = 3306
+socket		= /run/mysqld/mysqld.sock
+#datadir     = /data/mysql
 
 ## - skip_external_locking
 ## -
diff --git a/Example/my.cnf.HUGE.5.7 b/Example/my.cnf.HUGE.5.7
index 583380a..1cd7649 100644
--- a/Example/my.cnf.HUGE.5.7
+++ b/Example/my.cnf.HUGE.5.7
@@ -16,14 +16,14 @@
 # The following options will be passed to all MySQL clients
 [client]
 port		   = 3306
-socket		= /tmp/mysql.sock
+socket		= /run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 # The following values assume you have at least 32M ram
 
 # This was formally known as [safe_mysqld]. Both versions are currently parsed.
 [mysqld_safe]
-socket      = /tmp/mysql.sock
+socket      = /run/mysqld/mysqld.sock
 nice        = 0
 
 open-files-limit  = 1048576
@@ -33,7 +33,8 @@ innodb-open-files = 1048576
 # The MySQL server
 [mysqld]
 port		   = 3306
-socket		= /tmp/mysql.sock
+socket		= /run/mysqld/mysqld.sock
+#datadir     = /data/mysql
 #autocommit  = 0
 
 
diff --git a/Example/my.cnf.HUGE.8.0 b/Example/my.cnf.HUGE.8.0
index 3304e2d..ac629f4 100644
--- a/Example/my.cnf.HUGE.8.0
+++ b/Example/my.cnf.HUGE.8.0
@@ -16,14 +16,14 @@
 # The following options will be passed to all MySQL clients
 [client]
 port		   = 3306
-socket		= /tmp/mysql.sock
+socket		= /run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 # The following values assume you have at least 32M ram
 
 # This was formally known as [safe_mysqld]. Both versions are currently parsed.
 [mysqld_safe]
-socket      = /tmp/mysql.sock
+socket      = /run/mysqld/mysqld.sock
 nice        = 0
 
 open-files-limit  = 1048576
@@ -33,7 +33,8 @@ innodb-open-files = 1048576
 # The MySQL server
 [mysqld]
 port		   = 3306
-socket		= /tmp/mysql.sock
+socket		= /run/mysqld/mysqld.sock
+#datadir     = /data/mysql
 
 
 ## - character-set-server
diff --git a/Example/my.cnf.HUGE.MariaDB-10.3 b/Example/my.cnf.HUGE.MariaDB-10.3
index 3deda32..8fdae16 100644
--- a/Example/my.cnf.HUGE.MariaDB-10.3
+++ b/Example/my.cnf.HUGE.MariaDB-10.3
@@ -16,14 +16,14 @@
 # The following options will be passed to all MySQL clients
 [client]
 port		   = 3306
-socket		= /tmp/mysql.sock
+socket		= /run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 # The following values assume you have at least 32M ram
 
 # This was formally known as [safe_mysqld]. Both versions are currently parsed.
 [mysqld_safe]
-socket      = /tmp/mysql.sock
+socket      = /run/mysqld/mysqld.sock
 nice        = 0
 
 open-files-limit  = 1048576
@@ -33,7 +33,8 @@ innodb-open-files = 1048576
 # The MySQL server
 [mysqld]
 port		   = 3306
-socket		= /tmp/mysql.sock
+socket		= /run/mysqld/mysqld.sock
+#datadir     = /data/mysql
 
 
 ## - character-set-server
diff --git a/Example/my.cnf.HUGE.MariaDB-10.5 b/Example/my.cnf.HUGE.MariaDB-10.5
index 8938650..fb9260f 100644
--- a/Example/my.cnf.HUGE.MariaDB-10.5
+++ b/Example/my.cnf.HUGE.MariaDB-10.5
@@ -16,14 +16,14 @@
 # The following options will be passed to all MySQL clients
 [client]
 port		   = 3306
-socket		= /tmp/mysql.sock
+socket      = /run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 # The following values assume you have at least 32M ram
 
 # This was formally known as [safe_mysqld]. Both versions are currently parsed.
 [mysqld_safe]
-socket      = /tmp/mysql.sock
+socket      = /run/mysqld/mysqld.sock
 nice        = 0
 
 open-files-limit  = 1048576
@@ -33,7 +33,8 @@ innodb-open-files = 1048576
 # The MySQL server
 [mysqld]
 port		   = 3306
-socket		= /tmp/mysql.sock
+socket      = /run/mysqld/mysqld.sock
+#datadir     = /data/mysql
 
 
 ## - character-set-server
diff --git a/Example/my.cnf.VERY-HUGE.MariaDB-10.3 b/Example/my.cnf.VERY-HUGE.MariaDB-10.3
index f6a2d69..2bebf82 100644
--- a/Example/my.cnf.VERY-HUGE.MariaDB-10.3
+++ b/Example/my.cnf.VERY-HUGE.MariaDB-10.3
@@ -16,14 +16,14 @@
 # The following options will be passed to all MySQL clients
 [client]
 port		   = 3306
-socket		= /tmp/mysql.sock
+socket		= /run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 # The following values assume you have at least 32M ram
 
 # This was formally known as [safe_mysqld]. Both versions are currently parsed.
 [mysqld_safe]
-socket      = /tmp/mysql.sock
+socket		= /run/mysqld/mysqld.sock
 nice        = 0
 
 open-files-limit  = 1048576
@@ -33,7 +33,8 @@ innodb-open-files = 1048576
 # The MySQL server
 [mysqld]
 port		   = 3306
-socket		= /tmp/mysql.sock
+socket		= /run/mysqld/mysqld.sock
+#datadir     = /data/mysql
 
 
 ## - character-set-server
diff --git a/Example/my.cnf.VERY-HUGE.MariaDB-10.5 b/Example/my.cnf.VERY-HUGE.MariaDB-10.5
index b301e0d..8677efd 100644
--- a/Example/my.cnf.VERY-HUGE.MariaDB-10.5
+++ b/Example/my.cnf.VERY-HUGE.MariaDB-10.5
@@ -16,14 +16,14 @@
 # The following options will be passed to all MySQL clients
 [client]
 port		   = 3306
-socket		= /tmp/mysql.sock
+socket		= /run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 # The following values assume you have at least 32M ram
 
 # This was formally known as [safe_mysqld]. Both versions are currently parsed.
 [mysqld_safe]
-socket      = /tmp/mysql.sock
+socket		= /run/mysqld/mysqld.sock
 nice        = 0
 
 open-files-limit  = 1048576
@@ -33,7 +33,23 @@ innodb-open-files = 1048576
 # The MySQL server
 [mysqld]
 port		   = 3306
-socket		= /tmp/mysql.sock
+socket		= /run/mysqld/mysqld.sock
+#datadir     = /data/mysql
+
+## - performance_schema
+## -
+## - The Performance Schema is a very useful and highly under-utilised tool for
+## - monitoring MySQL databases. You can measure all kinds of metrics with it,
+## - like bad queries, the read/write ratio, and index usage to name a few.
+## -
+## - But in the free, open source fork, MariaDB, it's turned off by default, and
+## - you have to manually switch it on.
+## -
+## - It's turned off by default in MariaDB because there is a slight performance hit
+## - with using Performance Schema. I think this is only noticeable on high-traffic
+## -servers with >100s of queries per second.
+## -
+performance-schema = ON
 
 
 ## - character-set-server
@@ -51,11 +67,13 @@ socket		= /tmp/mysql.sock
 ## -       -DDEFAULT_COLLATION=latin1_german1_ci
 ## -
 #character-set-server = utf8
+character-set-server = utf8mb4
 
 ## - collation-server
 ## -
 ## - The server's default collation. See Section 10.14, “Character Set Configuration”. 
 #collation-server = utf8_general_ci
+collation-server = utf8mb4_general_ci
 
 
 ## - sql_mode
@@ -157,6 +175,30 @@ secure-file-priv = ""
 #local-infile = 1
 
 
+## - skip_name_resolve
+## -
+## - Whether to resolve host names when checking client connections. If this variable is OFF,
+## - mysqld resolves host names when checking client connections. If it is ON, mysqld uses
+## -  only IP numbers; in this case, all Host column values in the grant tables must be IP
+## - addresses. See Section 5.1.11.2, “DNS Lookups and the Host Cache”.
+## -
+## - Depending on the network configuration of your system and the Host values for your
+## - accounts, clients may need to connect using an explicit --host option,
+## - such as --host=127.0.0.1 or --host=::1.
+## -
+## - An attempt to connect to the host 127.0.0.1 normally resolves to the localhost account.
+## - However, this fails if the server is run with skip_name_resolve enabled. If you plan to
+## - do that, make sure an account exists that can accept a connection. For example, to be
+## - able to connect as root using --host=127.0.0.1 or --host=::1, create these accounts:
+## -
+## -    CREATE USER 'root'@'127.0.0.1' IDENTIFIED BY 'root-password';
+## -    CREATE USER 'root'@'::1' IDENTIFIED BY 'root-password';
+## -
+## - Default: OFF
+## -
+#skip-name-resolve = Off
+
+
 ## - skip_external_locking
 ## -
 ## - Affects only MyISAM table access.
@@ -166,7 +208,7 @@ secure-file-priv = ""
 ## -
 ## - Default: ON
 ## - 
-skip-external-locking
+skip-external-locking = On
 
 
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
@@ -345,7 +387,7 @@ innodb-open-files = 1048576
 ## - InnoDB stores the data and indexes for each newly created table in a 
 ## - separate .ibd file, rather than in the system tablespace.
 ## -
-innodb-file-per-table = 1
+innodb-file-per-table = On
 
 ## - innodb_data_home_dir
 ## - 
@@ -439,7 +481,8 @@ innodb_log_file_size = 750M
 ## -
 #innodb-log-buffer-size = 8M
 #innodb-log-buffer-size = 32M
-innodb_log_buffer_size = 256M
+#innodb_log_buffer_size = 256M
+innodb_log_buffer_size = 512M
 
 ## - innodb_flush_log_at_trx_commit
 ## -
@@ -468,6 +511,7 @@ innodb_log_buffer_size = 256M
 ## -
 #innodb-flush-log-at-trx-commit = 1
 #innodb-flush-log-at-trx-commit = 2
+#innodb-flush-log-at-trx-commit = 0
 
 ## - innodb_lock_wait_timeout
 ## -
@@ -491,6 +535,8 @@ innodb_log_buffer_size = 256M
 ## - Default:  2097152 (2M)
 ## -
 #sort-buffer-size = 2M
+#sort-buffer-size = 24MM
+#sort-buffer-size = 32M
 sort-buffer-size = 64M
 
 
@@ -517,6 +563,8 @@ key-buffer-size  = 512M
 ## - Default: 131072 (128K)
 ## -
 #read-buffer-size = 2M
+#read-buffer-size = 16M
+#read-buffer-size = 24M
 read-buffer-size = 32M
 
 ## - read_rnd_buffer_size
@@ -537,9 +585,12 @@ read-rnd-buffer-size = 32M
 ## - ALTER TABLE. 
 ## -
 ## - Default: 8388608 (8M)
+## - Default MariaDB: 134217728 (128M)
 ## -
 #myisam-sort-buffer-size = 64M
 myisam-sort-buffer-size = 256M
+#myisam-sort-buffer-size = 384M
+#myisam-sort-buffer-size = 512M
 
 
 ## - max_allowed_packet
@@ -551,7 +602,7 @@ myisam-sort-buffer-size = 256M
 ## -
 #max-allowed-packet = 4M
 #max-allowed-packet = 32M
-max-allowed-packet = 64M
+max-allowed-packet = 512M
 
 
 ## - table_open_cache
@@ -565,6 +616,8 @@ max-allowed-packet = 64M
 ## - closed and reopened), then you should increase the value of the 
 ## - table_open_cache variable.
 ## -
+## - Default MAriaDB: 2000
+## -
 #table-open-cache = 512
 table_open_cache = 8192
 
@@ -574,9 +627,13 @@ table_open_cache = 8192
 ## - in the definition cache.
 ## -
 ## - Default: (400 + (table_open_cache / 2) since 5.6.8, 400 before
+## - Defaiult MariaDB: 400
 ## -
 #table-definition-cache = 1680
-#table_definition_cache = 5120
+#table-definition-cache = 1936
+#table-definition-cache = 3472
+#table-definition-cache = 449
+table_definition_cache = 5120
 
 ## - max_connect_errors
 ## -
@@ -584,19 +641,6 @@ table_open_cache = 8192
 ## -
 max-connect-errors = 999999
 
-## - thread_concurrency
-## -
-## - NOTE:
-## - This variable is specific to Solaris 8 and earlier systems.
-## -
-## - This variable is deprecated as of MySQL 5.6.1 and is removed in MySQL 5.7. 
-## - You should remove this from MySQL configuration files whenever you see it 
-## - unless they are for Solaris 8 or earlier
-## - 
-## - (Try number of CPU's*2 for thread_concurrency)
-## -
-#thread-concurrency = 16
-
 ## - thread_cache_size
 ## -
 ## - How many threads the server should cache for reuse. When a client 
@@ -604,9 +648,10 @@ max-connect-errors = 999999
 ## - fewer than thread_cache_size threads there.
 ## -
 ## - Default: 8 + (max_connections / 100) (5.6.8) , 0 (before)
+## - Default MariaDB: 151
 ##  -
 #thread-cache-size = 8
-thread_cache_size = 32
+thread_cache_size = 300
 
 ## - thread_stack
 ## -
@@ -618,9 +663,11 @@ thread_cache_size = 32
 ## - limits the complexity of the SQL statements that the server can handle, 
 ## - the recursion depth of stored procedures, and other memory-consuming 
 ## - actions. 
-## - Default: 262144 (256K)
 ## -
-thread-stack = 262144
+## - Default: 262144 (256K)
+## - Default MariaDB: 299008 (292K)
+## -
+#thread-stack = 584K
 
 
 ## - Unbenutze Datenbank Engines deaktivieren
@@ -633,24 +680,13 @@ thread-stack = 262144
 ## - Sincs version 5.5, you have to set default-storage-engine
 ## - to MyISAM, if using skip-innodb
 ## -
-#default-storage-engine=MyISAM
 #skip-innodb
 
-
-## - log-error
+## - default_storage_engine
 ## -
-## - Log errors and startup messages to this file. If you omit the file 
-## - name, MySQL uses host_name.err. If the file name has no extension, 
-## - the server adds an extension of .err. 
+## - Default: InnoDB
 ## -
-log-error = /var/log/mysql/mysql.err
-
-
-## - Query Log
-## -
-#general-log = on
-#general-log_file = /var/log/mysql/mysql.log
-
+#default-storage-engine = InnoDB
 
 ## - ft_min_word_len
 ## -
@@ -683,6 +719,84 @@ log-error = /var/log/mysql/mysql.err
 #ft-stopword-file = /usr/local/mysql/stopwords_utf8_iso8859-15.txt
 
 
+## --------------
+## - log files
+
+## - Query Log
+## -
+## - general_log_file
+## - general_log
+## -
+## - general_log enables/disables general_log_file..
+## -
+## - Both location gets rotated by the cronjob.
+## - Be aware that this log type is a performance killer.
+## - Recommend only changing this at runtime for short testing periods if needed!
+## -
+general_log_file       = /var/log/mysql/mysql.log
+general_log            = OFF
+
+
+## - log-error
+## -
+## - Log errors and startup messages to this file. If you omit the file 
+## - name, MySQL uses host_name.err. If the file name has no extension, 
+## - the server adds an extension of .err. 
+## -
+log-error = /var/log/mysql/mysql.err
+
+
+## --------------
+## - slow queries
+
+## - slow_query_log
+## -
+## - Gibt an, ob das Logging für langsame Abfragen eingeschaltet (1 oder ON)
+## - bzw ausgeschaltet (0 oder OFF) ist.
+## -
+## - Vorgabewert ist 0 oder OFF
+## -
+slow-query-log = On
+
+
+## - long_query_time
+## -
+## - Wenn eine Abfrage länger dauert als durch diese Variable (in Sekunden) angegeben,
+## - erhöht der Server die Statusvariable Slow_queries entsprechend. Wird die Option 
+## - --log-slow-queries verwendet, wird die Abfrage in der Logdatei für langsame Abfragen 
+## - protokolliert. Dieser Wert wird als Echtzeit (nicht als Prozessorzeit) gemessen, d. h. 
+## - eine Abfrage, die bei einem System mit geringer Belastung den Schwellwert 
+## - unterschreitet, kann bei einem stark belasteten System bereits darüber liegen. 
+## - Der Mindestwert ist 1.
+## -
+## - Vorgabewert ist 10
+## -
+#long-query-time = 1
+long-query-time = 5
+
+
+## - slow_query_log_file
+## -
+## - Name der Logdatei, in die langsame Abfragen gespeichert werden.
+## - 
+## - Vorgabewert ist <host-name>-slow.log
+## -
+slow-query-log-file = /var/log/mysql/mysql-slow.log
+
+
+## - log-queries-not-using-indexes
+## -
+## - Gibt an, ob Abfragen, die keine Indizes benutzen in der Logdatei
+## - für langsame Abfragen mitgespeichert werden sollen.
+## -
+## - Vorgabewert ist 0
+## -
+#log-queries-not-using-indexes = 1
+log-queries-not-using-indexes = 0
+
+## - slow queries
+## --------------
+
 
 ## -------------
 ## - query cache
@@ -700,9 +814,13 @@ log-error = /var/log/mysql/mysql.err
 ## -
 ## - Removed since MySQL Version 8.0.3
 ## -
+## - But present at MariaDB
+## -
+## - Default MariaDB: OFF
+## -
 ## - For MariaDB see section '[mariadb]' or '[mariadb-10.x]'
 ## -
-#query_cache_type = 1
+query_cache_type = 0
 
 
 ## - query_cache_limit
@@ -710,8 +828,8 @@ log-error = /var/log/mysql/mysql.err
 ## - Gibt die maximale Größe einzelner Abfrageergebnisse an, die im
 ## - Cache gespeichert werden können.
 ## - 
-## - Vorgeabewert ist 1Mbyte
 ## -
+## - Vorgeabewert ist 1Mbyte
 ## -
 ## - Removed since MySQL Version 8.0.3
 ## -
@@ -736,11 +854,13 @@ log-error = /var/log/mysql/mysql.err
 ## -
 ## - Siehe auch http://dev.mysql.com/doc/refman/5.1/de/query-cache-configuration.html
 ## -
+## -
 ## - Vorgabewert ist 4Kbyte
 ## -
-## -
 ## - Removed since MySQL Version 8.0.3
 ## -
+## - But present at MariaDB
+## -
 ## - For MariaDB see section '[mariadb]' or '[mariadb-10.x]'
 ## -
 #query-cache-min-res-unit = 8K
@@ -769,57 +889,6 @@ log-error = /var/log/mysql/mysql.err
 ## - query cache
 ## -------------
 
-
-## --------------
-## - slow queries
-
-## - slow_query_log
-## -
-## - Gibt an, ob das Logging für langsame Abfragen eingeschaltet (1 oder ON)
-## - bzw ausgeschaltet (0 oder OFF) ist.
-## -
-## - Vorgabewert ist 0 oder OFF
-## -
-slow-query-log = 1
-
-
-## - long_query_time
-## -
-## - Wenn eine Abfrage länger dauert als durch diese Variable (in Sekunden) angegeben,
-## - erhöht der Server die Statusvariable Slow_queries entsprechend. Wird die Option 
-## - --log-slow-queries verwendet, wird die Abfrage in der Logdatei für langsame Abfragen 
-## - protokolliert. Dieser Wert wird als Echtzeit (nicht als Prozessorzeit) gemessen, d. h. 
-## - eine Abfrage, die bei einem System mit geringer Belastung den Schwellwert 
-## - unterschreitet, kann bei einem stark belasteten System bereits darüber liegen. 
-## - Der Mindestwert ist 1.
-## -
-## - Vorgabewert ist 10
-## -
-long-query-time = 1
-
-
-## - slow_query_log_file
-## -
-## - Name der Logdatei, in die langsame Abfragen gespeichert werden.
-## - 
-## - Vorgabewert ist <host-name>-slow.log
-## -
-slow-query-log-file = /var/log/mysql/slow_query.log
-
-
-## - log-queries-not-using-indexes
-## -
-## - Gibt an, ob Abfragen, die keine Indizes benutzen in der Logdatei
-## - für langsame Abfragen mitgespeichert werden sollen.
-## -
-## - Vorgabewert ist 0
-## -
-#log-queries-not-using-indexes = 1
-log-queries-not-using-indexes = 0
-
-## - slow queries
-## --------------
-
 ## - join_buffer_size
 ## -
 ## - Die Größe des Puffers, der für Joins benutzt wird, die keine Indizes verwenden 
@@ -837,9 +906,9 @@ log-queries-not-using-indexes = 0
 ## - Vorgabewert ist 128K
 ## -
 #join-buffer-size = 384K
-#join_buffer_size = 768K
+join_buffer_size = 768K
 #join_buffer_size = 1024K
-join_buffer_size = 1536K
+#join_buffer_size = 1536K
 
 
 
@@ -923,7 +992,7 @@ tmp_table_size = 2048M
 ## -
 ## - But present at MariaDB
 ## -
-query_cache_type = 1
+query_cache_type = 0
 
 
 ## - query_cache_limit
@@ -977,9 +1046,12 @@ query-cache-min-res-unit = 8K
 ## -
 ## - Removed since MySQL Version 8.0.3
 ## -
+## - Default MariaDB: 1048576 (1M)
+## -
+query-cache-size = 0
 #query_cache_size = 32M
 #query-cache-size = 128M
-query_cache_size = 1024M
+#query_cache_size = 1024M
 
 ## - query cache
 ## -------------
@@ -994,7 +1066,7 @@ query_cache_size = 1024M
 
 [mysqldump]
 quick
-max-allowed-packet = 32M
+max-allowed-packet = 512
 
 [mysql]
 no-auto-rehash