diff --git a/pom.xml b/pom.xml
index ead63f1..41d0dea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,121 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.gcube.tools</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>1.0.0</version>
-  </parent>
-  <groupId>org.gcube.accounting</groupId>
-  <artifactId>accounting-analytics-persistence-couchbase</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>Accounting Analytics Persistence CouchBase</name>
-  <description>Accounting Analytics Persistence CouchBase Implementation</description>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.gcube.tools</groupId>
+		<artifactId>maven-parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<groupId>org.gcube.accounting</groupId>
+	<artifactId>accounting-analytics-persistence-couchbase</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<name>Accounting Analytics Persistence CouchBase</name>
+	<description>Accounting Analytics Persistence CouchBase Implementation</description>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<distroDirectory>${project.basedir}/distro</distroDirectory>
+	</properties>
+
+	<scm>
+		<connection>scm:https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/${project.artifactId}</connection>
+		<developerConnection>scm:https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/${project.artifactId}</developerConnection>
+		<url>https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/${project.artifactId}</url>
+	</scm>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.gcube.distribution</groupId>
+				<artifactId>maven-smartgears-bom</artifactId>
+				<version>LATEST</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.gcube.accounting</groupId>
+			<artifactId>accounting-analytics</artifactId>
+			<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.data.publishing</groupId>
+			<artifactId>document-store-lib</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.accounting</groupId>
+			<artifactId>accounting-lib</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20090211</version>
+		</dependency>
+
+		<!-- CouchBase libraries -->
+		<dependency>
+			<groupId>com.couchbase.client</groupId>
+			<artifactId>java-client</artifactId>
+			<version>2.2.2</version>
+		</dependency>
+		<!-- END CouchBase libraries -->
+
+		<!-- Test Dependency -->
+		<dependency>
+			<groupId>org.gcube.resources</groupId>
+			<artifactId>registry-publisher</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-encryption</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.0.13</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+
+
 </project>
\ No newline at end of file
diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java b/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java
new file mode 100644
index 0000000..60ac72b
--- /dev/null
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java
@@ -0,0 +1,98 @@
+/**
+ * 
+ */
+package org.gcube.accounting.analytics.persistence.couchbase;
+
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.gcube.accounting.analytics.Filter;
+import org.gcube.accounting.analytics.Info;
+import org.gcube.accounting.analytics.TemporalConstraint;
+import org.gcube.accounting.analytics.persistence.AccountingPersistenceBackendQuery;
+import org.gcube.accounting.analytics.persistence.AccountingPersistenceBackendQueryConfiguration;
+import org.gcube.documentstore.records.AggregatedRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.couchbase.client.java.Bucket;
+import com.couchbase.client.java.Cluster;
+import com.couchbase.client.java.CouchbaseCluster;
+
+/**
+ * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ *
+ */
+public class AccountingPersistenceQueryCouchBase extends AccountingPersistenceBackendQuery {
+
+	private static final Logger logger = LoggerFactory.getLogger(AccountingPersistenceQueryCouchBase.class);
+	
+	public static final String URL_PROPERTY_KEY = "URL";
+	//public static final String USERNAME_PROPERTY_KEY = "username";
+	public static final String PASSWORD_PROPERTY_KEY = "password";
+	public static final String BUCKET_NAME_PROPERTY_KEY = "bucketName";
+	
+	protected Cluster cluster;
+	protected Bucket bucket;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void prepareConnection(AccountingPersistenceBackendQueryConfiguration configuration) throws Exception {
+		String url = configuration.getProperty(URL_PROPERTY_KEY);
+		// String username = configuration.getProperty(USERNAME_PROPERTY_KEY);
+		String password = configuration.getProperty(PASSWORD_PROPERTY_KEY);
+
+		cluster = CouchbaseCluster.create(url);
+		bucket = cluster.openBucket(
+				configuration.getProperty(BUCKET_NAME_PROPERTY_KEY), password);
+	}
+		
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void close() throws Exception {
+		cluster.disconnect();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected Map<Calendar, Info>  reallyQuery(
+			@SuppressWarnings("rawtypes") Class<? extends AggregatedRecord> recordClass,
+			TemporalConstraint temporalConstraint, List<Filter> filters)
+			throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Set<String> getKeys(Class<? extends AggregatedRecord> recordClass)
+			throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Set<String> getPossibleValuesForKey(
+			Class<? extends AggregatedRecord> recordClass, String key)
+			throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	
+}