diff --git a/.travis.yml b/.travis.yml
index 839659a55..fec5a05da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ cache:
     directories:
         - $HOME/.composer/cache/files
         - .phpunit
+        - vendor
 
 env:
     global:
@@ -24,7 +25,7 @@ before_install:
     - phpenv config-rm xdebug.ini
 
 install:
-    - composer install
+    - composer update --no-suggest
     - ./vendor/bin/simple-phpunit install
 
 script:
diff --git a/src/GeneratorTwigHelper.php b/src/GeneratorTwigHelper.php
index d650f6eab..b96992eaf 100644
--- a/src/GeneratorTwigHelper.php
+++ b/src/GeneratorTwigHelper.php
@@ -31,15 +31,29 @@ public function getEntityFieldPrintCode($entity, $field): string
         $printCode = $entity.'.'.str_replace('_', '', $twigField);
 
         switch ($field['type']) {
+            case 'datetimetz_immutable':
+            case 'datetimetz':
+                $printCode .= ' ? '.$printCode.'|date(\'Y-m-d H:i:s T\') : \'\'';
+                break;
+            case 'datetime_immutable':
             case 'datetime':
                 $printCode .= ' ? '.$printCode.'|date(\'Y-m-d H:i:s\') : \'\'';
                 break;
+            case 'dateinterval':
+                $printCode .= ' ? '.$printCode.'.format(\'%y year(s), %m month(s), %d day(s)\') : \'\'';
+                break;
+            case 'date_immutable':
             case 'date':
                 $printCode .= ' ? '.$printCode.'|date(\'Y-m-d\') : \'\'';
                 break;
+            case 'time_immutable':
             case 'time':
                 $printCode .= ' ? '.$printCode.'|date(\'H:i:s\') : \'\'';
                 break;
+            case 'json':
+            case 'json_array':
+                $printCode .= ' ? '.$printCode.'|json_encode : \'\'';
+                break;
             case 'array':
                 $printCode .= ' ? '.$printCode.'|join(\', \') : \'\'';
                 break;
diff --git a/src/Maker/MakeCrud.php b/src/Maker/MakeCrud.php
index ffa5bb40f..1ba960ac9 100644
--- a/src/Maker/MakeCrud.php
+++ b/src/Maker/MakeCrud.php
@@ -104,7 +104,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         }
 
         $controllerClassDetails = $generator->createClassNameDetails(
-            $entityClassDetails->getRelativeNameWithoutSuffix(),
+            $entityClassDetails->getRelativeNameWithoutSuffix().'Controller',
             'Controller\\',
             'Controller'
         );
@@ -112,7 +112,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         $iter = 0;
         do {
             $formClassDetails = $generator->createClassNameDetails(
-                $entityClassDetails->getRelativeNameWithoutSuffix().($iter ?: ''),
+                $entityClassDetails->getRelativeNameWithoutSuffix().($iter ?: '').'Type',
                 'Form\\',
                 'Type'
             );
diff --git a/src/Resources/skeleton/crud/controller/Controller.tpl.php b/src/Resources/skeleton/crud/controller/Controller.tpl.php
index ecd44f6c8..78510633e 100644
--- a/src/Resources/skeleton/crud/controller/Controller.tpl.php
+++ b/src/Resources/skeleton/crud/controller/Controller.tpl.php
@@ -18,7 +18,7 @@
 class <?= $class_name ?> extends <?= $parent_class_name; ?><?= "\n" ?>
 {
     /**
-     * @Route("/", name="<?= $route_name ?>_index", methods="GET")
+     * @Route("/", name="<?= $route_name ?>_index", methods={"GET"})
      */
 <?php if (isset($repository_full_class_name)): ?>
     public function index(<?= $repository_class_name ?> $<?= $repository_var ?>): Response
@@ -37,7 +37,7 @@ public function index(): Response
 <?php endif ?>
 
     /**
-     * @Route("/new", name="<?= $route_name ?>_new", methods="GET|POST")
+     * @Route("/new", name="<?= $route_name ?>_new", methods={"GET","POST"})
      */
     public function new(Request $request): Response
     {
@@ -60,7 +60,7 @@ public function new(Request $request): Response
     }
 
     /**
-     * @Route("/{<?= $entity_identifier ?>}", name="<?= $route_name ?>_show", methods="GET")
+     * @Route("/{<?= $entity_identifier ?>}", name="<?= $route_name ?>_show", methods={"GET"})
      */
     public function show(<?= $entity_class_name ?> $<?= $entity_var_singular ?>): Response
     {
@@ -68,7 +68,7 @@ public function show(<?= $entity_class_name ?> $<?= $entity_var_singular ?>): Re
     }
 
     /**
-     * @Route("/{<?= $entity_identifier ?>}/edit", name="<?= $route_name ?>_edit", methods="GET|POST")
+     * @Route("/{<?= $entity_identifier ?>}/edit", name="<?= $route_name ?>_edit", methods={"GET","POST"})
      */
     public function edit(Request $request, <?= $entity_class_name ?> $<?= $entity_var_singular ?>): Response
     {
@@ -88,7 +88,7 @@ public function edit(Request $request, <?= $entity_class_name ?> $<?= $entity_va
     }
 
     /**
-     * @Route("/{<?= $entity_identifier ?>}", name="<?= $route_name ?>_delete", methods="DELETE")
+     * @Route("/{<?= $entity_identifier ?>}", name="<?= $route_name ?>_delete", methods={"DELETE"})
      */
     public function delete(Request $request, <?= $entity_class_name ?> $<?= $entity_var_singular ?>): Response
     {