diff --git a/.classpath b/.classpath
index 953de0b..441d9c3 100644
--- a/.classpath
+++ b/.classpath
@@ -15,11 +15,7 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
@@ -27,7 +23,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 6249222..db24ee7 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/distro/changelog.xml b/distro/changelog.xml
index e338032..3541fb7 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,9 +1,13 @@
 <ReleaseNotes>
-	<Changeset component="${build.finalName}" date="2015-09-24">
+	<Changeset component="common-gcube-calls-2.0.0" date="2020-05-20">
+		<Change>MethodInterceptor added</Change>
+		<Change>AuthorizationInterceptor added</Change>
+	</Changeset>	
+	<Changeset component="common-gcube-calls-1.0.2" date="2015-09-24">
 		<Change>MethodInterceptor added</Change>
 		<Change>AuthorizationInterceptor added</Change>
 	</Changeset>
-	<Changeset component="${build.finalName}" date="2013-10-24">
+	<Changeset component="common-gcube-calls-1.0.0" date="2013-10-24">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bda8365..4e908e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
 
@@ -10,16 +11,16 @@
 
 	<groupId>org.gcube.core</groupId>
 	<artifactId>common-gcube-calls</artifactId>
-	<version>1.0.2</version>
+	<version>2.0.0-SNAPSHOT</version>
 
 	<properties>
 		<distroDirectory>distro</distroDirectory>
 	</properties>
 
 	<scm>
-    	<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
-    	<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
-    	<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
+		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
+		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
+		<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
 	</scm>
 
 	<dependencies>
@@ -28,6 +29,15 @@
 			<artifactId>common-authorization</artifactId>
 			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
+		<!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
+		<dependency>
+			<groupId>com.googlecode.json-simple</groupId>
+			<artifactId>json-simple</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+
+
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope</artifactId>
diff --git a/src/main/java/org/gcube/common/calls/interceptors/AuthorizationInterceptor.java b/src/main/java/org/gcube/common/calls/interceptors/AuthorizationInterceptor.java
index 06d4643..0ebc6b3 100644
--- a/src/main/java/org/gcube/common/calls/interceptors/AuthorizationInterceptor.java
+++ b/src/main/java/org/gcube/common/calls/interceptors/AuthorizationInterceptor.java
@@ -1,10 +1,13 @@
 package org.gcube.common.calls.interceptors;
 
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
+import org.gcube.common.authorization.library.provider.UmaJWTProvider;
 import org.gcube.common.calls.Call;
 import org.gcube.common.calls.Interceptor;
 import org.gcube.common.calls.Request;
 import org.gcube.common.calls.Response;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -13,10 +16,24 @@ public class AuthorizationInterceptor implements Interceptor {
 	private Logger logger = LoggerFactory.getLogger(AuthorizationInterceptor.class);
 
 	public static final String token_header="gcube-token";
+	public static final String uma_token_header="Authorization";
 
 	@Override
 	public void handleRequest(Request request, Call call) {
 		String token = SecurityTokenProvider.instance.get();
+		String umaToken = UmaJWTProvider.instance.get();
+
+		if (umaToken!=null) {
+			try { 
+				JSONParser parser = new JSONParser();
+				JSONObject jsonObject = (JSONObject) parser.parse(umaToken);
+				String accesToken = (String) jsonObject.get("access_token");
+				request.addHeader(uma_token_header, "Bearer "+accesToken);	
+				logger.trace("uma token set");
+			}catch (Exception e) {
+				logger.error("error parsing uma token",e);
+			}
+		} else logger.trace("uma token is not set");
 
 		if (token==null)
 			logger.warn("security token is not set");