diff --git a/src/main/java/it/cavallium/dbengine/client/SearchResult.java b/src/main/java/it/cavallium/dbengine/client/SearchResult.java
index ab863cb..99b3607 100644
--- a/src/main/java/it/cavallium/dbengine/client/SearchResult.java
+++ b/src/main/java/it/cavallium/dbengine/client/SearchResult.java
@@ -3,10 +3,10 @@ package it.cavallium.dbengine.client;
 import io.net5.buffer.api.Drop;
 import io.net5.buffer.api.Owned;
 import it.cavallium.dbengine.client.query.current.data.TotalHitsCount;
-import it.cavallium.dbengine.database.DatabaseResourceSupport;
+import io.net5.buffer.api.internal.ResourceSupport;
 import reactor.core.publisher.Flux;
 
-public final class SearchResult<T, U> extends DatabaseResourceSupport<SearchResult<T, U>, SearchResult<T, U>> {
+public final class SearchResult<T, U> extends ResourceSupport<SearchResult<T, U>, SearchResult<T, U>> {
 
 	private static final Drop<SearchResult<?, ?>> DROP = new Drop<>() {
 		@Override
diff --git a/src/main/java/it/cavallium/dbengine/client/SearchResultKeys.java b/src/main/java/it/cavallium/dbengine/client/SearchResultKeys.java
index 306267d..d017f04 100644
--- a/src/main/java/it/cavallium/dbengine/client/SearchResultKeys.java
+++ b/src/main/java/it/cavallium/dbengine/client/SearchResultKeys.java
@@ -3,14 +3,14 @@ package it.cavallium.dbengine.client;
 import io.net5.buffer.api.Drop;
 import io.net5.buffer.api.Owned;
 import it.cavallium.dbengine.client.query.current.data.TotalHitsCount;
-import it.cavallium.dbengine.database.DatabaseResourceSupport;
+import io.net5.buffer.api.internal.ResourceSupport;
 import it.cavallium.dbengine.database.collections.ValueGetter;
 import org.warp.commonutils.log.Logger;
 import org.warp.commonutils.log.LoggerFactory;
 import reactor.core.publisher.Flux;
 
 @SuppressWarnings("unused")
-public final class SearchResultKeys<T> extends DatabaseResourceSupport<SearchResultKeys<T>, SearchResultKeys<T>> {
+public final class SearchResultKeys<T> extends ResourceSupport<SearchResultKeys<T>, SearchResultKeys<T>> {
 
 	private static final Logger logger = LoggerFactory.getLogger(SearchResultKeys.class);
 
diff --git a/src/main/java/it/cavallium/dbengine/database/DatabaseResourceSupport.java b/src/main/java/it/cavallium/dbengine/database/DatabaseResourceSupport.java
deleted file mode 100644
index f7ce11f..0000000
--- a/src/main/java/it/cavallium/dbengine/database/DatabaseResourceSupport.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package it.cavallium.dbengine.database;
-
-import io.net5.buffer.api.Drop;
-import io.net5.buffer.api.Resource;
-import io.net5.buffer.api.internal.ResourceSupport;
-
-public abstract class DatabaseResourceSupport<I extends Resource<I>, T extends DatabaseResourceSupport<I, T>>
-		extends ResourceSupport<I, T> {
-
-	protected DatabaseResourceSupport(Drop<T> drop) {
-		super(drop);
-	}
-
-}
diff --git a/src/main/java/it/cavallium/dbengine/database/LLDelta.java b/src/main/java/it/cavallium/dbengine/database/LLDelta.java
index ce1f9e6..607cc59 100644
--- a/src/main/java/it/cavallium/dbengine/database/LLDelta.java
+++ b/src/main/java/it/cavallium/dbengine/database/LLDelta.java
@@ -4,12 +4,13 @@ import io.net5.buffer.api.Buffer;
 import io.net5.buffer.api.Drop;
 import io.net5.buffer.api.Owned;
 import io.net5.buffer.api.Send;
+import io.net5.buffer.api.internal.ResourceSupport;
 import java.util.StringJoiner;
 import org.jetbrains.annotations.Nullable;
 import org.warp.commonutils.log.Logger;
 import org.warp.commonutils.log.LoggerFactory;
 
-public class LLDelta extends DatabaseResourceSupport<LLDelta, LLDelta> {
+public class LLDelta extends ResourceSupport<LLDelta, LLDelta> {
 
 	private static final Logger logger = LoggerFactory.getLogger(LLDelta.class);
 
diff --git a/src/main/java/it/cavallium/dbengine/database/LLEntry.java b/src/main/java/it/cavallium/dbengine/database/LLEntry.java
index 6f7e823..578bad8 100644
--- a/src/main/java/it/cavallium/dbengine/database/LLEntry.java
+++ b/src/main/java/it/cavallium/dbengine/database/LLEntry.java
@@ -4,6 +4,7 @@ import io.net5.buffer.api.Buffer;
 import io.net5.buffer.api.Drop;
 import io.net5.buffer.api.Owned;
 import io.net5.buffer.api.Send;
+import io.net5.buffer.api.internal.ResourceSupport;
 import java.util.Objects;
 import java.util.StringJoiner;
 import org.jetbrains.annotations.NotNull;
@@ -11,7 +12,7 @@ import org.jetbrains.annotations.Nullable;
 import org.warp.commonutils.log.Logger;
 import org.warp.commonutils.log.LoggerFactory;
 
-public class LLEntry extends DatabaseResourceSupport<LLEntry, LLEntry> {
+public class LLEntry extends ResourceSupport<LLEntry, LLEntry> {
 
 	private static final Logger logger = LoggerFactory.getLogger(LLEntry.class);
 
diff --git a/src/main/java/it/cavallium/dbengine/database/LLRange.java b/src/main/java/it/cavallium/dbengine/database/LLRange.java
index 5569bd9..ee571f6 100644
--- a/src/main/java/it/cavallium/dbengine/database/LLRange.java
+++ b/src/main/java/it/cavallium/dbengine/database/LLRange.java
@@ -6,6 +6,7 @@ import io.net5.buffer.api.Buffer;
 import io.net5.buffer.api.Drop;
 import io.net5.buffer.api.Owned;
 import io.net5.buffer.api.Send;
+import io.net5.buffer.api.internal.ResourceSupport;
 import java.util.StringJoiner;
 import org.jetbrains.annotations.Nullable;
 import org.warp.commonutils.log.Logger;
@@ -14,7 +15,7 @@ import org.warp.commonutils.log.LoggerFactory;
 /**
  * Range of data, from min (inclusive),to max (exclusive)
  */
-public class LLRange extends DatabaseResourceSupport<LLRange, LLRange> {
+public class LLRange extends ResourceSupport<LLRange, LLRange> {
 
 	private static final Logger logger = LoggerFactory.getLogger(LLRange.class);
 
diff --git a/src/main/java/it/cavallium/dbengine/database/LLSearchResultShard.java b/src/main/java/it/cavallium/dbengine/database/LLSearchResultShard.java
index c1ef3b2..cc1f9b2 100644
--- a/src/main/java/it/cavallium/dbengine/database/LLSearchResultShard.java
+++ b/src/main/java/it/cavallium/dbengine/database/LLSearchResultShard.java
@@ -2,13 +2,14 @@ package it.cavallium.dbengine.database;
 
 import io.net5.buffer.api.Drop;
 import io.net5.buffer.api.Owned;
+import io.net5.buffer.api.internal.ResourceSupport;
 import it.cavallium.dbengine.client.query.current.data.TotalHitsCount;
 import java.util.Objects;
 import org.warp.commonutils.log.Logger;
 import org.warp.commonutils.log.LoggerFactory;
 import reactor.core.publisher.Flux;
 
-public final class LLSearchResultShard extends DatabaseResourceSupport<LLSearchResultShard, LLSearchResultShard> {
+public final class LLSearchResultShard extends ResourceSupport<LLSearchResultShard, LLSearchResultShard> {
 
 	private static final Logger logger = LoggerFactory.getLogger(LLSearchResultShard.class);
 
diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java
index d549c51..1205f45 100644
--- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java
+++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java
@@ -13,7 +13,7 @@ import it.cavallium.dbengine.database.LLDictionaryResultType;
 import it.cavallium.dbengine.database.LLRange;
 import it.cavallium.dbengine.database.LLSnapshot;
 import it.cavallium.dbengine.database.LLUtils;
-import it.cavallium.dbengine.database.DatabaseResourceSupport;
+import io.net5.buffer.api.internal.ResourceSupport;
 import it.cavallium.dbengine.database.UpdateMode;
 import it.cavallium.dbengine.database.serialization.SerializationException;
 import it.cavallium.dbengine.database.serialization.SerializerFixedBinaryLength;
@@ -28,7 +28,7 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 // todo: implement optimized methods (which?)
-public class DatabaseMapDictionaryDeep<T, U, US extends DatabaseStage<U>> extends DatabaseResourceSupport<DatabaseStage<Map<T, U>>, DatabaseMapDictionaryDeep<T, U, US>>
+public class DatabaseMapDictionaryDeep<T, U, US extends DatabaseStage<U>> extends ResourceSupport<DatabaseStage<Map<T, U>>, DatabaseMapDictionaryDeep<T, U, US>>
 		implements DatabaseStageMap<T, U, US> {
 
 	private static final Logger logger = LoggerFactory.getLogger(DatabaseMapDictionaryDeep.class);
diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java
index e3fc6c8..319e993 100644
--- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java
+++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java
@@ -10,7 +10,7 @@ import it.cavallium.dbengine.client.BadBlock;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.LLDictionary;
 import it.cavallium.dbengine.database.LLUtils;
-import it.cavallium.dbengine.database.DatabaseResourceSupport;
+import io.net5.buffer.api.internal.ResourceSupport;
 import it.cavallium.dbengine.database.UpdateMode;
 import it.cavallium.dbengine.database.serialization.Serializer;
 import it.cavallium.dbengine.database.serialization.SerializerFixedBinaryLength;
@@ -30,7 +30,7 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 @SuppressWarnings("unused")
-public class DatabaseMapDictionaryHashed<T, U, TH> extends DatabaseResourceSupport<DatabaseStage<Map<T, U>>, DatabaseMapDictionaryHashed<T, U, TH>>
+public class DatabaseMapDictionaryHashed<T, U, TH> extends ResourceSupport<DatabaseStage<Map<T, U>>, DatabaseMapDictionaryHashed<T, U, TH>>
 		implements DatabaseStageMap<T, U, DatabaseStageEntry<U>> {
 
 	private static final Logger logger = LoggerFactory.getLogger(DatabaseMapDictionaryHashed.class);
diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleBucket.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleBucket.java
index 30dc9e8..0ad5d54 100644
--- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleBucket.java
+++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleBucket.java
@@ -7,7 +7,7 @@ import it.cavallium.dbengine.client.BadBlock;
 import it.cavallium.dbengine.client.CompositeSnapshot;
 import it.cavallium.dbengine.database.Delta;
 import it.cavallium.dbengine.database.LLUtils;
-import it.cavallium.dbengine.database.DatabaseResourceSupport;
+import io.net5.buffer.api.internal.ResourceSupport;
 import it.cavallium.dbengine.database.UpdateReturnMode;
 import it.cavallium.dbengine.database.serialization.SerializationFunction;
 import it.unimi.dsi.fastutil.objects.ObjectArraySet;
@@ -24,7 +24,7 @@ import reactor.core.publisher.Mono;
 
 @SuppressWarnings("unused")
 public class DatabaseSingleBucket<K, V, TH>
-		extends DatabaseResourceSupport<DatabaseStage<V>, DatabaseSingleBucket<K, V, TH>>
+		extends ResourceSupport<DatabaseStage<V>, DatabaseSingleBucket<K, V, TH>>
 		implements DatabaseStageEntry<V> {
 
 	private static final Logger logger = LoggerFactory.getLogger(DatabaseSingleBucket.class);
diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearcher.java b/src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearcher.java
index 7712d7e..8c8f0ba 100644
--- a/src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearcher.java
+++ b/src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearcher.java
@@ -2,13 +2,13 @@ package it.cavallium.dbengine.database.disk;
 
 import io.net5.buffer.api.Drop;
 import io.net5.buffer.api.Owned;
-import it.cavallium.dbengine.database.DatabaseResourceSupport;
+import io.net5.buffer.api.internal.ResourceSupport;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.IndexSearcher;
 import org.warp.commonutils.log.Logger;
 import org.warp.commonutils.log.LoggerFactory;
 
-public class LLIndexSearcher extends DatabaseResourceSupport<LLIndexSearcher, LLIndexSearcher> {
+public class LLIndexSearcher extends ResourceSupport<LLIndexSearcher, LLIndexSearcher> {
 
 	private static final Logger logger = LoggerFactory.getLogger(LLIndexSearcher.class);
 
diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearchers.java b/src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearchers.java
index e2688d6..0ee0c8e 100644
--- a/src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearchers.java
+++ b/src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearchers.java
@@ -4,7 +4,7 @@ import io.net5.buffer.api.Drop;
 import io.net5.buffer.api.Owned;
 import io.net5.buffer.api.Resource;
 import io.net5.buffer.api.Send;
-import it.cavallium.dbengine.database.DatabaseResourceSupport;
+import io.net5.buffer.api.internal.ResourceSupport;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -34,7 +34,7 @@ public interface LLIndexSearchers extends Resource<LLIndexSearchers> {
 
 	IndexReader allShards();
 
-	class UnshardedIndexSearchers extends DatabaseResourceSupport<LLIndexSearchers, UnshardedIndexSearchers>
+	class UnshardedIndexSearchers extends ResourceSupport<LLIndexSearchers, UnshardedIndexSearchers>
 			implements LLIndexSearchers {
 
 		private static final Logger logger = LoggerFactory.getLogger(UnshardedIndexSearchers.class);
@@ -125,7 +125,7 @@ public interface LLIndexSearchers extends Resource<LLIndexSearchers> {
 		}
 	}
 
-	class ShardedIndexSearchers extends DatabaseResourceSupport<LLIndexSearchers, ShardedIndexSearchers>
+	class ShardedIndexSearchers extends ResourceSupport<LLIndexSearchers, ShardedIndexSearchers>
 			implements LLIndexSearchers {
 
 		private static final Logger logger = LoggerFactory.getLogger(ShardedIndexSearchers.class);
diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/LuceneSearchResult.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/LuceneSearchResult.java
index 9bc3926..2494fe6 100644
--- a/src/main/java/it/cavallium/dbengine/lucene/searcher/LuceneSearchResult.java
+++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/LuceneSearchResult.java
@@ -4,13 +4,13 @@ import io.net5.buffer.api.Drop;
 import io.net5.buffer.api.Owned;
 import it.cavallium.dbengine.client.query.current.data.TotalHitsCount;
 import it.cavallium.dbengine.database.LLKeyScore;
-import it.cavallium.dbengine.database.DatabaseResourceSupport;
+import io.net5.buffer.api.internal.ResourceSupport;
 import java.util.Objects;
 import org.warp.commonutils.log.Logger;
 import org.warp.commonutils.log.LoggerFactory;
 import reactor.core.publisher.Flux;
 
-public final class LuceneSearchResult extends DatabaseResourceSupport<LuceneSearchResult, LuceneSearchResult> {
+public final class LuceneSearchResult extends ResourceSupport<LuceneSearchResult, LuceneSearchResult> {
 
 	private static final Logger logger = LoggerFactory.getLogger(LuceneSearchResult.class);
 
diff --git a/src/main/java/it/cavallium/dbengine/netty/NullableBuffer.java b/src/main/java/it/cavallium/dbengine/netty/NullableBuffer.java
index 7245981..45c4cc5 100644
--- a/src/main/java/it/cavallium/dbengine/netty/NullableBuffer.java
+++ b/src/main/java/it/cavallium/dbengine/netty/NullableBuffer.java
@@ -4,12 +4,12 @@ import io.net5.buffer.api.Buffer;
 import io.net5.buffer.api.Drop;
 import io.net5.buffer.api.Owned;
 import io.net5.buffer.api.Send;
-import it.cavallium.dbengine.database.DatabaseResourceSupport;
+import io.net5.buffer.api.internal.ResourceSupport;
 import org.jetbrains.annotations.Nullable;
 import org.warp.commonutils.log.Logger;
 import org.warp.commonutils.log.LoggerFactory;
 
-public class NullableBuffer extends DatabaseResourceSupport<NullableBuffer, NullableBuffer> {
+public class NullableBuffer extends ResourceSupport<NullableBuffer, NullableBuffer> {
 
 	private static final Logger logger = LoggerFactory.getLogger(NullableBuffer.class);