diff --git a/src/main/java/com/arangodb/entity/CollectionPropertiesEntity.java b/src/main/java/com/arangodb/entity/CollectionPropertiesEntity.java
index 6476db78b..52268ec36 100644
--- a/src/main/java/com/arangodb/entity/CollectionPropertiesEntity.java
+++ b/src/main/java/com/arangodb/entity/CollectionPropertiesEntity.java
@@ -85,8 +85,7 @@ public void setCount(final Long count) {
 	}
 
 	/**
-	 * @return contains the names of document attributes that are used to determine the target shard for documents. Only
-	 *         in a cluster setup
+	 * @return the number of shards of the collection. Only in a cluster setup (else returning null).
 	 */
 	public Integer getNumberOfShards() {
 		return numberOfShards;
@@ -97,7 +96,8 @@ public void setNumberOfShards(final Integer numberOfShards) {
 	}
 
 	/**
-	 * @return the number of shards of the collection. Only in a cluster setup.
+	 * @return the names of document attributes that are used to determine the target shard for documents.
+	 *         Only in a cluster setup (else returning null).
 	 */
 	public Collection<String> getShardKeys() {
 		return shardKeys;
@@ -116,7 +116,7 @@ public void setReplicationFactor(final Integer replicationFactor) {
 	}
 
 	/**
-	 * @return whether the collection is a satellite collection. Only in a enterprise cluster setup.
+	 * @return whether the collection is a satellite collection. Only in an enterprise cluster setup (else returning null).
 	 */
 	public Boolean getSatellite() {
 		return this.replicationFactor.getSatellite();