diff --git a/src/main/java/net/spy/memcached/v2/AsyncArcusCommands.java b/src/main/java/net/spy/memcached/v2/AsyncArcusCommands.java
index f6868c6ac..1f1f4d658 100644
--- a/src/main/java/net/spy/memcached/v2/AsyncArcusCommands.java
+++ b/src/main/java/net/spy/memcached/v2/AsyncArcusCommands.java
@@ -129,14 +129,17 @@ public AsyncArcusCommands(Supplier<ArcusClient> arcusClientSupplier) {
     this.arcusClientSupplier = arcusClientSupplier;
   }
 
+  @Override
   public ArcusFuture<Boolean> set(String key, int exp, T value) {
     return store(StoreType.set, key, exp, value);
   }
 
+  @Override
   public ArcusFuture<Boolean> add(String key, int exp, T value) {
     return store(StoreType.add, key, exp, value);
   }
 
+  @Override
   public ArcusFuture<Boolean> replace(String key, int exp, T value) {
     return store(StoreType.replace, key, exp, value);
   }
@@ -181,14 +184,17 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Map<String, Boolean>> multiSet(Map<String, T> items, int exp) {
     return multiStore(StoreType.set, items, exp);
   }
 
+  @Override
   public ArcusFuture<Map<String, Boolean>> multiAdd(Map<String, T> items, int exp) {
     return multiStore(StoreType.add, items, exp);
   }
 
+  @Override
   public ArcusFuture<Map<String, Boolean>> multiReplace(Map<String, T> items, int exp) {
     return multiStore(StoreType.replace, items, exp);
   }
@@ -216,10 +222,12 @@ private ArcusFuture<Map<String, Boolean>> multiStore(StoreType type,
     });
   }
 
+  @Override
   public ArcusFuture<Boolean> prepend(String key, T value) {
     return concat(ConcatenationType.prepend, key, value);
   }
 
+  @Override
   public ArcusFuture<Boolean> append(String key, T value) {
     return concat(ConcatenationType.append, key, value);
   }
@@ -263,6 +271,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Boolean> cas(String key, int exp, T value, long casId) {
     AbstractArcusResult<Boolean> result = new AbstractArcusResult<>(new AtomicReference<>());
     ArcusFutureImpl<Boolean> future = new ArcusFutureImpl<>(result);
@@ -304,10 +313,12 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Long> incr(String key, int delta) {
     return mutate(Mutator.incr, key, delta, -1L, 0);
   }
 
+  @Override
   public ArcusFuture<Long> incr(String key, int delta, long initial, int exp) {
     if (initial < 0) {
       throw new IllegalArgumentException("Initial value must be 0 or greater.");
@@ -315,10 +326,12 @@ public ArcusFuture<Long> incr(String key, int delta, long initial, int exp) {
     return mutate(Mutator.incr, key, delta, initial, exp);
   }
 
+  @Override
   public ArcusFuture<Long> decr(String key, int delta) {
     return mutate(Mutator.decr, key, delta, -1L, 0);
   }
 
+  @Override
   public ArcusFuture<Long> decr(String key, int delta, long initial, int exp) {
     if (initial < 0) {
       throw new IllegalArgumentException("Initial value must be 0 or greater.");
@@ -368,6 +381,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<T> get(String key) {
     AbstractArcusResult<CachedData> result = new AbstractArcusResult<>(new AtomicReference<>());
     ArcusFutureImpl<T> future = new ArcusFutureImpl<>(result,
@@ -409,6 +423,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<CASValue<T>> gets(String key) {
     AbstractArcusResult<GetsResultImpl<T>> result
         = new AbstractArcusResult<>(new AtomicReference<>());
@@ -452,6 +467,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Map<String, T>> multiGet(List<String> keys) {
     keyValidator.validateKey(keys);
     keyValidator.checkDupKey(keys);
@@ -542,6 +558,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Map<String, CASValue<T>>> multiGets(List<String> keys) {
     keyValidator.validateKey(keys);
     keyValidator.checkDupKey(keys);
@@ -629,6 +646,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Boolean> delete(String key) {
     AbstractArcusResult<Boolean> result = new AbstractArcusResult<>(new AtomicReference<>());
     ArcusFutureImpl<Boolean> future = new ArcusFutureImpl<>(result);
@@ -667,6 +685,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Map<String, Boolean>> multiDelete(List<String> keys) {
     keyValidator.checkDupKey(keys);
 
@@ -690,6 +709,7 @@ public ArcusFuture<Map<String, Boolean>> multiDelete(List<String> keys) {
     });
   }
 
+  @Override
   public ArcusFuture<Boolean> lopCreate(String key, ElementValueType type,
                                         CollectionAttributes attributes) {
     if (attributes == null) {
@@ -702,16 +722,19 @@ public ArcusFuture<Boolean> lopCreate(String key, ElementValueType type,
     return collectionCreate(key, create);
   }
 
+  @Override
   public ArcusFuture<Boolean> lopInsert(String key, int index, T value) {
     return lopInsert(key, index, value, null);
   }
 
+  @Override
   public ArcusFuture<Boolean> lopInsert(String key, int index, T value,
                                         CollectionAttributes attributes) {
     ListInsert<T> insert = new ListInsert<>(value, null, attributes);
     return collectionInsert(key, String.valueOf(index), insert);
   }
 
+  @Override
   public ArcusFuture<T> lopGet(String key, int index, GetArgs args) {
     AbstractArcusResult<T> result = new AbstractArcusResult<>(new AtomicReference<>());
     ArcusFutureImpl<T> future = new ArcusFutureImpl<>(result);
@@ -757,6 +780,7 @@ public void gotData(String subKey, int flags, byte[] data, byte[] eFlag) {
     return future;
   }
 
+  @Override
   public ArcusFuture<List<T>> lopGet(String key, int from, int to, GetArgs args) {
     AbstractArcusResult<List<T>> result =
         new AbstractArcusResult<>(new AtomicReference<>(new ArrayList<>()));
@@ -803,16 +827,19 @@ public void gotData(String subKey, int flags, byte[] data, byte[] eFlag) {
     return future;
   }
 
+  @Override
   public ArcusFuture<Boolean> lopDelete(String key, int index, boolean dropIfEmpty) {
     ListDelete delete = new ListDelete(index, dropIfEmpty, false);
     return collectionDelete(key, delete);
   }
 
+  @Override
   public ArcusFuture<Boolean> lopDelete(String key, int from, int to, boolean dropIfEmpty) {
     ListDelete delete = new ListDelete(from, to, dropIfEmpty, false);
     return collectionDelete(key, delete);
   }
 
+  @Override
   public ArcusFuture<Boolean> sopCreate(String key, ElementValueType type,
                                         CollectionAttributes attributes) {
     if (attributes == null) {
@@ -825,15 +852,18 @@ public ArcusFuture<Boolean> sopCreate(String key, ElementValueType type,
     return collectionCreate(key, create);
   }
 
+  @Override
   public ArcusFuture<Boolean> sopInsert(String key, T value) {
     return sopInsert(key, value, null);
   }
 
+  @Override
   public ArcusFuture<Boolean> sopInsert(String key, T value, CollectionAttributes attributes) {
     SetInsert<T> insert = new SetInsert<>(value, null, attributes);
     return collectionInsert(key, "", insert);
   }
 
+  @Override
   public ArcusFuture<Set<T>> sopGet(String key, int count, GetArgs args) {
     AbstractArcusResult<Set<T>> result
         = new AbstractArcusResult<>(new AtomicReference<>(new HashSet<>()));
@@ -880,6 +910,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Boolean> sopExist(String key, T value) {
     AbstractArcusResult<Boolean> result = new AbstractArcusResult<>(new AtomicReference<>());
     ArcusFutureImpl<Boolean> future = new ArcusFutureImpl<>(result);
@@ -922,11 +953,13 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Boolean> sopDelete(String key, T value, boolean dropIfEmpty) {
     SetDelete<T> delete = new SetDelete<>(value, dropIfEmpty, false, tcForCollection);
     return collectionDelete(key, delete);
   }
 
+  @Override
   public ArcusFuture<Boolean> mopCreate(String key, ElementValueType type,
                                         CollectionAttributes attributes) {
     if (attributes == null) {
@@ -939,10 +972,12 @@ public ArcusFuture<Boolean> mopCreate(String key, ElementValueType type,
     return collectionCreate(key, create);
   }
 
+  @Override
   public ArcusFuture<Boolean> mopInsert(String key, String mKey, T value) {
     return mopInsert(key, mKey, value, null);
   }
 
+  @Override
   public ArcusFuture<Boolean> mopInsert(String key, String mKey, T value,
                                         CollectionAttributes attributes) {
     keyValidator.validateMKey(mKey);
@@ -951,10 +986,12 @@ public ArcusFuture<Boolean> mopInsert(String key, String mKey, T value,
     return collectionInsert(key, mKey, insert);
   }
 
+  @Override
   public ArcusFuture<Boolean> mopUpsert(String key, String mKey, T value) {
     return mopUpsert(key, mKey, value, null);
   }
 
+  @Override
   public ArcusFuture<Boolean> mopUpsert(String key, String mKey, T value,
                                         CollectionAttributes attributes) {
     keyValidator.validateMKey(mKey);
@@ -963,6 +1000,7 @@ public ArcusFuture<Boolean> mopUpsert(String key, String mKey, T value,
     return collectionInsert(key, mKey, upsert);
   }
 
+  @Override
   public ArcusFuture<Boolean> mopUpdate(String key, String mKey, T value) {
     keyValidator.validateMKey(mKey);
 
@@ -970,10 +1008,12 @@ public ArcusFuture<Boolean> mopUpdate(String key, String mKey, T value) {
     return collectionUpdate(key, mKey, update);
   }
 
+  @Override
   public ArcusFuture<Map<String, T>> mopGet(String key, GetArgs args) {
     return mopGet(key, new ArrayList<>(), args);
   }
 
+  @Override
   public ArcusFuture<T> mopGet(String key, String mKey, GetArgs args) {
     keyValidator.validateMKey(mKey);
 
@@ -1022,6 +1062,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Map<String, T>> mopGet(String key, List<String> mKeys, GetArgs args) {
     if (mKeys == null) {
       throw new IllegalArgumentException("mKeys cannot be null");
@@ -1076,14 +1117,17 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Boolean> mopDelete(String key, boolean dropIfEmpty) {
     return mopDelete(key, new ArrayList<>(), dropIfEmpty);
   }
 
+  @Override
   public ArcusFuture<Boolean> mopDelete(String key, String mKey, boolean dropIfEmpty) {
     return mopDelete(key, Collections.singletonList(mKey), dropIfEmpty);
   }
 
+  @Override
   public ArcusFuture<Boolean> mopDelete(String key, List<String> mKeys, boolean dropIfEmpty) {
     if (mKeys == null) {
       throw new IllegalArgumentException("mKeys cannot be null");
@@ -1097,6 +1141,7 @@ public ArcusFuture<Boolean> mopDelete(String key, List<String> mKeys, boolean dr
     return collectionDelete(key, delete);
   }
 
+  @Override
   public ArcusFuture<Boolean> bopCreate(String key, ElementValueType type,
                                         CollectionAttributes attributes) {
     if (attributes == null) {
@@ -1110,10 +1155,12 @@ public ArcusFuture<Boolean> bopCreate(String key, ElementValueType type,
     return collectionCreate(key, create);
   }
 
+  @Override
   public ArcusFuture<Boolean> bopInsert(String key, BTreeElement<T> element) {
     return bopInsert(key, element, null);
   }
 
+  @Override
   public ArcusFuture<Boolean> bopInsert(String key, BTreeElement<T> element,
                                         CollectionAttributes attributes) {
     BTreeInsert<T> insert = new BTreeInsert<>(element.getValue(), element.getEFlag(),
@@ -1121,11 +1168,13 @@ public ArcusFuture<Boolean> bopInsert(String key, BTreeElement<T> element,
     return collectionInsert(key, element.getBKey().toString(), insert);
   }
 
+  @Override
   public ArcusFuture<Map.Entry<Boolean, BTreeElement<T>>> bopInsertAndGetTrimmed(
       String key, BTreeElement<T> element) {
     return bopInsertOrUpsertAndGetTrimmed(key, element, false, null);
   }
 
+  @Override
   public ArcusFuture<Map.Entry<Boolean, BTreeElement<T>>> bopInsertAndGetTrimmed(
       String key, BTreeElement<T> element, CollectionAttributes attributes) {
     return bopInsertOrUpsertAndGetTrimmed(key, element, false, attributes);
@@ -1144,11 +1193,13 @@ public ArcusFuture<Boolean> bopUpsert(String key, BTreeElement<T> element,
     return collectionInsert(key, element.getBKey().toString(), upsert);
   }
 
+  @Override
   public ArcusFuture<Map.Entry<Boolean, BTreeElement<T>>> bopUpsertAndGetTrimmed(
       String key, BTreeElement<T> element) {
     return bopInsertOrUpsertAndGetTrimmed(key, element, true, null);
   }
 
+  @Override
   public ArcusFuture<Map.Entry<Boolean, BTreeElement<T>>> bopUpsertAndGetTrimmed(
       String key, BTreeElement<T> element, CollectionAttributes attributes) {
     return bopInsertOrUpsertAndGetTrimmed(key, element, true, attributes);
@@ -1167,6 +1218,7 @@ private ArcusFutureImpl<Map.Entry<Boolean, BTreeElement<T>>> bopInsertOrUpsertAn
     BTreeInsertAndGetOperation.Callback cb = new BTreeInsertAndGetOperation.Callback() {
       private BTreeElement<T> trimmedElement = null;
 
+      @Override
       public void receivedStatus(OperationStatus status) {
         switch (status.getStatusCode()) {
           case SUCCESS:
@@ -1191,6 +1243,7 @@ public void receivedStatus(OperationStatus status) {
         }
       }
 
+      @Override
       public void complete() {
         future.complete();
       }
@@ -1222,31 +1275,37 @@ private static <T> BTreeInsertAndGet<T> createBTreeInsertAndGet(BTreeElement<T>
         element.getEFlag(), element.getValue(), isUpsert, attributes);
   }
 
+  @Override
   public ArcusFuture<Boolean> bopUpdate(String key, BTreeUpdateElement<T> element) {
     BTreeUpdate<T> update = new BTreeUpdate<>(element.getValue(), element.getEFlagUpdate(), false);
     return collectionUpdate(key, element.getBKey().toString(), update);
   }
 
+  @Override
   public ArcusFuture<Long> bopIncr(String key, BKey bKey, int delta) {
     CollectionMutate mutate = new BTreeMutate(Mutator.incr, delta);
     return collectionMutate(key, bKey.toString(), mutate);
   }
 
+  @Override
   public ArcusFuture<Long> bopIncr(String key, BKey bKey, int delta, long initial, byte[] eFlag) {
     CollectionMutate mutate = new BTreeMutate(Mutator.incr, delta, initial, eFlag);
     return collectionMutate(key, bKey.toString(), mutate);
   }
 
+  @Override
   public ArcusFuture<Long> bopDecr(String key, BKey bKey, int delta) {
     CollectionMutate mutate = new BTreeMutate(Mutator.decr, delta);
     return collectionMutate(key, bKey.toString(), mutate);
   }
 
+  @Override
   public ArcusFuture<Long> bopDecr(String key, BKey bKey, int delta, long initial, byte[] eFlag) {
     CollectionMutate mutate = new BTreeMutate(Mutator.decr, delta, initial, eFlag);
     return collectionMutate(key, bKey.toString(), mutate);
   }
 
+  @Override
   public ArcusFuture<BTreeElement<T>> bopGet(String key, BKey bKey, BopGetArgs args) {
     AbstractArcusResult<BTreeElement<T>> result =
         new AbstractArcusResult<>(new AtomicReference<>());
@@ -1293,6 +1352,7 @@ public void gotData(String bKey, int flags, byte[] data, byte[] eFlag) {
     return future;
   }
 
+  @Override
   public ArcusFuture<BTreeElements<T>> bopGet(String key, BKey from, BKey to, BopGetArgs args) {
     verifyBKeyTypesMatch(from, to);
 
@@ -1365,6 +1425,7 @@ private static BTreeGet createBTreeGet(BKey from, BKey to, BopGetArgs args) {
         args.isWithDelete(), args.isDropIfEmpty());
   }
 
+  @Override
   public ArcusFuture<Map<String, BTreeElements<T>>> bopMultiGet(List<String> keys,
                                                                 BKey from, BKey to,
                                                                 BopGetArgs args) {
@@ -1493,6 +1554,7 @@ private BTreeGetBulk<T> createBTreeGetBulk(MemcachedNode node, List<String> keys
         args.getOffset(), args.getCount());
   }
 
+  @Override
   public ArcusFuture<SMGetElements<T>> bopSortMergeGet(List<String> keys, BKey from, BKey to,
                                                        boolean unique, BopGetArgs args) {
     keyValidator.validateKey(keys);
@@ -1607,6 +1669,7 @@ private BTreeSMGet<T> createBTreeSMGet(BKey from, BKey to, BopGetArgs args,
         args.getCount(), unique);
   }
 
+  @Override
   public ArcusFuture<Integer> bopGetPosition(String key, BKey bKey, BTreeOrder order) {
     AbstractArcusResult<Integer> result = new AbstractArcusResult<>(new AtomicReference<>());
     ArcusFutureImpl<Integer> future = new ArcusFutureImpl<>(result);
@@ -1651,6 +1714,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<BTreeElement<T>> bopGetByPosition(String key, int pos, BTreeOrder order) {
     AbstractArcusResult<BTreeElement<T>> result
         = new AbstractArcusResult<>(new AtomicReference<>());
@@ -1697,6 +1761,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<List<BTreeElement<T>>> bopGetByPosition(String key,
                                                              int from, int to,
                                                              BTreeOrder order) {
@@ -1750,6 +1815,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<List<BTreePositionElement<T>>> bopPositionWithGet(String key,
                                                                        BKey bKey,
                                                                        int count,
@@ -1802,6 +1868,7 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Long> bopCount(String key, BKey from, BKey to, ElementFlagFilter eFlagFilter) {
     verifyBKeyTypesMatch(from, to);
 
@@ -1844,12 +1911,14 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Boolean> bopDelete(String key, BKey bKey, BopDeleteArgs args) {
     BTreeDelete delete = new BTreeDelete(bKey.toString(),
         args.getEFlagFilter(), args.isDropIfEmpty(), false);
     return collectionDelete(key, delete);
   }
 
+  @Override
   public ArcusFuture<Boolean> bopDelete(String key, BKey from, BKey to, BopDeleteArgs args) {
     verifyBKeyTypesMatch(from, to);
     BTreeDelete delete = new BTreeDelete(from.toString(), to.toString(),
@@ -2089,10 +2158,12 @@ public void complete() {
     return future;
   }
 
+  @Override
   public ArcusFuture<Boolean> flush() {
     return flush(-1);
   }
 
+  @Override
   public ArcusFuture<Boolean> flush(int delay) {
     if (delay < -1) {
       throw new IllegalArgumentException("Delay should be greater than or equal to -1");
@@ -2135,10 +2206,12 @@ public void complete() {
     return new ArcusMultiFuture<>(futures, () -> true);
   }
 
+  @Override
   public ArcusFuture<Boolean> flush(String prefix) {
     return flush(prefix, -1);
   }
 
+  @Override
   public ArcusFuture<Boolean> flush(String prefix, int delay) {
     if (prefix == null) {
       throw new IllegalArgumentException("Prefix should not be null");
@@ -2197,10 +2270,12 @@ public void complete() {
     });
   }
 
+  @Override
   public ArcusFuture<Map<SocketAddress, Map<String, String>>> stats() {
     return stats(StatsArg.GENERAL);
   }
 
+  @Override
   public ArcusFuture<Map<SocketAddress, Map<String, String>>> stats(StatsArg arg) {
     ArcusClient client = arcusClientSupplier.get();
     Collection<MemcachedNode> nodes = client.getAllNodes();
@@ -2262,6 +2337,7 @@ public void complete() {
     });
   }
 
+  @Override
   public ArcusFuture<Map<SocketAddress, String>> versions() {
     ArcusClient client = arcusClientSupplier.get();
     Collection<MemcachedNode> nodes = client.getAllNodes();