diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
index 229c82c..7ee09a7 100644
--- a/.github/workflows/release-cli.yml
+++ b/.github/workflows/release-cli.yml
@@ -17,6 +17,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Install asdf & tools
         uses: asdf-vm/actions/install@v3
       - name: Install deps
diff --git a/cli/scripts/create-arch-npm-package.sh b/cli/scripts/create-arch-npm-package.sh
index f089da0..fc22bfa 100755
--- a/cli/scripts/create-arch-npm-package.sh
+++ b/cli/scripts/create-arch-npm-package.sh
@@ -5,6 +5,20 @@ ARCH=$2
 FULL_BINARY_PATH=$3
 VERSION=$4
 
+# Function to check if an argument is missing
+check_arg() {
+    if [[ -z "$1" ]]; then
+        echo "Error: Missing argument for $2."
+        exit 1
+    fi
+}
+
+# Check all arguments
+check_arg "$OS" "operating system (OS)"
+check_arg "$ARCH" "architecture (ARCH)"
+check_arg "$FULL_BINARY_PATH" "full binary path (FULL_BINARY_PATH)"
+check_arg "$VERSION" "version (VERSION)"
+
 # Extract the binary name
 BINARY=$(basename "$FULL_BINARY_PATH")
 
diff --git a/cli/scripts/create-main-npm-package.sh b/cli/scripts/create-main-npm-package.sh
index 087ac72..a2d6451 100755
--- a/cli/scripts/create-main-npm-package.sh
+++ b/cli/scripts/create-main-npm-package.sh
@@ -7,11 +7,23 @@ TARGET_DIR="dist/npm/warpdive"
 # Get the current Git tag
 VERSION=$(git describe --tags --abbrev=0)
 
+# Semver regex pattern to validate version format
+SEMVER_REGEX="^[0-9]+\.[0-9]+\.[0-9]+$"
+
+# Check if the version is valid semver
+if [[ $VERSION =~ $SEMVER_REGEX ]]; then
+    echo "Version $VERSION is valid semver."
+else
+    echo "Error: Version $VERSION is not a valid semver."
+    exit 1
+fi
+
 # Create necessary directories
 mkdir -p "${TARGET_DIR}/bin/"
 
 # Copy the JavaScript files
 cp "${SOURCE_DIR}/bin/cli" "${TARGET_DIR}/bin"
+cp "${SOURCE_DIR}/index.js" "${TARGET_DIR}/"
 cp "${SOURCE_DIR}/install.js" "${TARGET_DIR}/"
 
 # Create package.json
@@ -19,13 +31,14 @@ cat > "${TARGET_DIR}/package.json" <<EOF
 {
   "author": "Gaurav Khanna",
   "description": "Warpdive is a docker/oci container layer browser. Learn more at warpdive.xyz.",
-  "keywords": ["warpdive", "cli"],
+  "keywords": ["docker", "container", "podman"],
   "name": "warpdive",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/gvkhna/warpdive.git"
   },
   "version": "${VERSION}",
+  "main": "index.js",
   "bin": {
     "warpdive": "bin/cli"
   },
diff --git a/cli/warpdive/bin/cli b/cli/warpdive/bin/cli
index a7ff28e..547dc55 100644
--- a/cli/warpdive/bin/cli
+++ b/cli/warpdive/bin/cli
@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+const {getBinaryPath} = require('../index')
+
 require('child_process').execFileSync(getBinaryPath(), process.argv.slice(2), {
   stdio: 'inherit'
 })
diff --git a/cli/warpdive/index.js b/cli/warpdive/index.js
new file mode 100644
index 0000000..2d8de9a
--- /dev/null
+++ b/cli/warpdive/index.js
@@ -0,0 +1,40 @@
+// Lookup table for all platforms and binary distribution packages
+const BINARY_DISTRIBUTION_PACKAGES = {
+  'darwin-x64': 'warpdive-darwin-amd64',
+  'darwin-arm64': 'warpdive-darwin-arm64',
+  'linux-x64': 'warpdive-linux-amd64',
+  'linux-arm64': 'warpdive-linux-arm64',
+  'win32-x64': 'warpdive-windows-amd64',
+  'win32-arm64': 'warpdive-windows-arm64'
+}
+
+// Windows binaries end with .exe so we need to special case them.
+const binaryName = process.platform === 'win32' ? 'warpdive.exe' : 'warpdive'
+
+function getBinaryPath() {
+  // Windows binaries end with .exe so we need to special case them.
+  const binaryName = process.platform === 'win32' ? 'my-binary.exe' : 'my-binary'
+
+  // Determine package name for this platform
+  const platformSpecificPackageName = BINARY_DISTRIBUTION_PACKAGES[`${process.platform}-${process.arch}`]
+
+  try {
+    // Resolving will fail if the optionalDependency was not installed
+    return require.resolve(`${platformSpecificPackageName}/bin/${binaryName}`)
+  } catch (e) {
+    return require('path').join(__dirname, '..', binaryName)
+  }
+}
+
+function runBinary(...args) {
+  require('child_process').execFileSync(getBinaryPath(), args, {
+    stdio: 'inherit'
+  })
+}
+
+module.exports = {
+  BINARY_DISTRIBUTION_PACKAGES,
+  binaryName,
+  getBinaryPath,
+  runBinary
+}
diff --git a/cli/warpdive/install.js b/cli/warpdive/install.js
index 3bf1e60..2574473 100644
--- a/cli/warpdive/install.js
+++ b/cli/warpdive/install.js
@@ -3,24 +3,14 @@ const path = require('path')
 const zlib = require('zlib')
 const https = require('https')
 const packageJson = require('./package.json')
+const {BINARY_DISTRIBUTION_PACKAGES, binaryName} = require('./index')
 
 // Lookup table for all platforms and binary distribution packages
-const BINARY_DISTRIBUTION_PACKAGES = {
-  'darwin-x64': 'warpdive-darwin-amd64',
-  'darwin-arm64': 'warpdive-darwin-arm64',
-  'linux-x64': 'warpdive-linux-amd64',
-  'linux-arm64': 'warpdive-linux-arm64',
-  'win32-x64': 'warpdive-windows-amd64',
-  'win32-arm64': 'warpdive-windows-arm64'
-}
 
 // Adjust the version you want to install. You can also make this dynamic.
 // const BINARY_DISTRIBUTION_VERSION = '1.0.0'
 const BINARY_DISTRIBUTION_VERSION = packageJson.version
 
-// Windows binaries end with .exe so we need to special case them.
-const binaryName = process.platform === 'win32' ? 'warpdive.exe' : 'warpdive'
-
 // Determine package name for this platform
 const platformSpecificPackageName = BINARY_DISTRIBUTION_PACKAGES[`${process.platform}-${process.arch}`]