diff --git a/src/main/java/com/arangodb/entity/CollectionEntity.java b/src/main/java/com/arangodb/entity/CollectionEntity.java
index c9b1a0e47..846ed76fa 100644
--- a/src/main/java/com/arangodb/entity/CollectionEntity.java
+++ b/src/main/java/com/arangodb/entity/CollectionEntity.java
@@ -31,6 +31,10 @@ public class CollectionEntity implements Entity {
     private String id;
     private String name;
     private Boolean waitForSync;
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     private Boolean isVolatile;
     private Boolean isSystem;
     private CollectionStatus status;
@@ -58,6 +62,10 @@ public Boolean getWaitForSync() {
         return waitForSync;
     }
 
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     public Boolean getIsVolatile() {
         return isVolatile;
     }
diff --git a/src/main/java/com/arangodb/entity/CollectionPropertiesEntity.java b/src/main/java/com/arangodb/entity/CollectionPropertiesEntity.java
index 506e3d49e..8a1809152 100644
--- a/src/main/java/com/arangodb/entity/CollectionPropertiesEntity.java
+++ b/src/main/java/com/arangodb/entity/CollectionPropertiesEntity.java
@@ -29,8 +29,20 @@
  */
 public class CollectionPropertiesEntity extends CollectionEntity {
 
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     private Boolean doCompact;
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     private Long journalSize;
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     private Integer indexBuckets;
     private KeyOptions keyOptions;
     private Long count;
@@ -48,26 +60,51 @@ public CollectionPropertiesEntity() {
         minReplicationFactor = new MinReplicationFactor();
     }
 
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     public Boolean getDoCompact() {
         return doCompact;
     }
 
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     public void setDoCompact(final Boolean doCompact) {
         this.doCompact = doCompact;
     }
 
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     public Long getJournalSize() {
         return journalSize;
     }
 
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     public void setJournalSize(final Long journalSize) {
         this.journalSize = journalSize;
     }
 
+
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     public Integer getIndexBuckets() {
         return indexBuckets;
     }
 
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     public void setIndexBuckets(final Integer indexBuckets) {
         this.indexBuckets = indexBuckets;
     }
diff --git a/src/main/java/com/arangodb/entity/CollectionStatus.java b/src/main/java/com/arangodb/entity/CollectionStatus.java
index 43fc338bd..08816ddc1 100644
--- a/src/main/java/com/arangodb/entity/CollectionStatus.java
+++ b/src/main/java/com/arangodb/entity/CollectionStatus.java
@@ -25,7 +25,27 @@
  */
 public enum CollectionStatus {
 
-    NEW_BORN_COLLECTION(1), UNLOADED(2), LOADED(3), IN_THE_PROCESS_OF_BEING_UNLOADED(4), DELETED(5);
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
+    NEW_BORN_COLLECTION(1),
+
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
+    UNLOADED(2),
+
+    LOADED(3),
+
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
+    IN_THE_PROCESS_OF_BEING_UNLOADED(4),
+
+    DELETED(5);
 
     private final int status;
 
diff --git a/src/main/java/com/arangodb/model/CollectionCreateOptions.java b/src/main/java/com/arangodb/model/CollectionCreateOptions.java
index 63d7c5627..8ef7eff6b 100644
--- a/src/main/java/com/arangodb/model/CollectionCreateOptions.java
+++ b/src/main/java/com/arangodb/model/CollectionCreateOptions.java
@@ -40,12 +40,24 @@ public class CollectionCreateOptions {
     private Integer writeConcern;
     private KeyOptions keyOptions;
     private Boolean waitForSync;
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     private Boolean doCompact;
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     private Boolean isVolatile;
     private String[] shardKeys;
     private Integer numberOfShards;
     private Boolean isSystem;
     private CollectionType type;
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     private Integer indexBuckets;
     private String distributeShardsLike;
 
@@ -73,6 +85,10 @@ protected CollectionCreateOptions name(final String name) {
         return this;
     }
 
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     public Long getJournalSize() {
         return journalSize;
     }
@@ -80,7 +96,9 @@ public Long getJournalSize() {
     /**
      * @param journalSize The maximal size of a journal or datafile in bytes. The value must be at least 1048576 (1 MiB).
      * @return options
+     * @deprecated MMFiles only
      */
+    @Deprecated
     public CollectionCreateOptions journalSize(final Long journalSize) {
         this.journalSize = journalSize;
         return this;
@@ -199,6 +217,10 @@ public CollectionCreateOptions waitForSync(final Boolean waitForSync) {
         return this;
     }
 
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     public Boolean getDoCompact() {
         return doCompact;
     }
@@ -206,12 +228,18 @@ public Boolean getDoCompact() {
     /**
      * @param doCompact whether or not the collection will be compacted (default is true)
      * @return options
+     * @deprecated MMFiles only
      */
+    @Deprecated
     public CollectionCreateOptions doCompact(final Boolean doCompact) {
         this.doCompact = doCompact;
         return this;
     }
 
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     public Boolean getIsVolatile() {
         return isVolatile;
     }
@@ -225,7 +253,9 @@ public Boolean getIsVolatile() {
      *                   should therefore be used for cache-type collections only, and not for data that cannot be re-created
      *                   otherwise. (The default is false)
      * @return options
+     * @deprecated MMFiles only
      */
+    @Deprecated
     public CollectionCreateOptions isVolatile(final Boolean isVolatile) {
         this.isVolatile = isVolatile;
         return this;
@@ -317,6 +347,10 @@ public CollectionCreateOptions type(final CollectionType type) {
         return this;
     }
 
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     public Integer getIndexBuckets() {
         return indexBuckets;
     }
@@ -330,7 +364,9 @@ public Integer getIndexBuckets() {
      *                     this value, but other index types might follow in future ArangoDB versions. Changes (see below) are
      *                     applied when the collection is loaded the next time.
      * @return options
+     * @deprecated MMFiles only
      */
+    @Deprecated
     public CollectionCreateOptions indexBuckets(final Integer indexBuckets) {
         this.indexBuckets = indexBuckets;
         return this;
diff --git a/src/main/java/com/arangodb/model/CollectionPropertiesOptions.java b/src/main/java/com/arangodb/model/CollectionPropertiesOptions.java
index 35e218787..e7c62f71f 100644
--- a/src/main/java/com/arangodb/model/CollectionPropertiesOptions.java
+++ b/src/main/java/com/arangodb/model/CollectionPropertiesOptions.java
@@ -28,6 +28,10 @@
 public class CollectionPropertiesOptions {
 
     private Boolean waitForSync;
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     private Long journalSize;
     private CollectionSchema schema;
 
@@ -48,6 +52,10 @@ public CollectionPropertiesOptions waitForSync(final Boolean waitForSync) {
         return this;
     }
 
+    /**
+     * @deprecated MMFiles only
+     */
+    @Deprecated
     public Long getJournalSize() {
         return journalSize;
     }
@@ -57,7 +65,9 @@ public Long getJournalSize() {
      *                    that when changing the journalSize value, it will only have an effect for additional journals or
      *                    datafiles that are created. Already existing journals or datafiles will not be affected.
      * @return options
+     * @deprecated MMFiles only
      */
+    @Deprecated
     public CollectionPropertiesOptions journalSize(final Long journalSize) {
         this.journalSize = journalSize;
         return this;