diff --git a/pom.xml b/pom.xml
index baac402..ef4c1e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,9 +14,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<distroDirectory>distro</distroDirectory>
+		<distroDirectory>${project.basedir}/distro</distroDirectory>
 		<serviceClass>Accounting</serviceClass>
-		<maven.compiler.source>1.7</maven.compiler.source>
 	</properties>
 
 	<scm>
@@ -64,20 +63,11 @@
 			<scope>provided</scope>
 		</dependency>
 		<!-- Home Library -->
-		<!-- 
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library-jcr</artifactId>
-			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library</artifactId>
-			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
-			<scope>compile</scope>
-		</dependency>
-		 -->
+		<!-- <dependency> <groupId>org.gcube.common</groupId> <artifactId>home-library-jcr</artifactId> 
+			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> </dependency> <dependency> 
+			<groupId>org.gcube.common</groupId> <artifactId>home-library</artifactId> 
+			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> <scope>compile</scope> 
+			</dependency> -->
 		<!-- END Home Library -->
 
 		<dependency>
@@ -124,7 +114,7 @@
 
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
-			<artifactId>accounting-lib</artifactId>			
+			<artifactId>accounting-lib</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
@@ -160,15 +150,51 @@
 	</dependencies>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.5</version>
+				<executions>
+					<execution>
+						<id>copy-profile</id>
+						<phase>install</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${distroDirectory}</directory>
+									<filtering>true</filtering>
+									<includes>
+										<include>profile.xml</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>
+					<descriptors>
+						<descriptor>${distroDirectory}/descriptor.xml</descriptor>
+					</descriptors>
 					<descriptorRefs>
 						<descriptorRef>jar-with-dependencies</descriptorRef>
 					</descriptorRefs>
 				</configuration>
 				<executions>
+					<execution>
+						<id>servicearchive</id>
+						<phase>install</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
 					<execution>
 						<phase>package</phase>
 						<goals>