diff --git a/WebContent/WEB-INF/web.jetty.xml b/WebContent/WEB-INF/web.jetty.xml
new file mode 100644
index 0000000..3dd2a02
--- /dev/null
+++ b/WebContent/WEB-INF/web.jetty.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+  <display-name>policycompass.fcmmanager</display-name>
+
+	<filter>
+		<filter-name>CorsFilter</filter-name>
+		<filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
+		<init-param>
+			<param-name>cors.allowed.methods</param-name>
+			<param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
+		</init-param>
+		<init-param>
+			<param-name>cors.allowed.headers</param-name>
+			<param-value>x-requested-with,content-type,accept,origin,authorization,x-csrftoken,x-user-path,x-user-token </param-value>
+		</init-param>
+	</filter>
+	<filter-mapping>
+		<filter-name>CorsFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+    <welcome-file>index.htm</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
+    <welcome-file>default.html</welcome-file>
+    <welcome-file>default.htm</welcome-file>
+    <welcome-file>default.jsp</welcome-file>
+  </welcome-file-list>
+
+  <servlet>
+    <servlet-name>Jersey REST Service</servlet-name>
+    <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
+    <init-param>
+      <param-name>com.sun.jersey.config.property.packages</param-name>
+      <param-value>policycompass.fcmmanager</param-value>
+    </init-param>
+	<init-param>
+	  <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
+	  <param-value>true</param-value>
+	</init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>Jersey REST Service</servlet-name>
+    <url-pattern>/v1/*</url-pattern>
+  </servlet-mapping>
+</web-app>
diff --git a/pom.xml b/pom.xml
index aa14ac3..fbd7d6b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -10,13 +10,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    	<hibernate.version>4.3.5.Final</hibernate.version>  
+    	<hibernate.version>4.3.5.Final</hibernate.version>
 		<jersey.version>1.18</jersey.version>
-	    <log4j.version>1.2.17</log4j.version>  
-	    <jdk.version>1.7</jdk.version>  
+	    <log4j.version>1.2.17</log4j.version>
+	    <jdk.version>1.7</jdk.version>
 		<guice.version>3.0</guice.version>
 		<guava.version>r09</guava.version>
 		<tomcat.target.dev>${CATALINA_HOME}/webapps</tomcat.target.dev>
+        <jetty.version>9.3.3.v20150827</jetty.version>
 	</properties>
 
 	<build>
@@ -32,19 +33,25 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
+				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
-				<version>8.1.11.v20130520</version>
+                <version>${jetty.version}</version>
+                <dependencies>
+                        <dependency>
+                            <groupId>org.eclipse.jetty</groupId>
+                            <artifactId>jetty-servlets</artifactId>
+                            <version>${jetty.version}</version>
+                        </dependency>
+                </dependencies>
 				<configuration>
-					<scanIntervalSeconds>10</scanIntervalSeconds>
-					<connectors>
-						<connector implementation="org.eclipse.jetty.nio.SelectChannelConnector">
-							<port>8080</port>
-							<maxIdleTime>60000</maxIdleTime>
-						</connector>
-					</connectors>
-					<stopKey/>
-					<stopPort/>
+                    <httpConnector>
+                        <port>8080</port>
+                    </httpConnector>
+                    <webApp>
+                        <contextPath>/api</contextPath>
+                        <descriptor>WebContent/WEB-INF/web.jetty.xml</descriptor>
+                    </webApp>
+                    <scanIntervalSeconds>15</scanIntervalSeconds>
 				</configuration>
 			</plugin>
 			<!-- WAR PLUGIN:
@@ -77,7 +84,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 		<artifactId>antlr</artifactId>
 		<version>2.7.7</version>
 	</dependency>
-	
+
     <!-- Postgresql -->
 	<dependency>
 	    <groupId>postgresql</groupId>
@@ -90,25 +97,25 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 		<artifactId>asm-all</artifactId>
 		<version>3.1</version>
 	</dependency>
-	
+
 	<dependency>
 		<groupId>dom4j</groupId>
 		<artifactId>dom4j</artifactId>
 		<version>1.6.1</version>
 	</dependency>
-	
+
 	<dependency>
 	    <groupId>org.hibernate</groupId>
 	    <artifactId>hibernate-core</artifactId>
 	    <version>4.3.6.Final</version>
 	</dependency>
-	
+
 	<dependency>
 	    <groupId>org.hibernate.common</groupId>
 	    <artifactId>hibernate-commons-annotations</artifactId>
 	    <version>4.0.5.Final</version>
 	</dependency>
-	
+
 	<dependency>
 	    <groupId>org.hibernate.javax.persistence</groupId>
 	    <artifactId>hibernate-jpa-2.1-api</artifactId>
@@ -170,5 +177,5 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     </dependency>
 
   </dependencies>
-  
+
 </project>