diff --git a/src/main/resources/v2/JavaJaxRS/cxf/pojo.mustache b/src/main/resources/v2/JavaJaxRS/cxf/pojo.mustache
index ba9320cadf..96a928b5d9 100644
--- a/src/main/resources/v2/JavaJaxRS/cxf/pojo.mustache
+++ b/src/main/resources/v2/JavaJaxRS/cxf/pojo.mustache
@@ -64,16 +64,16 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
 {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
 {{/vendorExtensions.extraAnnotation}}
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#is this 'enum'}}{{^isListContainer}}{{^isMapContainer}}public {{datatype}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#is this 'enum'}}{{#isNot this 'list-container'}}{{#isNot this 'map-container'}}public {{datatype}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
     if ({{name}} == null) {
       return null;
     }
     return {{name}}.value();
-  }{{/isMapContainer}}{{/isListContainer}}{{/is}}{{#is this 'enum'}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
+  }{{/isNot}}{{/isNot}}{{/is}}{{#is this 'enum'}}{{#is this 'list-container'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
     return {{name}};
-  }{{/isListContainer}}{{/is}}{{#is this 'enum'}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
+  }{{/is}}{{/is}}{{#is this 'enum'}}{{#is this 'map-container'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
     return {{name}};
-  }{{/isMapContainer}}{{/is}}{{#isNot this 'enum'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
+  }{{/is}}{{/is}}{{#isNot this 'enum'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
     return {{name}};
   }{{/isNot}}
 
@@ -86,20 +86,20 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
     this.{{name}} = {{name}};
     return this;
   }
-  {{#isListContainer}}
+  {{#is this 'list-container'}}
 
   public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
     this.{{name}}.add({{name}}Item);
     return this;
   }
-  {{/isListContainer}}
-  {{#isMapContainer}}
+  {{/is}}
+  {{#is this 'map-container'}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }
-  {{/isMapContainer}}
+  {{/is}}
   {{/isReadOnly}}
 
   {{/vars}}
diff --git a/src/main/resources/v2/JavaJaxRS/cxf/pom.mustache b/src/main/resources/v2/JavaJaxRS/cxf/pom.mustache
index d31376757b..e897816dfd 100644
--- a/src/main/resources/v2/JavaJaxRS/cxf/pom.mustache
+++ b/src/main/resources/v2/JavaJaxRS/cxf/pom.mustache
@@ -39,6 +39,15 @@
             <idleTimeout>60000</idleTimeout>
           </httpConnector>
         </configuration>
+{{#useBeanValidation}}
+        <dependencies>
+          <dependency>
+              <groupId>javax.validation</groupId>
+              <artifactId>validation-api</artifactId>
+              <version>${beanvalidation-version}</version>
+          </dependency>
+        </dependencies>
+{{/useBeanValidation}}
         <executions>
           <execution>
             <id>start-jetty</id>
@@ -194,9 +203,9 @@
     <junit-version>4.12</junit-version>
     <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
-{{#useBeanValidation}}    
+{{#useBeanValidation}}
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
-{{/useBeanValidation}}    
+{{/useBeanValidation}}
     <cxf-version>3.2.1</cxf-version>
     <jackson-jaxrs-version>2.9.1</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/resources/v2/JavaJaxRS/cxf/server/pom.mustache b/src/main/resources/v2/JavaJaxRS/cxf/server/pom.mustache
index e75e19c0c4..37a60b8ea0 100644
--- a/src/main/resources/v2/JavaJaxRS/cxf/server/pom.mustache
+++ b/src/main/resources/v2/JavaJaxRS/cxf/server/pom.mustache
@@ -39,6 +39,15 @@
             <idleTimeout>60000</idleTimeout>
           </httpConnector>
         </configuration>
+{{#useBeanValidation}}
+        <dependencies>
+          <dependency>
+              <groupId>javax.validation</groupId>
+              <artifactId>validation-api</artifactId>
+              <version>${beanvalidation-version}</version>
+          </dependency>
+        </dependencies>
+{{/useBeanValidation}}
         <executions>
           <execution>
             <id>start-jetty</id>
@@ -245,9 +254,9 @@
     <junit-version>4.12</junit-version>
     <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
-{{#useBeanValidation}}    
+{{#useBeanValidation}}
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
-{{/useBeanValidation}}    
+{{/useBeanValidation}}
 {{#generateSpringApplication}}    
     <spring-version>4.3.13.RELEASE</spring-version>
 {{/generateSpringApplication}}    
diff --git a/src/main/resources/v2/JavaJaxRS/libraries/jersey1/apiService.mustache b/src/main/resources/v2/JavaJaxRS/libraries/jersey1/apiService.mustache
index 0d3ab0ebe1..21eb80a12b 100644
--- a/src/main/resources/v2/JavaJaxRS/libraries/jersey1/apiService.mustache
+++ b/src/main/resources/v2/JavaJaxRS/libraries/jersey1/apiService.mustache
@@ -8,6 +8,7 @@ import com.sun.jersey.multipart.FormDataParam;
 {{#imports}}import {{import}};
 {{/imports}}
 
+import java.util.Map;
 import java.util.List;
 import {{package}}.NotFoundException;
 
diff --git a/src/main/resources/v2/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache b/src/main/resources/v2/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache
index abe789f1cb..d45eb2113c 100644
--- a/src/main/resources/v2/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache
+++ b/src/main/resources/v2/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache
@@ -8,6 +8,7 @@ import com.sun.jersey.multipart.FormDataParam;
 {{#imports}}import {{import}};
 {{/imports}}
 
+import java.util.Map;
 import java.util.List;
 import {{package}}.NotFoundException;
 
diff --git a/src/main/resources/v2/JavaJaxRS/libraries/jersey1/pom.mustache b/src/main/resources/v2/JavaJaxRS/libraries/jersey1/pom.mustache
index 20dea2c312..e4daf2e860 100644
--- a/src/main/resources/v2/JavaJaxRS/libraries/jersey1/pom.mustache
+++ b/src/main/resources/v2/JavaJaxRS/libraries/jersey1/pom.mustache
@@ -42,6 +42,15 @@
             <idleTimeout>60000</idleTimeout>
           </httpConnector>
         </configuration>
+{{#useBeanValidation}}
+        <dependencies>
+          <dependency>
+              <groupId>javax.validation</groupId>
+              <artifactId>validation-api</artifactId>
+              <version>${beanvalidation-version}</version>
+          </dependency>
+        </dependencies>
+{{/useBeanValidation}}
         <executions>
           <execution>
             <id>start-jetty</id>
@@ -173,7 +182,7 @@
     <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>
-        <version>1.1.0.Final</version>
+        <version>${beanvalidation-version}</version>
         <scope>provided</scope>
     </dependency>
 {{/useBeanValidation}}    
@@ -198,6 +207,9 @@
     <slf4j-version>1.7.21</slf4j-version>
     <junit-version>4.12</junit-version>
     <servlet-api-version>2.5</servlet-api-version>
+{{#useBeanValidation}}
+    <beanvalidation-version>1.1.0.Final</beanvalidation-version>
+{{/useBeanValidation}}
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/src/main/resources/v2/JavaJaxRS/pojo.mustache b/src/main/resources/v2/JavaJaxRS/pojo.mustache
index 6f833903a8..e894913133 100644
--- a/src/main/resources/v2/JavaJaxRS/pojo.mustache
+++ b/src/main/resources/v2/JavaJaxRS/pojo.mustache
@@ -37,7 +37,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     this.{{name}} = {{name}};
     return this;
   }
-  {{#isListContainer}}
+  {{#is this 'list-container'}}
 
   public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
     {{^required}}
@@ -48,8 +48,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     this.{{name}}.add({{name}}Item);
     return this;
   }
-  {{/isListContainer}}
-  {{#isMapContainer}}
+  {{/is}}
+  {{#is this 'map-container'}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
     {{^required}}
@@ -60,7 +60,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }
-  {{/isMapContainer}}
+  {{/is}}
 
   {{/isReadOnly}}
   /**
diff --git a/src/main/resources/v2/JavaJaxRS/pom.mustache b/src/main/resources/v2/JavaJaxRS/pom.mustache
index 7ab35a399c..f94ffc8bd9 100644
--- a/src/main/resources/v2/JavaJaxRS/pom.mustache
+++ b/src/main/resources/v2/JavaJaxRS/pom.mustache
@@ -51,6 +51,15 @@
             <idleTimeout>60000</idleTimeout>
           </httpConnector>
         </configuration>
+{{#useBeanValidation}}
+        <dependencies>
+          <dependency>
+              <groupId>javax.validation</groupId>
+              <artifactId>validation-api</artifactId>
+              <version>${beanvalidation-version}</version>
+          </dependency>
+        </dependencies>
+{{/useBeanValidation}}
         <executions>
           <execution>
             <id>start-jetty</id>
@@ -178,7 +187,7 @@
     <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>
-        <version>1.1.0.Final</version>
+        <version>${beanvalidation-version}</version>
         <scope>provided</scope>
     </dependency>
 {{/useBeanValidation}}
@@ -208,6 +217,9 @@
     <junit-version>4.12</junit-version>
     <logback-version>1.1.7</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
+{{#useBeanValidation}}
+    <beanvalidation-version>1.1.0.Final</beanvalidation-version>
+{{/useBeanValidation}}
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/src/main/resources/v2/JavaJaxRS/resteasy/returnTypes.mustache b/src/main/resources/v2/JavaJaxRS/resteasy/returnTypes.mustache
index c8f7a56938..2a42486d1c 100644
--- a/src/main/resources/v2/JavaJaxRS/resteasy/returnTypes.mustache
+++ b/src/main/resources/v2/JavaJaxRS/resteasy/returnTypes.mustache
@@ -1 +1 @@
-{{#returnContainer}}{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
\ No newline at end of file
+{{#returnContainer}}{{#is this 'map-container'}}Map<String, {{{returnType}}}>{{/is}}{{#is this 'list-container'}}List<{{{returnType}}}>{{/is}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
\ No newline at end of file
diff --git a/src/main/resources/v2/JavaJaxRS/returnTypes.mustache b/src/main/resources/v2/JavaJaxRS/returnTypes.mustache
index c8f7a56938..2a42486d1c 100644
--- a/src/main/resources/v2/JavaJaxRS/returnTypes.mustache
+++ b/src/main/resources/v2/JavaJaxRS/returnTypes.mustache
@@ -1 +1 @@
-{{#returnContainer}}{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
\ No newline at end of file
+{{#returnContainer}}{{#is this 'map-container'}}Map<String, {{{returnType}}}>{{/is}}{{#is this 'list-container'}}List<{{{returnType}}}>{{/is}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
\ No newline at end of file