diff --git a/platform/northbound/http-storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/http/HttpStorageAgent.java b/platform/northbound/http-storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/http/HttpStorageAgent.java
index ab18a86..402e13f 100644
--- a/platform/northbound/http-storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/http/HttpStorageAgent.java
+++ b/platform/northbound/http-storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/http/HttpStorageAgent.java
@@ -3,10 +3,10 @@
 import java.io.IOException;
 import java.util.regex.Pattern;
 
-import org.eclipse.sensinact.gateway.agent.storage.generic.StorageAgent;
 import org.eclipse.sensinact.gateway.agent.storage.http.internal.HttpStorageConnection;
 import org.eclipse.sensinact.gateway.common.bundle.Mediator;
 import org.eclipse.sensinact.gateway.core.message.AgentRelay;
+import org.eclipse.sensinact.gateway.historic.storage.agent.generic.StorageAgent;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
diff --git a/platform/northbound/http-storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/http/internal/HttpStorageConnection.java b/platform/northbound/http-storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/http/internal/HttpStorageConnection.java
index 3fda572..822e912 100644
--- a/platform/northbound/http-storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/http/internal/HttpStorageConnection.java
+++ b/platform/northbound/http-storage-agent/src/main/java/org/eclipse/sensinact/gateway/agent/storage/http/internal/HttpStorageConnection.java
@@ -10,8 +10,8 @@
  */
 package org.eclipse.sensinact.gateway.agent.storage.http.internal;
 
-import org.eclipse.sensinact.gateway.agent.storage.generic.StorageConnection;
 import org.eclipse.sensinact.gateway.common.bundle.Mediator;
+import org.eclipse.sensinact.gateway.historic.storage.agent.generic.StorageConnection;
 import org.eclipse.sensinact.gateway.protocol.http.client.ConnectionConfiguration;
 import org.eclipse.sensinact.gateway.protocol.http.client.ConnectionConfigurationImpl;
 import org.eclipse.sensinact.gateway.protocol.http.client.Request;