diff --git a/change_log.txt b/change_log.txt
index 000f3af..c765b30 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,3 +1,6 @@
+= 1.5 =
+- Updated the plugin to allow its usage as a WP-CLI package.
+
 = 1.4 =
 - Fixed an issue where the version comparison performed when using `wp gf update` with an add-on slug uses the Gravity Forms version number.
 - Added support for using `--version=beta` with the `wp gf install` and `wp gf update` commands. Add-On beta releases are not currently supported.
diff --git a/class-gf-cli.php b/class-gf-cli.php
index abacb33..7845ecd 100644
--- a/class-gf-cli.php
+++ b/class-gf-cli.php
@@ -1,6 +1,6 @@
 <?php
 
-defined( 'ABSPATH' ) || die();
+defined( 'ABSPATH' ) || defined( 'WP_CLI' ) || die();
 
 // Include the Gravity Forms add-on framework
 GFForms::include_addon_framework();
diff --git a/cli.php b/cli.php
index 0bad409..c914cbd 100644
--- a/cli.php
+++ b/cli.php
@@ -3,7 +3,7 @@
 Plugin Name: Gravity Forms CLI
 Plugin URI: https://gravityforms.com
 Description: Manage Gravity Forms with the WP CLI.
-Version: 1.4
+Version: 1.5
 Author: Rocketgenius
 Author URI: https://gravityforms.com
 License: GPL-2.0+
@@ -27,17 +27,15 @@
 along with this program.  If not, see http://www.gnu.org/licenses.
 */
 
-defined( 'ABSPATH' ) || die();
+defined( 'ABSPATH' ) || defined( 'WP_CLI' ) || die();
 
 // Defines the current version of the CLI add-on
-define( 'GF_CLI_VERSION', '1.4' );
+define( 'GF_CLI_VERSION', '1.5' );
 
 define( 'GF_CLI_MIN_GF_VERSION', '1.9.17.8' );
 
-add_action( 'init', array( 'GF_CLI_Bootstrap', 'load_cli' ), 1 );
-
 // After GF is loaded, load the CLI add-on
-add_action( 'gform_loaded', array( 'GF_CLI_Bootstrap', 'load_addon' ), 1 );
+defined( 'ABSPATH' ) && add_action( 'gform_loaded', array( 'GF_CLI_Bootstrap', 'load_addon' ), 1 );
 
 
 
@@ -71,7 +69,7 @@ public static function load_cli() {
 		if ( defined( 'WP_CLI' ) && WP_CLI ) {
 
 			// Checks for files within the includes directory, and includes them.
-			foreach ( glob( plugin_dir_path( __FILE__ ) . 'includes/*.php' ) as $filename ) {
+			foreach ( glob( dirname( __FILE__ ) . '/includes/*.php' ) as $filename ) {
 				require_once( $filename );
 			}
 			$command_args = array( 'before_invoke' => array( 'GF_CLI_Bootstrap', 'before_invoke' ) );
@@ -101,6 +99,8 @@ public static function before_invoke() {
 	}
 }
 
+GF_CLI_Bootstrap::load_cli();
+
 /**
  * Returns an instance of the GF_CLI class
  *
diff --git a/composer.json b/composer.json
index 24b858e..1a17084 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "gravityforms/gravityformscli",
   "description": "A set of WP-CLI commands to manage Gravity Forms.",
-  "type": "wordpress-plugin",
+  "type": "wp-cli-package",
   "homepage": "https://github.com/gravityforms/gravityformscli",
   "support": {
     "issues": "https://gravityforms.com"
diff --git a/includes/class-gf-cli-entry-notification.php b/includes/class-gf-cli-entry-notification.php
index 6474189..c92f7be 100644
--- a/includes/class-gf-cli-entry-notification.php
+++ b/includes/class-gf-cli-entry-notification.php
@@ -1,6 +1,6 @@
 <?php
 
-defined( 'ABSPATH' ) || die();
+defined( 'ABSPATH' ) || defined( 'WP_CLI' ) || die();
 
 /**
  * Send Gravity Forms Notifications.
diff --git a/includes/class-gf-cli-entry.php b/includes/class-gf-cli-entry.php
index abc605c..155d77b 100644
--- a/includes/class-gf-cli-entry.php
+++ b/includes/class-gf-cli-entry.php
@@ -1,6 +1,6 @@
 <?php
 
-defined( 'ABSPATH' ) || die();
+defined( 'ABSPATH' ) || defined( 'WP_CLI' ) || die();
 
 /**
  * Manage Gravity Forms Entries.
diff --git a/includes/class-gf-cli-form-field.php b/includes/class-gf-cli-form-field.php
index 1571ee6..7ec92c4 100644
--- a/includes/class-gf-cli-form-field.php
+++ b/includes/class-gf-cli-form-field.php
@@ -1,6 +1,6 @@
 <?php
 
-defined( 'ABSPATH' ) || die();
+defined( 'ABSPATH' ) || defined( 'WP_CLI' ) || die();
 
 /**
  * Manage Gravity Forms Form Fields.
diff --git a/includes/class-gf-cli-form-notification.php b/includes/class-gf-cli-form-notification.php
index b7c00d8..6fe4d13 100644
--- a/includes/class-gf-cli-form-notification.php
+++ b/includes/class-gf-cli-form-notification.php
@@ -1,6 +1,6 @@
 <?php
 
-defined( 'ABSPATH' ) || die();
+defined( 'ABSPATH' ) || defined( 'WP_CLI' ) || die();
 
 /**
  * Manage Gravity Forms Notifications.
diff --git a/includes/class-gf-cli-form.php b/includes/class-gf-cli-form.php
index 1e8cf8b..8bf742d 100644
--- a/includes/class-gf-cli-form.php
+++ b/includes/class-gf-cli-form.php
@@ -1,6 +1,6 @@
 <?php
 
-defined( 'ABSPATH' ) || die();
+defined( 'ABSPATH' ) || defined( 'WP_CLI' ) || die();
 
 /**
  * Manage Gravity Forms.
diff --git a/includes/class-gf-cli-license.php b/includes/class-gf-cli-license.php
index f092214..a12177d 100644
--- a/includes/class-gf-cli-license.php
+++ b/includes/class-gf-cli-license.php
@@ -1,6 +1,6 @@
 <?php
 
-defined( 'ABSPATH' ) || die();
+defined( 'ABSPATH' ) || defined( 'WP_CLI' ) || die();
 
 /**
  * Manage the Gravity Forms License Key.
diff --git a/includes/class-gf-cli-root.php b/includes/class-gf-cli-root.php
index eff1912..3c65bbf 100644
--- a/includes/class-gf-cli-root.php
+++ b/includes/class-gf-cli-root.php
@@ -1,6 +1,6 @@
 <?php
 
-defined( 'ABSPATH' ) || die();
+defined( 'ABSPATH' ) || defined( 'WP_CLI' ) || die();
 
 /**
  * Manage Gravity Forms.
diff --git a/includes/class-gf-cli-tool.php b/includes/class-gf-cli-tool.php
index 471279b..808e003 100644
--- a/includes/class-gf-cli-tool.php
+++ b/includes/class-gf-cli-tool.php
@@ -1,6 +1,6 @@
 <?php
 
-defined( 'ABSPATH' ) || die();
+defined( 'ABSPATH' ) || defined( 'WP_CLI' ) || die();
 
 /**
  * Misc Gravity Forms Tools.
diff --git a/readme.txt b/readme.txt
index 0d5ff65..25ccec7 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: rocketgenius, stevehenty
 Tags: gravity forms
 Requires at least: 4.2
-Tested up to: 5.8
+Tested up to: 6.4
 Stable tag: 1.4
 License: GPL-2.0+
 License URI: http://www.gnu.org/licenses/gpl-2.0.html