diff --git a/app/models/conference/Conference.php b/app/models/conference/Conference.php
index ac94a1378..00bc180ac 100644
--- a/app/models/conference/Conference.php
+++ b/app/models/conference/Conference.php
@@ -18,7 +18,7 @@ class Conference extends Model
         'conference'    => ['type' => 'string','size' => 128,'key' => true],
         'name'          => ['type' => 'string','size' => 128,'mandatory' => true],
         'nick'          => ['type' => 'string','size' => 128],
-        'autojoin'      => ['type' => 'int','size' => 1],
-        'status'        => ['type' => 'int','size' => 1],
+        'autojoin'      => ['type' => 'bool'],
+        'status'        => ['type' => 'bool'],
     ];
 }
diff --git a/app/models/config/Config.php b/app/models/config/Config.php
index 9bfc70c1c..fa95bc062 100644
--- a/app/models/config/Config.php
+++ b/app/models/config/Config.php
@@ -29,7 +29,7 @@ class Config extends Model
         'loglevel'      => ['type' => 'string','size' => 16,'mandatory' => true],
         'timezone'      => ['type' => 'string','size' => 32,'mandatory' => true],
         'info'          => ['type' => 'text'],
-        'unregister'    => ['type' => 'int','size' => 1],
+        'unregister'    => ['type' => 'bool'],
         'username'      => ['type' => 'string','size' => 32,'mandatory' => true],
         'password'      => ['type' => 'string','size' => 64,'mandatory' => true],
         'sizelimit'     => ['type' => 'int','size' => 16],
diff --git a/app/models/message/Message.php b/app/models/message/Message.php
index dd63f0abf..60a2e002f 100644
--- a/app/models/message/Message.php
+++ b/app/models/message/Message.php
@@ -56,11 +56,11 @@ class Message extends Model
         'published' => ['type' => 'date','mandatory' => true],
         'delivered' => ['type' => 'date'],
         'displayed' => ['type' => 'date'],
-        'markable'  => ['type' => 'int','size' => 1],
-        'edited'    => ['type' => 'int','size' => 1],
+        'markable'  => ['type' => 'bool'],
+        'edited'    => ['type' => 'bool'],
         'picture'   => ['type' => 'text'],
         'sticker'   => ['type' => 'string','size' => 128],
-        'quoted'    => ['type' => 'int','size' => 1],
+        'quoted'    => ['type' => 'bool'],
         'file'      => ['type' => 'serialized']
     ];
 
diff --git a/app/models/postn/Postn.php b/app/models/postn/Postn.php
index 045cf4900..f8f444558 100644
--- a/app/models/postn/Postn.php
+++ b/app/models/postn/Postn.php
@@ -71,7 +71,7 @@ class Postn extends Model
         'links'         => ['type' => 'serialized'],
         'picture'       => ['type' => 'text'],
         'hash'          => ['type' => 'string','size' => 128,'mandatory' => true],
-        'nsfw'          => ['type' => 'int','size' => 1]
+        'nsfw'          => ['type' => 'bool']
     ];
 
     public function __construct()
diff --git a/app/models/presence/Presence.php b/app/models/presence/Presence.php
index 456993050..5c75e32e2 100644
--- a/app/models/presence/Presence.php
+++ b/app/models/presence/Presence.php
@@ -51,7 +51,7 @@ class Presence extends Model
         'delay'     => ['type' => 'date'],
         'last'      => ['type' => 'int',    'size' => 11],
         'publickey' => ['type' => 'text'],
-        'muc'       => ['type' => 'int',    'size' => 1],
+        'muc'       => ['type' => 'bool'],
         'mucjid'    => ['type' => 'string', 'size' => 64],
         'mucaffiliation' => ['type' => 'string','size' => 32],
         'mucrole'   => ['type' => 'string', 'size' => 32],
diff --git a/app/models/subscription/Subscription.php b/app/models/subscription/Subscription.php
index dc278d200..7a7cb43c9 100644
--- a/app/models/subscription/Subscription.php
+++ b/app/models/subscription/Subscription.php
@@ -27,7 +27,7 @@ class Subscription extends Model
         'subid'     => ['type' => 'string', 'size' => 128],
         'title'     => ['type' => 'string', 'size' => 128],
         'tags'      => ['type' => 'serialized'],
-        'timestamp' => ['type' => 'date',]
+        'timestamp' => ['type' => 'date']
     ];
 
     public function getLogo()
diff --git a/composer.json b/composer.json
index 0bf7858f4..b0dae8da8 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "rain/raintpl": "dev-master",
         "michelf/php-markdown": "1.7.0",
 
-        "movim/modl": "dev-master#77a0d357b939bb7000ed9b590b04a82d04d14c06",
+        "movim/modl": "dev-master#5863813c917d302bd31781965bbd8cbe693d30ae",
         "movim/sasl2": "dev-master",
         "movim/moxl": "dev-master#7315c1362c6a049e33cdd6a02ed9dfbefa6a2ca0",
 
diff --git a/composer.lock b/composer.lock
index 1f7ffea50..8cc86d8f0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "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": "9ec0e8c948868b6a401a421fcde86e86",
+    "content-hash": "a7cedf93fbfa109524f2ca60a6efc250",
     "packages": [
         {
             "name": "cboden/ratchet",
@@ -728,12 +728,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/movim/modl.git",
-                "reference": "77a0d357b939bb7000ed9b590b04a82d04d14c06"
+                "reference": "5863813c917d302bd31781965bbd8cbe693d30ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/movim/modl/zipball/77a0d357b939bb7000ed9b590b04a82d04d14c06",
-                "reference": "77a0d357b939bb7000ed9b590b04a82d04d14c06",
+                "url": "https://api.github.com/repos/movim/modl/zipball/5863813c917d302bd31781965bbd8cbe693d30ae",
+                "reference": "5863813c917d302bd31781965bbd8cbe693d30ae",
                 "shasum": ""
             },
             "require": {
@@ -764,7 +764,7 @@
                 "database",
                 "sql"
             ],
-            "time": "2017-02-26 08:51:12"
+            "time": "2017-05-10 06:50:59"
         },
         {
             "name": "movim/moxl",