diff --git a/spring-data-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml
index fc7bb1fed..b8b061657 100644
--- a/spring-data-graph-parent/pom.xml
+++ b/spring-data-graph-parent/pom.xml
@@ -191,20 +191,20 @@
               <groupId>com.tinkerpop.blueprints</groupId>
               <artifactId>blueprints-core</artifactId>
               <version>${blueprints.version}</version>
-              <scope>optional</scope>
+              <optional>true</optional>
             </dependency>
             <dependency>
               <groupId>com.tinkerpop.blueprints</groupId>
               <artifactId>blueprints-neo4j-graph</artifactId>
               <version>${blueprints.version}</version>
-              <scope>optional</scope>
+              <optional>true</optional>
             </dependency>
 
             <dependency>
               <groupId>com.tinkerpop</groupId>
               <artifactId>gremlin</artifactId>
               <version>${gremlin.version}</version>
-              <scope>optional</scope>
+              <optional>true</optional>
             </dependency>
 
 			<dependency>
@@ -388,7 +388,8 @@
 			</plugin>
             <plugin>
                 <groupId>com.mycila.maven-license-plugin</groupId>
-                <artifactId>maven-license-plugin</artifactId>                
+                <artifactId>maven-license-plugin</artifactId>
+                <version>1.9.0</version>                
                 <executions>
                   <execution>
                     <id>check-licenses</id>
diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml
index e6119c143..50d5ffadb 100644
--- a/spring-data-neo4j/pom.xml
+++ b/spring-data-neo4j/pom.xml
@@ -129,24 +129,24 @@
 		<dependency>
 			<groupId>org.neo4j</groupId>
 			<artifactId>server-api</artifactId>
-		 <scope>optional</scope>
+		 <optional>true</optional>
 		</dependency>
 
         <dependency>
           <groupId>com.tinkerpop.blueprints</groupId>
           <artifactId>blueprints-core</artifactId>
-          <scope>optional</scope>
+          <optional>true</optional>
         </dependency>
         <dependency>
           <groupId>com.tinkerpop.blueprints</groupId>
           <artifactId>blueprints-neo4j-graph</artifactId>
-          <scope>optional</scope>
+          <optional>true</optional>
         </dependency>
 
         <dependency>
           <groupId>com.tinkerpop</groupId>
           <artifactId>gremlin</artifactId>
-          <scope>optional</scope>
+          <optional>true</optional>
         </dependency>
 
 		<dependency>
diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf
index 5c7b70f63..ab4e5fc82 100644
--- a/spring-data-neo4j/template.mf
+++ b/spring-data-neo4j/template.mf
@@ -18,6 +18,7 @@ Import-Template:
  org.springframework.persistence.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.neo4j.*;version="0",
  org.neo4j.*;version="0",
+ org.neo4j.cypher.*;version="0";resolution:=optional,
  org.w3c.dom.*;version="0",
  org.aspectj.*;version="[1.6.5, 2.0.0)",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
@@ -33,9 +34,8 @@ Import-Template:
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
  com.tinkerpop.blueprints.*;version="[0.8,1.0)";resolution:=optional,
  com.tinkerpop.gremlin.*;version="[1.1,2.0)";resolution:=optional
-Excluded-Imports:
- org.neo4j.*.impl.*
 Import-Package: 
  net.sf.cglib.proxy;version="[2.2.0,3.0.0)",
  net.sf.cglib.core;version="[2.2.0,3.0.0)",
  net.sf.cglib.reflect;version="[2.2.0,3.0.0)"
+DynamicImport-Package: *
\ No newline at end of file