diff --git a/dplib/plugins/cli/commands/dialect/check.py b/dplib/plugins/cli/commands/dialect/check.py
index 1b7570a..89e63c6 100644
--- a/dplib/plugins/cli/commands/dialect/check.py
+++ b/dplib/plugins/cli/commands/dialect/check.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dplib.actions.dialect.check import check_dialect
 
 from ...helpers.check import print_check_results
diff --git a/dplib/plugins/cli/commands/dialect/main.py b/dplib/plugins/cli/commands/dialect/main.py
index b50a8f0..e3beba3 100644
--- a/dplib/plugins/cli/commands/dialect/main.py
+++ b/dplib/plugins/cli/commands/dialect/main.py
@@ -2,4 +2,4 @@
 
 from ...program import Program
 
-program = Program(name="dialect", help="dialect")
+program = Program(name="dialect", help="Table Dialect related commands.")
diff --git a/dplib/plugins/cli/commands/package/check.py b/dplib/plugins/cli/commands/package/check.py
index 371e87c..ec7d47a 100644
--- a/dplib/plugins/cli/commands/package/check.py
+++ b/dplib/plugins/cli/commands/package/check.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dplib.actions.package.check import check_package
 
 from ...helpers.check import print_check_results
diff --git a/dplib/plugins/cli/commands/package/convert.py b/dplib/plugins/cli/commands/package/convert.py
index 9528f97..df21f87 100644
--- a/dplib/plugins/cli/commands/package/convert.py
+++ b/dplib/plugins/cli/commands/package/convert.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from rich.console import Console
 
 from dplib.actions.package.convert import convert_package
diff --git a/dplib/plugins/cli/commands/package/main.py b/dplib/plugins/cli/commands/package/main.py
index ae25473..64d0c54 100644
--- a/dplib/plugins/cli/commands/package/main.py
+++ b/dplib/plugins/cli/commands/package/main.py
@@ -2,4 +2,4 @@
 
 from ...program import Program
 
-program = Program(name="package", help="package")
+program = Program(name="package", help="Data Package related commands.")
diff --git a/dplib/plugins/cli/commands/resource/check.py b/dplib/plugins/cli/commands/resource/check.py
index b2d96ac..a510401 100644
--- a/dplib/plugins/cli/commands/resource/check.py
+++ b/dplib/plugins/cli/commands/resource/check.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dplib.actions.resource.check import check_resource
 
 from ...helpers.check import print_check_results
diff --git a/dplib/plugins/cli/commands/resource/convert.py b/dplib/plugins/cli/commands/resource/convert.py
index 91c2688..53953df 100644
--- a/dplib/plugins/cli/commands/resource/convert.py
+++ b/dplib/plugins/cli/commands/resource/convert.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from rich.console import Console
 
 from dplib.actions.resource.convert import convert_resource
diff --git a/dplib/plugins/cli/commands/resource/main.py b/dplib/plugins/cli/commands/resource/main.py
index cc8adfd..dfc2718 100644
--- a/dplib/plugins/cli/commands/resource/main.py
+++ b/dplib/plugins/cli/commands/resource/main.py
@@ -2,4 +2,4 @@
 
 from ...program import Program
 
-program = Program(name="resource", help="resource")
+program = Program(name="resource", help="Data Resource related commands.")
diff --git a/dplib/plugins/cli/commands/schema/check.py b/dplib/plugins/cli/commands/schema/check.py
index f0942ba..b3431b5 100644
--- a/dplib/plugins/cli/commands/schema/check.py
+++ b/dplib/plugins/cli/commands/schema/check.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dplib.actions.schema.check import check_schema
 
 from ...helpers.check import print_check_results
diff --git a/dplib/plugins/cli/commands/schema/main.py b/dplib/plugins/cli/commands/schema/main.py
index 372eb59..a4acde8 100644
--- a/dplib/plugins/cli/commands/schema/main.py
+++ b/dplib/plugins/cli/commands/schema/main.py
@@ -2,4 +2,4 @@
 
 from ...program import Program
 
-program = Program(name="schema", help="schema")
+program = Program(name="schema", help="Table Schema related commands.")
diff --git a/dplib/plugins/cli/commands/version.py b/dplib/plugins/cli/commands/version.py
index 8d6fd6d..d1a20a9 100644
--- a/dplib/plugins/cli/commands/version.py
+++ b/dplib/plugins/cli/commands/version.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dplib import settings
 
 from .main import program
diff --git a/dplib/plugins/cli/options/convert.py b/dplib/plugins/cli/options/convert.py
index b96c181..2293329 100644
--- a/dplib/plugins/cli/options/convert.py
+++ b/dplib/plugins/cli/options/convert.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Optional
 
 from typer import Option
diff --git a/dplib/plugins/cli/options/path.py b/dplib/plugins/cli/options/path.py
index 8ef9a0f..61b4685 100644
--- a/dplib/plugins/cli/options/path.py
+++ b/dplib/plugins/cli/options/path.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Optional
 
 from typer import Argument, Option
diff --git a/dplib/plugins/cli/options/system.py b/dplib/plugins/cli/options/system.py
index faf73c6..4f5a760 100644
--- a/dplib/plugins/cli/options/system.py
+++ b/dplib/plugins/cli/options/system.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Optional
 
 from typer import Option