diff --git a/pom.xml b/pom.xml
index 13de472..1729f88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<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>
 	<groupId>com.microsoft</groupId>
@@ -8,39 +7,44 @@
 	<packaging>war</packaging>
 	<name>Sample JSF App</name>
 	
-<!-- JSF Dependency -->
-  <dependencies>
-    <dependency>
-        <groupId>com.sun.faces</groupId>
-        <artifactId>jsf-api</artifactId>
-        <version>2.2.14</version>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.faces</groupId>
-        <artifactId>jsf-impl</artifactId>
-        <version>2.2.14</version>
-    </dependency>
-    <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <version>3.1.0</version>
-    </dependency>
-</dependencies>
-  
-  <!-- Build Maven WAR -->
-<build>
-<finalName>ROOT</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.2</version>
-        <configuration>
-          <!-- Java version -->
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>   
-  </build>
+	<!-- JSF Dependency -->
+	<dependencies>
+	    <dependency>
+	        <groupId>com.sun.faces</groupId>
+	        <artifactId>jsf-api</artifactId>
+	        <version>2.2.14</version>
+	    </dependency>
+	    <dependency>
+	        <groupId>com.sun.faces</groupId>
+	        <artifactId>jsf-impl</artifactId>
+	        <version>2.2.14</version>
+	    </dependency>
+	    <dependency>
+	        <groupId>javax.servlet</groupId>
+	        <artifactId>javax.servlet-api</artifactId>
+	        <version>3.1.0</version>
+	    </dependency>
+  		<!-- CDI Dependency -->
+		<dependency>
+		    <groupId>org.jboss.weld.servlet</groupId>
+		    <artifactId>weld-servlet-shaded</artifactId>
+		    <version>3.0.5.Final</version>
+		</dependency>
+  	</dependencies>
+  	<!-- Build Maven WAR -->
+	<build>
+	<finalName>ROOT</finalName>
+	<plugins>
+		<plugin>
+	    	<groupId>org.apache.maven.plugins</groupId>
+	        <artifactId>maven-compiler-plugin</artifactId>
+	        <version>3.6.2</version>
+	        <configuration>
+	        	<!-- Java version -->
+	          	<source>1.8</source>
+	          	<target>1.8</target>
+	        </configuration>
+	    </plugin>
+	</plugins>   
+	</build>
 </project>
diff --git a/src/main/java/bean/HelloBean.java b/src/main/java/bean/HelloBean.java
index bfcc377..80b1c5d 100644
--- a/src/main/java/bean/HelloBean.java
+++ b/src/main/java/bean/HelloBean.java
@@ -2,17 +2,18 @@
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
 
-@ManagedBean
+@Named
 @SessionScoped
-public class HelloBean  implements Serializable{
+public class HelloBean implements Serializable {
 
 	private static final long serialVersionUID = -4823295172962937652L;
 	
 	private String message = "Your Java app is up and running on Azure";
-
+	
+	
 	public String getMessage() {
 		return message;
 	}
diff --git a/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000..e69de29