diff --git a/poetry.lock b/poetry.lock
index 77c299d..e9c10c7 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1419,9 +1419,10 @@ files = [
 name = "elastic-transport"
 version = "8.17.1"
 description = "Transport classes and utilities shared among Python Elastic client libraries"
-optional = false
+optional = true
 python-versions = ">=3.8"
 groups = ["main"]
+markers = "extra == \"all\""
 files = [
     {file = "elastic_transport-8.17.1-py3-none-any.whl", hash = "sha256:192718f498f1d10c5e9aa8b9cf32aed405e469a7f0e9d6a8923431dbb2c59fb8"},
     {file = "elastic_transport-8.17.1.tar.gz", hash = "sha256:5edef32ac864dca8e2f0a613ef63491ee8d6b8cfb52881fa7313ba9290cac6d2"},
@@ -1438,9 +1439,10 @@ develop = ["aiohttp", "furo", "httpx", "opentelemetry-api", "opentelemetry-sdk",
 name = "elasticsearch"
 version = "8.18.1"
 description = "Python client for Elasticsearch"
-optional = false
+optional = true
 python-versions = ">=3.8"
 groups = ["main"]
+markers = "extra == \"all\""
 files = [
     {file = "elasticsearch-8.18.1-py3-none-any.whl", hash = "sha256:1a8c8b5ec3ce5be88f96d2f898375671648e96272978bce0dee3137d9326aabb"},
     {file = "elasticsearch-8.18.1.tar.gz", hash = "sha256:998035f17a8c1fba7ae26b183dca797dcf95db86da6a7ecba56d31afc40f07c7"},
@@ -1460,21 +1462,6 @@ pyarrow = ["pyarrow (>=1)"]
 requests = ["requests (>=2.4.0,!=2.32.2,<3.0.0)"]
 vectorstore-mmr = ["numpy (>=1)", "simsimd (>=3)"]
 
-[[package]]
-name = "eval-type-backport"
-version = "0.2.2"
-description = "Like `typing._eval_type`, but lets older Python versions use newer typing features."
-optional = false
-python-versions = ">=3.8"
-groups = ["main"]
-files = [
-    {file = "eval_type_backport-0.2.2-py3-none-any.whl", hash = "sha256:cb6ad7c393517f476f96d456d0412ea80f0a8cf96f6892834cd9340149111b0a"},
-    {file = "eval_type_backport-0.2.2.tar.gz", hash = "sha256:f0576b4cf01ebb5bd358d02314d31846af5e07678387486e2c798af0e7d849c1"},
-]
-
-[package.extras]
-tests = ["pytest"]
-
 [[package]]
 name = "exceptiongroup"
 version = "1.3.0"
@@ -2734,20 +2721,21 @@ traitlets = "*"
 
 [[package]]
 name = "mcp"
-version = "1.9.4"
+version = "1.10.1"
 description = "Model Context Protocol SDK"
 optional = false
 python-versions = ">=3.10"
 groups = ["main"]
 files = [
-    {file = "mcp-1.9.4-py3-none-any.whl", hash = "sha256:7fcf36b62936adb8e63f89346bccca1268eeca9bf6dfb562ee10b1dfbda9dac0"},
-    {file = "mcp-1.9.4.tar.gz", hash = "sha256:cfb0bcd1a9535b42edaef89947b9e18a8feb49362e1cc059d6e7fc636f2cb09f"},
+    {file = "mcp-1.10.1-py3-none-any.whl", hash = "sha256:4d08301aefe906dce0fa482289db55ce1db831e3e67212e65b5e23ad8454b3c5"},
+    {file = "mcp-1.10.1.tar.gz", hash = "sha256:aaa0957d8307feeff180da2d9d359f2b801f35c0c67f1882136239055ef034c2"},
 ]
 
 [package.dependencies]
 anyio = ">=4.5"
 httpx = ">=0.27"
 httpx-sse = ">=0.4"
+jsonschema = ">=4.20.0"
 pydantic = ">=2.7.2,<3.0.0"
 pydantic-settings = ">=2.5.2"
 python-multipart = ">=0.0.9"
@@ -6956,11 +6944,11 @@ test = ["big-O", "importlib_resources ; python_version < \"3.9\"", "jaraco.funct
 type = ["pytest-mypy"]
 
 [extras]
-all = ["accelerate", "aiodocker", "asyncssh", "click", "httpx", "transformers", "vllm", "websockets"]
+all = ["accelerate", "aiodocker", "asyncssh", "click", "elasticsearch", "httpx", "transformers", "vllm", "websockets"]
 examples = ["aiodocker", "asyncssh", "click", "httpx", "websockets"]
 tracing = []
 
 [metadata]
 lock-version = "2.1"
 python-versions = "^3.10"
-content-hash = "3b7e5e8f839ebd658e8a20272b3e50342c2b6958c4960131a2eedc280b6bba61"
+content-hash = "70c9b2fdea3938a6ed1aa0a1316aaadf2d0a0633fbed8340bdf29d3f35337511"
diff --git a/pyproject.toml b/pyproject.toml
index 1a1373e..21909ba 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rigging"
-version = "3.0.0"
+version = "3.1.0"
 description = "LLM Interaction Framework"
 authors = ["Nick Landers <monoxgas@gmail.com>"]
 license = "MIT"
@@ -17,8 +17,6 @@ pydantic-xml = "^2.11.0"
 loguru = "^0.7.2"
 litellm = "^1.67.2"
 pandas = "^2.2.2"
-eval-type-backport = "^0.2.0"                           # For 3.9 future annotations
-elasticsearch = "^8.13.2"
 xmltodict = "^0.13.0"
 colorama = "^0.4.6"
 boto3 = "^1.35.0"
@@ -32,6 +30,7 @@ mcp = "^1.5.0"
 vllm = { version = "^0.5.0", optional = true }
 transformers = { version = "^4.41.0", optional = true }
 accelerate = { version = "^0.30.1", optional = true }
+elasticsearch = { version = "^8.13.2", optional = true }
 
 asyncssh = { version = "^2.14.2", optional = true }
 click = { version = "^8.1.7", optional = true }
@@ -52,6 +51,7 @@ all = [
     "aiodocker",
     "websockets",
     "logfire",
+    "elasticsearch",
 ]
 
 [tool.poetry.group.dev.dependencies]
@@ -128,20 +128,21 @@ extend-exclude = [
 [tool.ruff.lint]
 select = [ "ALL" ]
 ignore = [
-    "E501",     # line too long (we make best effort)
-    "TRY003",   # long messages in exception classes
-    "EM",       # picky message construction for exceptions
-    "C90",      # mccabe complexity
-    "A002",     # shadowing built-in
-    "D",        # docstrings
-    "ANN",      # annotations (handled by mypy)
-    "PLR0913",  # too many arguments
-    "ERA001",   # commented out code
-    "FIX002",   # contains todo, consider fixing
-    "TD002",    # TODO
-    "TD003",    # TODO
-    "PLR0911",  # too many return statements
-    "FBT003",   # boolean positional in function call
+    "E501",    # line too long (we make best effort)
+    "TRY003",  # long messages in exception classes
+    "EM",      # picky message construction for exceptions
+    "C90",     # mccabe complexity
+    "A002",    # shadowing built-in
+    "D",       # docstrings
+    "ANN",     # annotations (handled by mypy)
+    "PLR0913", # too many arguments
+    "ERA001",  # commented out code
+    "FIX002",  # contains todo, consider fixing
+    "TD002",   # TODO
+    "TD003",   # TODO
+    "PLR0911", # too many return statements
+    "FBT003",  # boolean positional in function call
+    "COM812",  # missing trailing comma in function call
 ]
 
 [tool.ruff.format]