diff --git a/cli.js b/cli.js
index 55db18f..493824e 100755
--- a/cli.js
+++ b/cli.js
@@ -17,7 +17,6 @@ yargs
 .version(pkg.version)
 .alias('help', 'h')
 .help('help')
-.demand(1, 'Please supply a valid command')
 
 .option('color', {
     describe: 'Allows disabling or enabling colored output',
@@ -26,8 +25,7 @@ yargs
     global: true,
 })
 
-.command(require('./cmd/search'))
-.command(require('./cmd/info'))
-.command(require('./cmd/open'))
+.commandDir('./cmd')
+.demandCommand(1, 'Please supply a valid command')
 
 .argv;
diff --git a/cmd/info.js b/cmd/info.js
index a7bda25..ef0a0c0 100644
--- a/cmd/info.js
+++ b/cmd/info.js
@@ -8,8 +8,6 @@ exports.command = 'info <package>';
 exports.describe = 'Get info from npms.io of a given package.';
 exports.builder = (yargs) =>
     yargs
-    .strict()
-    .demand(1, 1)
     .usage('Usage: $0 info <package> [options]\n\nGet info from npms.io of a given package.')
     .example('$0 info gulp', 'Get "gulp" package info')
     .options({
diff --git a/cmd/open.js b/cmd/open.js
index a4010d6..d7af247 100644
--- a/cmd/open.js
+++ b/cmd/open.js
@@ -23,11 +23,9 @@ exports.command = 'open <package>';
 exports.describe = 'Opens the package in your browser.';
 exports.builder = (yargs) =>
     yargs
-    .strict()
     .usage('Usage: $0 open <package> [options]\n\nOpens the package in your browser..')
     .example('$0 open gulp', 'Opens "gulp" package using auto source')
     .example('$0 open gulp --link npms', 'Opens "gulp" package in `https://npms.io` service')
-    .demand(1, 1)
     .options({
         link: {
             describe: 'Open <package> using supplied link source',
diff --git a/cmd/search.js b/cmd/search.js
index 3fa05b3..235d94e 100644
--- a/cmd/search.js
+++ b/cmd/search.js
@@ -11,12 +11,10 @@ exports.command = 'search <query...>';
 exports.describe = 'Search npms.io for packages.';
 exports.builder = (yargs) =>
     yargs
-    .strict()
     .usage('Usage: $0 search <query...> [options]\n\nSearch npms.io for packages.\nFor advances filters and modifiers visit https://api-docs.npms.io/#api-search-query.')
     .example('$0 search cross spawn', 'Search for "cross spawn"')
     .example('$0 search cross spawn --output json', 'Search for "cross spawn" and print results as JSON')
     .example('$0 search sass keywords:gulpplugin', 'Search for "sass" packages that contain the "gulpplugin" keywords')
-    .demand(1)
     .options({
         from: {
             alias: 'f',
diff --git a/package.json b/package.json
index 31aefa8..aad4879 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
     "moment": "^2.13.0",
     "opn": "^4.0.2",
     "truncate": "^2.0.0",
-    "update-notifier": "^1.0.2",
-    "yargs": "^6.0.0"
+    "update-notifier": "^2.0.0",
+    "yargs": "^7.0.0"
   },
   "devDependencies": {
     "@satazor/eslint-config": "^3.1.1",