diff --git a/core/src/main/java/apoc/export/graphml/ExportGraphML.java b/core/src/main/java/apoc/export/graphml/ExportGraphML.java
index 984e35a47..13b8b0f2f 100644
--- a/core/src/main/java/apoc/export/graphml/ExportGraphML.java
+++ b/core/src/main/java/apoc/export/graphml/ExportGraphML.java
@@ -141,13 +141,14 @@ public Stream<ExportProgressInfo> all(
                                     """
                     {
                             stream = false :: BOOLEAN,
-                            batchSize = 20000 :: INTEGER,
-                            bulkImport = false :: BOOLEAN,
+                            format = 'cypher-shell' :: STRING,
                             timeoutSeconds = 100 :: INTEGER,
-                            compression = 'None' :: STRING,
+                            compression = 'NONE' :: ['NONE', 'BYTES', 'GZIP', 'BZIP2', 'DEFLATE', 'BLOCK_LZ4', 'FRAMED_SNAPPY'],
                             charset = 'UTF_8' :: STRING,
-                            sampling = false :: BOOLEAN,
-                            samplingConfig :: MAP
+                            source :: MAP,
+                            target :: MAP,
+                            useTypes :: BOOLEAN,
+                            caption :: LIST<STRING>
                     }
                     """)
                     Map<String, Object> config)
@@ -170,13 +171,14 @@ public Stream<ExportProgressInfo> data(
                                     """
                     {
                             stream = false :: BOOLEAN,
-                            batchSize = 20000 :: INTEGER,
-                            bulkImport = false :: BOOLEAN,
+                            format = 'cypher-shell' :: STRING,
                             timeoutSeconds = 100 :: INTEGER,
-                            compression = 'None' :: STRING,
+                            compression = 'NONE' :: ['NONE', 'BYTES', 'GZIP', 'BZIP2', 'DEFLATE', 'BLOCK_LZ4', 'FRAMED_SNAPPY'],
                             charset = 'UTF_8' :: STRING,
-                            sampling = false :: BOOLEAN,
-                            samplingConfig :: MAP
+                            source :: MAP,
+                            target :: MAP,
+                            useTypes :: BOOLEAN,
+                            caption :: LIST<STRING>
                     }
                     """)
                     Map<String, Object> config)
@@ -198,13 +200,14 @@ public Stream<ExportProgressInfo> graph(
                                     """
                     {
                             stream = false :: BOOLEAN,
-                            batchSize = 20000 :: INTEGER,
-                            bulkImport = false :: BOOLEAN,
+                            format = 'cypher-shell' :: STRING,
                             timeoutSeconds = 100 :: INTEGER,
-                            compression = 'None' :: STRING,
+                            compression = 'NONE' :: ['NONE', 'BYTES', 'GZIP', 'BZIP2', 'DEFLATE', 'BLOCK_LZ4', 'FRAMED_SNAPPY'],
                             charset = 'UTF_8' :: STRING,
-                            sampling = false :: BOOLEAN,
-                            samplingConfig :: MAP
+                            source :: MAP,
+                            target :: MAP,
+                            useTypes :: BOOLEAN,
+                            caption :: LIST<STRING>
                     }
                     """)
                     Map<String, Object> config)
@@ -230,13 +233,15 @@ public Stream<ExportProgressInfo> query(
                                     """
                     {
                             stream = false :: BOOLEAN,
-                            batchSize = 20000 :: INTEGER,
-                            bulkImport = false :: BOOLEAN,
+                            format = 'cypher-shell' :: STRING,
                             timeoutSeconds = 100 :: INTEGER,
-                            compression = 'None' :: STRING,
+                            compression = 'NONE' :: ['NONE', 'BYTES', 'GZIP', 'BZIP2', 'DEFLATE', 'BLOCK_LZ4', 'FRAMED_SNAPPY'],
                             charset = 'UTF_8' :: STRING,
-                            sampling = false :: BOOLEAN,
-                            samplingConfig :: MAP
+                            source :: MAP,
+                            target :: MAP,
+                            useTypes :: BOOLEAN,
+                            caption :: LIST<STRING>,
+                            nodesOfRelationships = false :: BOOLEAN
                     }
                     """)
                     Map<String, Object> config)
diff --git a/core/src/test/resources/procedures/common/procedures.json b/core/src/test/resources/procedures/common/procedures.json
index 40ea0720f..3c8c8da2f 100644
--- a/core/src/test/resources/procedures/common/procedures.json
+++ b/core/src/test/resources/procedures/common/procedures.json
@@ -2853,7 +2853,7 @@
     "type" : "STRING"
   }, {
     "name" : "config",
-    "description" : "{\n        stream = false :: BOOLEAN,\n        batchSize = 20000 :: INTEGER,\n        bulkImport = false :: BOOLEAN,\n        timeoutSeconds = 100 :: INTEGER,\n        compression = 'None' :: STRING,\n        charset = 'UTF_8' :: STRING,\n        sampling = false :: BOOLEAN,\n        samplingConfig :: MAP\n}\n",
+    "description" : "{\n        stream = false :: BOOLEAN,\n        format = 'cypher-shell' :: STRING,\n        timeoutSeconds = 100 :: INTEGER,\n        compression = 'NONE' :: ['NONE', 'BYTES', 'GZIP', 'BZIP2', 'DEFLATE', 'BLOCK_LZ4', 'FRAMED_SNAPPY'],\n        charset = 'UTF_8' :: STRING,\n        source :: MAP,\n        target :: MAP,\n        useTypes :: BOOLEAN,\n        caption :: LIST<STRING>\n}\n",
     "isDeprecated" : false,
     "type" : "MAP"
   } ]
@@ -2941,7 +2941,7 @@
     "type" : "STRING"
   }, {
     "name" : "config",
-    "description" : "{\n        stream = false :: BOOLEAN,\n        batchSize = 20000 :: INTEGER,\n        bulkImport = false :: BOOLEAN,\n        timeoutSeconds = 100 :: INTEGER,\n        compression = 'None' :: STRING,\n        charset = 'UTF_8' :: STRING,\n        sampling = false :: BOOLEAN,\n        samplingConfig :: MAP\n}\n",
+    "description" : "{\n        stream = false :: BOOLEAN,\n        format = 'cypher-shell' :: STRING,\n        timeoutSeconds = 100 :: INTEGER,\n        compression = 'NONE' :: ['NONE', 'BYTES', 'GZIP', 'BZIP2', 'DEFLATE', 'BLOCK_LZ4', 'FRAMED_SNAPPY'],\n        charset = 'UTF_8' :: STRING,\n        source :: MAP,\n        target :: MAP,\n        useTypes :: BOOLEAN,\n        caption :: LIST<STRING>\n}\n",
     "isDeprecated" : false,
     "type" : "MAP"
   } ]
@@ -3024,7 +3024,7 @@
     "type" : "STRING"
   }, {
     "name" : "config",
-    "description" : "{\n        stream = false :: BOOLEAN,\n        batchSize = 20000 :: INTEGER,\n        bulkImport = false :: BOOLEAN,\n        timeoutSeconds = 100 :: INTEGER,\n        compression = 'None' :: STRING,\n        charset = 'UTF_8' :: STRING,\n        sampling = false :: BOOLEAN,\n        samplingConfig :: MAP\n}\n",
+    "description" : "{\n        stream = false :: BOOLEAN,\n        format = 'cypher-shell' :: STRING,\n        timeoutSeconds = 100 :: INTEGER,\n        compression = 'NONE' :: ['NONE', 'BYTES', 'GZIP', 'BZIP2', 'DEFLATE', 'BLOCK_LZ4', 'FRAMED_SNAPPY'],\n        charset = 'UTF_8' :: STRING,\n        source :: MAP,\n        target :: MAP,\n        useTypes :: BOOLEAN,\n        caption :: LIST<STRING>\n}\n",
     "isDeprecated" : false,
     "type" : "MAP"
   } ]
@@ -3107,7 +3107,7 @@
     "type" : "STRING"
   }, {
     "name" : "config",
-    "description" : "{\n        stream = false :: BOOLEAN,\n        batchSize = 20000 :: INTEGER,\n        bulkImport = false :: BOOLEAN,\n        timeoutSeconds = 100 :: INTEGER,\n        compression = 'None' :: STRING,\n        charset = 'UTF_8' :: STRING,\n        sampling = false :: BOOLEAN,\n        samplingConfig :: MAP\n}\n",
+    "description" : "{\n        stream = false :: BOOLEAN,\n        format = 'cypher-shell' :: STRING,\n        timeoutSeconds = 100 :: INTEGER,\n        compression = 'NONE' :: ['NONE', 'BYTES', 'GZIP', 'BZIP2', 'DEFLATE', 'BLOCK_LZ4', 'FRAMED_SNAPPY'],\n        charset = 'UTF_8' :: STRING,\n        source :: MAP,\n        target :: MAP,\n        useTypes :: BOOLEAN,\n        caption :: LIST<STRING>,\n        nodesOfRelationships = false :: BOOLEAN\n}\n",
     "isDeprecated" : false,
     "type" : "MAP"
   } ]