diff --git a/pom.xml b/pom.xml
index 0822ab1..2dea42e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,10 +27,10 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
-		<!-- <dependency>
+		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency> -->
+ 		</dependency> 
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/org/gcube/app/springbootangulardemo/config/DevCorsConfiguration.java b/src/main/java/org/gcube/app/springbootangulardemo/config/DevCorsConfiguration.java
new file mode 100644
index 0000000..99cebbb
--- /dev/null
+++ b/src/main/java/org/gcube/app/springbootangulardemo/config/DevCorsConfiguration.java
@@ -0,0 +1,16 @@
+package org.gcube.app.springbootangulardemo.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+@Profile("development")
+public class DevCorsConfiguration implements WebMvcConfigurer {
+ 
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/api/**").allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS");
+    }
+}
diff --git a/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingController.java b/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingController.java
index eae0c09..2ce743c 100644
--- a/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingController.java
+++ b/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingController.java
@@ -3,13 +3,16 @@ package org.gcube.app.springbootangulardemo.controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
+@RequestMapping("/api")
+//@ResponseBody
 public class GreetingController {
 
 	//This return the templates/greeting.html
-	@RequestMapping("/greeting")
+	@RequestMapping(value = "/greeting", method = RequestMethod.GET, produces = {"text/html"})
 	public String greeting(@RequestParam(name="name", required=false, defaultValue="World") final String name,
             final Model model) {
 
diff --git a/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingRestController.java b/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingRestController.java
index acb9778..9996d86 100644
--- a/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingRestController.java
+++ b/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingRestController.java
@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequestMapping("/api")
 public class GreetingRestController {
 
     String template = "Hello, %s!";
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8b13789..be7d8f2 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1 +1,2 @@
-
+# application.properties
+spring.profiles.active=development
diff --git a/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.properties b/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.properties
index 596726b..1da56fb 100644
--- a/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.properties
+++ b/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Fri Mar 06 15:27:28 CET 2020
+#Mon Mar 09 13:17:17 CET 2020
 version=0.0.1-SNAPSHOT
 groupId=org.gcube.app
 m2e.projectName=springboot-angular-app-demo-0.0.1-SNAPSHOT
diff --git a/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.xml b/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.xml
index 0822ab1..2dea42e 100644
--- a/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.xml
+++ b/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.xml
@@ -27,10 +27,10 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
-		<!-- <dependency>
+		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency> -->
+ 		</dependency> 
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/target/classes/application.properties b/target/classes/application.properties
index 8b13789..be7d8f2 100644
--- a/target/classes/application.properties
+++ b/target/classes/application.properties
@@ -1 +1,2 @@
-
+# application.properties
+spring.profiles.active=development
diff --git a/target/classes/org/gcube/app/springbootangulardemo/controller/GreetingController.class b/target/classes/org/gcube/app/springbootangulardemo/controller/GreetingController.class
index c8e4c9a..ce95397 100644
Binary files a/target/classes/org/gcube/app/springbootangulardemo/controller/GreetingController.class and b/target/classes/org/gcube/app/springbootangulardemo/controller/GreetingController.class differ
diff --git a/target/classes/org/gcube/app/springbootangulardemo/controller/GreetingRestController.class b/target/classes/org/gcube/app/springbootangulardemo/controller/GreetingRestController.class
index 7147dce..8091f2b 100644
Binary files a/target/classes/org/gcube/app/springbootangulardemo/controller/GreetingRestController.class and b/target/classes/org/gcube/app/springbootangulardemo/controller/GreetingRestController.class differ