diff --git a/all/pom.xml b/all/pom.xml
index 15c5887..0c9d39f 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -191,5 +191,5 @@
             <artifactId>core.wcm.components.config</artifactId>
             <type>zip</type>
         </dependency>
-    </dependencies>
+       </dependencies>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index b338f3e..5765104 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -45,7 +45,7 @@
                             <bnd><![CDATA[
 Import-Package: javax.annotation;version=0.0.0,*
                                 ]]>
-                                -includeresource: handlebars.jar=handlebars-4.2.0.jar,tui-multifield.jar=multifield.core-master-dbc43663b0-1.jar;lib:=true,
+                                -includeresource: tui-multifield.jar=multifield.core-master-dbc43663b0-1.jar;lib:=true,
                                  Export-Package:com.aem.component.generator.core.*
                             </bnd>
                         </configuration>
@@ -102,6 +102,10 @@ Import-Package: javax.annotation;version=0.0.0,*
             <groupId>com.github.jknack</groupId>
             <artifactId>handlebars</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.jknack</groupId>
+            <artifactId>handlebars-guava-cache</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.annotation.versioning</artifactId>
diff --git a/development.md b/development.md
index 4592059..481e09a 100644
--- a/development.md
+++ b/development.md
@@ -85,9 +85,7 @@ If you are using bnd-maven-plugin then add it as follows:
             <type>zip</type>
         </dependency>
         
-7. This is a temporary solution, please install this [JAR](https://repo1.maven.org/maven2/com/github/jknack/handlebars/4.2.0/handlebars-4.2.0.jar) from maven repo directly in System console. https://mvnrepository.com/artifact/com.github.jknack/handlebars/4.2.0        
-I will make it as part of build process soon. 
-
+7. You have ACS Commons package installed because this is to [ensure permission](https://adobe-consulting-services.github.io/acs-aem-commons/features/ensure-service-users/index.html) . 
 
 Note: Restart AEM server if you see this error in log file: 
 *ERROR* [0:0:0:0:0:0:0:1 [1597653713267] GET /apps/cq/core/content/nav/tools/component-generator/component-generator/componentlist.html HTTP/1.1] org.apache.sling.engine.impl.SlingRequestProcessorImpl service: Uncaught SlingException
diff --git a/pom.xml b/pom.xml
index 2126863..22bc7cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -737,6 +737,11 @@ Bundle-DocURL:
                 <artifactId>handlebars</artifactId>
                 <version>4.2.0</version>
             </dependency>
+            <dependency>
+                <groupId>com.github.jknack</groupId>
+                <artifactId>handlebars-guava-cache</artifactId>
+                <version>4.2.0</version>
+            </dependency>
             <dependency>
                 <groupId>com.github.sumantapakira.aem-multifield</groupId>
                 <artifactId>multifield.core</artifactId>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 5c5eb32..72efbf8 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -73,6 +73,11 @@
                             <artifactId>component-generator.core</artifactId>
                             <target>/apps/component-generator/install</target>
                         </embedded>
+                        <embedded>
+                            <groupId>com.github.jknack</groupId>
+                            <artifactId>handlebars</artifactId>
+                            <target>/apps/component-generator/install</target>
+                        </embedded>
                     </embeddeds>
                     <subPackages>
                     </subPackages>
@@ -134,7 +139,10 @@
             <version>${project.version}</version>
         </dependency>
 
-
+        <dependency>
+            <groupId>com.github.jknack</groupId>
+            <artifactId>handlebars</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.adobe.cq</groupId>
diff --git a/ui.apps/src/main/content/jcr_root/apps/component-generator/templates/handlebar/htl.hbs b/ui.apps/src/main/content/jcr_root/apps/component-generator/templates/handlebar/htl.hbs
index c2237c6..9faa5c1 100644
--- a/ui.apps/src/main/content/jcr_root/apps/component-generator/templates/handlebar/htl.hbs
+++ b/ui.apps/src/main/content/jcr_root/apps/component-generator/templates/handlebar/htl.hbs
@@ -24,6 +24,9 @@
      {{#propertyLists}}
         <div data-sly-test="${model.{{.}} }"> ${model.{{.}} } </div>
      {{/propertyLists}}
+     {{#checkboxLists}}
+             <div data-sly-test="${model.{{.}} }"> ${model.{{.}} } </div>
+          {{/checkboxLists}}
      {{#multiValueLists}}
              <ul data-sly-list="${ model.multiField{{.}} }">
                    {{#multiFieldItemLists}}