diff --git a/.gitignore b/.gitignore
index 491f666..57872d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 /vendor/
-.idea/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce913ec..2888159 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 Full changelog for ZF3 view helpers code completion library.
 
+## v1.07.0 - Row and Column - 2018-01-20
+
+* More updates to dependencies.
+* Added calls for Bootstrap 4 row and column view helpers.
+
 ## v1.06.1 - Minor corrections - 2018-01-05
 
 * Corrected dependencies.
diff --git a/README.md b/README.md
index 1ede204..f7188bd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 [![Latest Stable Version](https://img.shields.io/packagist/v/deanblackborough/zf3-view-helpers-code-completion.svg?style=flat-square)](https://packagist.org/packages/deanblackborough/zf3-view-helpers-code-completion)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/deanblackborough/zf3-view-helpers-code-completion/blob/master/LICENSE)
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.1-8892BF.svg)](https://php.net/)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207-8892BF.svg)](https://php.net/)
+[![Total Downloads](https://img.shields.io/packagist/dt/deanblackborough/zf3-view-helpers-code-completion.svg?style=flat-square)](https://packagist.org/packages/deanblackborough/zf3-view-helpers-code-completion)
 
 # ZF3 View helpers code completion
 
diff --git a/composer.json b/composer.json
index 051c9ab..4b85aee 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
         "php": "^7.2"
     },
     "require-dev": {
-        "zendframework/zend-view": "^2.9"
+        "zendframework/zend-view": "^2.10",
+        "deanblackborough/zf3-view-helpers": "^1"
     },
     "repositories": [
         {
diff --git a/composer.lock b/composer.lock
index fcf88d9..9b4abec 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,9 +4,62 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "8bb150e76fa6fb097f2e2a99b4893105",
+    "content-hash": "2c9bfbf0ada09ef78a164cb9db2fe40a",
     "packages": [],
     "packages-dev": [
+        {
+            "name": "deanblackborough/zf3-view-helpers",
+            "version": "v1.02.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/deanblackborough/zf3-view-helpers.git",
+                "reference": "1e29e7d2e9c0d3850c4df163db87d015b3dc27f6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/deanblackborough/zf3-view-helpers/zipball/1e29e7d2e9c0d3850c4df163db87d015b3dc27f6",
+                "reference": "1e29e7d2e9c0d3850c4df163db87d015b3dc27f6",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7",
+                "zendframework/zend-view": "^2.10"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6"
+            },
+            "suggest": {
+                "deanblackborough/zf3-view-helpers-code-completion": "^1",
+                "php": "^7.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DBlackborough\\Zf3ViewHelpers\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Dean Blackborough",
+                    "email": "dean@g3d-development.com"
+                }
+            ],
+            "description": "A bunch of view helpers that I use in my Zend Framework 3 apps",
+            "homepage": "https://github.com/deanblackborough/zf3-view-helpers",
+            "keywords": [
+                "bootstrap",
+                "bootstrap4",
+                "framework",
+                "view helpers",
+                "zend",
+                "zf3"
+            ],
+            "time": "2018-01-20T21:53:03+00:00"
+        },
         {
             "name": "zendframework/zend-eventmanager",
             "version": "3.2.0",
@@ -152,16 +205,16 @@
         },
         {
             "name": "zendframework/zend-view",
-            "version": "2.9.0",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-view.git",
-                "reference": "3b6342c381c4437a03fc81d0064c0bb8924914d3"
+                "reference": "4478cc5dd960e2339d88b363ef99fa278700e80e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/3b6342c381c4437a03fc81d0064c0bb8924914d3",
-                "reference": "3b6342c381c4437a03fc81d0064c0bb8924914d3",
+                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/4478cc5dd960e2339d88b363ef99fa278700e80e",
+                "reference": "4478cc5dd960e2339d88b363ef99fa278700e80e",
                 "shasum": ""
             },
             "require": {
@@ -192,7 +245,7 @@
                 "zendframework/zend-router": "^3.0.1",
                 "zendframework/zend-serializer": "^2.6.1",
                 "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-                "zendframework/zend-session": "^2.6.2",
+                "zendframework/zend-session": "^2.8.1",
                 "zendframework/zend-uri": "^2.5"
             },
             "suggest": {
@@ -216,8 +269,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.9-dev",
-                    "dev-develop": "3.0-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
                 }
             },
             "autoload": {
@@ -235,7 +288,7 @@
                 "view",
                 "zf2"
             ],
-            "time": "2017-03-21T15:05:56+00:00"
+            "time": "2018-01-17T22:21:50+00:00"
         }
     ],
     "aliases": [],
@@ -244,7 +297,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.1"
+        "php": "^7"
     },
     "platform-dev": []
 }
diff --git a/src/CustomAndZend.php b/src/CustomAndZend.php
index ee96332..90402c1 100644
--- a/src/CustomAndZend.php
+++ b/src/CustomAndZend.php
@@ -78,6 +78,15 @@ public function bootstrap4Button(string $label) : Zf3ViewHelpers\Bootstrap4Butto
      */
     public function bootstrap4Card(string $width_class = '', string $width_attr = '') : Zf3ViewHelpers\Bootstrap4Card {}
 
+    /**
+     * Create a Bootstrap 4 column
+     *
+     * @param string $content Column content
+     *
+     * @return Zf3ViewHelpers\Bootstrap4Column
+     */
+    public function bootstrap4Column(string $content): Zf3ViewHelpers\Bootstrap4Column {}
+
     /**
      * Create a Bootstrap 4 jumbotron component
      *
@@ -114,6 +123,15 @@ public function bootstrap4ProgressBar(int $value): Zf3ViewHelpers\Bootstrap4Prog
      */
     public function bootstrap4ProgressBarMultiple(array $values, array $colors): Zf3ViewHelpers\Bootstrap4ProgressBarMultiple {}
 
+    /**
+     * Create a bootstrap 4 row
+     *
+     * @param string $content Row content
+     *
+     * @return Zf3ViewHelpers\Bootstrap4Row
+     */
+    public function bootstrap4Row(string $content): Zf3ViewHelpers\Bootstrap4Row {}
+
     /**
      * @param string $asset
      *
@@ -373,7 +391,7 @@ public function htmlQuicktime(string $data, array $attribs, array $params, strin
      *
      * @return HtmlTag
      */
-    public function HtmlTag(array $attribs) : HtmlTag {}
+    public function htmlTag(array $attribs) : HtmlTag {}
 
     /**
      * Retrieve the current identity, if any.
@@ -408,7 +426,7 @@ public function inlineScript(string $mode, string $spec, string $placement, arra
      *
      * @return string|void
      */
-    public function json(mixed $data, array $jsonOptions) : string {}
+    public function json($data, array $jsonOptions) : string {}
 
     /**
      * Set layout template or retrieve "layout" view model
diff --git a/src/Zend.php b/src/Zend.php
index 3de5922..88645a0 100644
--- a/src/Zend.php
+++ b/src/Zend.php
@@ -298,7 +298,7 @@ public function htmlQuicktime(string $data, array $attribs, array $params, strin
      *
      * @return HtmlTag
      */
-    public function HtmlTag(array $attribs) : HtmlTag {}
+    public function htmlTag(array $attribs) : HtmlTag {}
 
     /**
      * Retrieve the current identity, if any.
@@ -333,7 +333,7 @@ public function inlineScript(string $mode, string $spec, string $placement, arra
      *
      * @return string|void
      */
-    public function json(mixed $data, array $jsonOptions) : string {}
+    public function json($data, array $jsonOptions) : string {}
 
     /**
      * Set layout template or retrieve "layout" view model