diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e781547fc7563845ae818f2584a9467b2dc13c72..aa1db0850dc35f4fccadcde9b64184c6be4115df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
 stages:
   - test
   - publish
-  - trigger
 
 ####
 # Template: GitLab runner tags
@@ -17,8 +16,8 @@ stages:
   image: python:3.7.7
   extends: .dev-tags
   before_script:
-    - pip3 install poetry
-    - poetry config http-basic.database __token__ ${GITLAB_API_TOKEN}
+    - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
+    - . $HOME/.profile
     - poetry install
 
 ####
@@ -52,11 +51,6 @@ Example:
     - poetry run setup
     - poetry run example
 
-# Run Example:
-#   stage: test
-#   extends: .python
-#   script:
-#     - bash example.sh
 
 ####
 # Stage: publish
@@ -72,21 +66,3 @@ PyPi:
     - poetry build
     - poetry config http-basic.TherMod __token__ ${GITLAB_API_TOKEN}
     - poetry publish -r TherMod
-
-####
-# Stage: trigger
-####
-
-Trigger NCMws:
-  stage: trigger
-  image: node:latest
-  tags:
-    - development
-  only:
-    - master@ghsc/nshmp/ncm/TherMod
-  script:
-    - |
-      curl -X POST \
-        -F token=${NCM_TRIGGER_TOKEN} \
-        -F "ref=master" \
-        https://code.usgs.gov/api/v4/projects/3338/trigger/pipeline
diff --git a/poetry.lock b/poetry.lock
index ce82934aced1f8cc2bf3074af7770215fa452d9f..49ab630b9bf7685e41b873d04420414ce48b6ed5 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,35 +1,32 @@
 [[package]]
-category = "dev"
-description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 name = "appdirs"
+version = "1.4.4"
+description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+category = "dev"
 optional = false
 python-versions = "*"
-version = "1.4.4"
 
 [[package]]
-category = "dev"
-description = "An abstract syntax tree for Python with inference support."
 name = "astroid"
+version = "2.4.2"
+description = "An abstract syntax tree for Python with inference support."
+category = "dev"
 optional = false
 python-versions = ">=3.5"
-version = "2.4.2"
 
 [package.dependencies]
 lazy-object-proxy = ">=1.4.0,<1.5.0"
 six = ">=1.12,<2.0"
+typed-ast = {version = ">=1.4.0,<1.5", markers = "implementation_name == \"cpython\" and python_version < \"3.8\""}
 wrapt = ">=1.11,<2.0"
 
-[package.dependencies.typed-ast]
-python = "<3.8"
-version = ">=1.4.0,<1.5"
-
 [[package]]
-category = "dev"
-description = "Classes Without Boilerplate"
 name = "attrs"
+version = "19.3.0"
+description = "Classes Without Boilerplate"
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "19.3.0"
 
 [package.extras]
 azure-pipelines = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "pytest-azurepipelines"]
@@ -38,12 +35,12 @@ docs = ["sphinx", "zope.interface"]
 tests = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"]
 
 [[package]]
-category = "dev"
-description = "The uncompromising code formatter."
 name = "black"
+version = "19.10b0"
+description = "The uncompromising code formatter."
+category = "dev"
 optional = false
 python-versions = ">=3.6"
-version = "19.10b0"
 
 [package.dependencies]
 appdirs = "*"
@@ -58,98 +55,77 @@ typed-ast = ">=1.4.0"
 d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
-category = "main"
-description = "Python package for providing Mozilla's CA Bundle."
 name = "certifi"
+version = "2020.6.20"
+description = "Python package for providing Mozilla's CA Bundle."
+category = "main"
 optional = false
 python-versions = "*"
-version = "2020.6.20"
 
 [[package]]
-category = "main"
-description = "Time-handling functionality from netcdf4-python"
 name = "cftime"
+version = "1.2.1"
+description = "Time-handling functionality from netcdf4-python"
+category = "main"
 optional = false
 python-versions = "*"
-version = "1.2.1"
 
 [package.dependencies]
 numpy = "*"
 
 [[package]]
-category = "main"
-description = "Universal encoding detector for Python 2 and 3"
 name = "chardet"
+version = "3.0.4"
+description = "Universal encoding detector for Python 2 and 3"
+category = "main"
 optional = false
 python-versions = "*"
-version = "3.0.4"
 
 [[package]]
-category = "dev"
-description = "Composable command line interface toolkit"
 name = "click"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 version = "7.1.2"
-
-[[package]]
+description = "Composable command line interface toolkit"
 category = "dev"
-description = "Cross-platform colored terminal text."
-marker = "sys_platform == \"win32\""
-name = "colorama"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "0.4.3"
 
 [[package]]
-category = "main"
-description = "Download NCM database from ScienceBase"
-name = "database"
+name = "colorama"
+version = "0.4.3"
+description = "Cross-platform colored terminal text."
+category = "dev"
 optional = false
-python-versions = ">=3.6,<4.0"
-version = "0.1.0"
-
-[package.dependencies]
-pyyaml = ">=5.3.1,<6.0.0"
-sciencebasepy = ">=1.6.9,<2.0.0"
-
-[package.source]
-reference = "database"
-url = "https://code.usgs.gov/api/v4/projects/2294/packages/pypi/simple"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
-category = "dev"
-description = "the modular source code checker: pep8 pyflakes and co"
 name = "flake8"
+version = "3.8.3"
+description = "the modular source code checker: pep8 pyflakes and co"
+category = "dev"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
-version = "3.8.3"
 
 [package.dependencies]
+importlib-metadata = {version = "*", markers = "python_version < \"3.8\""}
 mccabe = ">=0.6.0,<0.7.0"
 pycodestyle = ">=2.6.0a1,<2.7.0"
 pyflakes = ">=2.2.0,<2.3.0"
 
-[package.dependencies.importlib-metadata]
-python = "<3.8"
-version = "*"
-
 [[package]]
-category = "main"
-description = "Internationalized Domain Names in Applications (IDNA)"
 name = "idna"
+version = "2.10"
+description = "Internationalized Domain Names in Applications (IDNA)"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.10"
 
 [[package]]
-category = "dev"
-description = "Read metadata from Python packages"
-marker = "python_version < \"3.8\""
 name = "importlib-metadata"
+version = "1.7.0"
+description = "Read metadata from Python packages"
+category = "dev"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
-version = "1.7.0"
 
 [package.dependencies]
 zipp = ">=0.5"
@@ -159,111 +135,128 @@ docs = ["sphinx", "rst.linker"]
 testing = ["packaging", "pep517", "importlib-resources (>=1.3)"]
 
 [[package]]
-category = "dev"
-description = "A Python utility / library to sort Python imports."
 name = "isort"
+version = "4.3.0"
+description = "A Python utility / library to sort Python imports."
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "4.3.0"
 
 [[package]]
-category = "dev"
-description = "A fast and thorough lazy object proxy."
 name = "lazy-object-proxy"
+version = "1.4.3"
+description = "A fast and thorough lazy object proxy."
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "1.4.3"
 
 [[package]]
-category = "dev"
-description = "McCabe checker, plugin for flake8"
 name = "mccabe"
+version = "0.6.1"
+description = "McCabe checker, plugin for flake8"
+category = "dev"
 optional = false
 python-versions = "*"
-version = "0.6.1"
 
 [[package]]
+name = "ncm-database"
+version = "0.2.0"
+description = "Download NCM database from ScienceBase"
 category = "main"
-description = "Provides an object-oriented python interface to the netCDF version 4 library."
+optional = false
+python-versions = ">=3.6,<4.0"
+
+[package.dependencies]
+pyyaml = ">=5.3.1,<6.0.0"
+sciencebasepy = ">=1.6.9,<2.0.0"
+
+[package.source]
+type = "legacy"
+url = "https://code.usgs.gov/api/v4/projects/2294/packages/pypi/simple"
+reference = "ncm-database"
+
+[[package]]
 name = "netcdf4"
+version = "1.5.4"
+description = "Provides an object-oriented python interface to the netCDF version 4 library."
+category = "main"
 optional = false
 python-versions = "*"
-version = "1.5.4"
 
 [package.dependencies]
 cftime = "*"
 numpy = ">=1.9"
 
 [[package]]
-category = "main"
-description = "NumPy is the fundamental package for array computing with Python."
 name = "numpy"
+version = "1.19.1"
+description = "NumPy is the fundamental package for array computing with Python."
+category = "main"
 optional = false
 python-versions = ">=3.6"
-version = "1.19.1"
 
 [[package]]
-category = "dev"
-description = "Utility library for gitignore style pattern matching of file paths."
 name = "pathspec"
+version = "0.8.0"
+description = "Utility library for gitignore style pattern matching of file paths."
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "0.8.0"
 
 [[package]]
-category = "dev"
-description = "Python style guide checker"
 name = "pycodestyle"
+version = "2.6.0"
+description = "Python style guide checker"
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.6.0"
 
 [[package]]
-category = "dev"
-description = "passive checker of Python programs"
 name = "pyflakes"
+version = "2.2.0"
+description = "passive checker of Python programs"
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.2.0"
 
 [[package]]
-category = "dev"
-description = "python code static checker"
 name = "pylint"
+version = "2.5.3"
+description = "python code static checker"
+category = "dev"
 optional = false
 python-versions = ">=3.5.*"
-version = "2.5.3"
 
 [package.dependencies]
 astroid = ">=2.4.0,<=2.5"
-colorama = "*"
+colorama = {version = "*", markers = "sys_platform == \"win32\""}
 isort = ">=4.2.5,<5"
 mccabe = ">=0.6,<0.7"
 toml = ">=0.7.1"
 
 [[package]]
-category = "main"
-description = "YAML parser and emitter for Python"
 name = "pyyaml"
+version = "5.3.1"
+description = "YAML parser and emitter for Python"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "5.3.1"
 
 [[package]]
-category = "dev"
-description = "Alternative regular expression module, to replace re."
 name = "regex"
+version = "2020.7.14"
+description = "Alternative regular expression module, to replace re."
+category = "dev"
 optional = false
 python-versions = "*"
-version = "2020.7.14"
 
 [[package]]
-category = "main"
-description = "Python HTTP for Humans."
 name = "requests"
+version = "2.24.0"
+description = "Python HTTP for Humans."
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "2.24.0"
 
 [package.dependencies]
 certifi = ">=2017.4.17"
@@ -276,58 +269,58 @@ security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"]
 socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"]
 
 [[package]]
-category = "main"
-description = "Python ScienceBase Utilities"
 name = "sciencebasepy"
+version = "1.6.9"
+description = "Python ScienceBase Utilities"
+category = "main"
 optional = false
 python-versions = "*"
-version = "1.6.9"
 
 [package.dependencies]
 requests = "*"
 
 [[package]]
-category = "main"
-description = "SciPy: Scientific Library for Python"
 name = "scipy"
+version = "1.5.2"
+description = "SciPy: Scientific Library for Python"
+category = "main"
 optional = false
 python-versions = ">=3.6"
-version = "1.5.2"
 
 [package.dependencies]
 numpy = ">=1.14.5"
 
 [[package]]
-category = "dev"
-description = "Python 2 and 3 compatibility utilities"
 name = "six"
+version = "1.15.0"
+description = "Python 2 and 3 compatibility utilities"
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
-version = "1.15.0"
 
 [[package]]
-category = "dev"
-description = "Python Library for Tom's Obvious, Minimal Language"
 name = "toml"
+version = "0.10.1"
+description = "Python Library for Tom's Obvious, Minimal Language"
+category = "dev"
 optional = false
 python-versions = "*"
-version = "0.10.1"
 
 [[package]]
-category = "dev"
-description = "a fork of Python 2 and 3 ast modules with type comment support"
 name = "typed-ast"
+version = "1.4.1"
+description = "a fork of Python 2 and 3 ast modules with type comment support"
+category = "dev"
 optional = false
 python-versions = "*"
-version = "1.4.1"
 
 [[package]]
-category = "main"
-description = "HTTP library with thread-safe connection pooling, file post, and more."
 name = "urllib3"
+version = "1.25.10"
+description = "HTTP library with thread-safe connection pooling, file post, and more."
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
-version = "1.25.10"
 
 [package.extras]
 brotli = ["brotlipy (>=0.6.0)"]
@@ -335,29 +328,29 @@ secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "pyOpenSSL (>=0
 socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"]
 
 [[package]]
-category = "dev"
-description = "Module for decorators, wrappers and monkey patching."
 name = "wrapt"
+version = "1.12.1"
+description = "Module for decorators, wrappers and monkey patching."
+category = "dev"
 optional = false
 python-versions = "*"
-version = "1.12.1"
 
 [[package]]
-category = "dev"
-description = "Backport of pathlib-compatible object wrapper for zip files"
-marker = "python_version < \"3.8\""
 name = "zipp"
+version = "3.1.0"
+description = "Backport of pathlib-compatible object wrapper for zip files"
+category = "dev"
 optional = false
 python-versions = ">=3.6"
-version = "3.1.0"
 
 [package.extras]
 docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
 testing = ["jaraco.itertools", "func-timeout"]
 
 [metadata]
-content-hash = "6bff35a7fc2e448b0eaf4babb7ca1c41a00f3e5325a4db678b5f9cc13769b22a"
+lock-version = "1.1"
 python-versions = "^3.6"
+content-hash = "1a1d4a2dc7edb5fc6a844eafedb52fdc282e354ec864edaaa18929c757d4c2d4"
 
 [metadata.files]
 appdirs = [
@@ -410,10 +403,6 @@ colorama = [
     {file = "colorama-0.4.3-py2.py3-none-any.whl", hash = "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff"},
     {file = "colorama-0.4.3.tar.gz", hash = "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"},
 ]
-database = [
-    {file = "database-0.1.0-py3-none-any.whl", hash = "sha256:cc0a5d4351c84412340b22b040a0769be6c7c7df8d1f8c43b5fcd6d46461c8b2"},
-    {file = "database-0.1.0.tar.gz", hash = "sha256:e230a5ce471b28a8ed7872d5ed0112589662f78266bd072a4d51a79f91551e2b"},
-]
 flake8 = [
     {file = "flake8-3.8.3-py2.py3-none-any.whl", hash = "sha256:15e351d19611c887e482fb960eae4d44845013cc142d42896e9862f775d8cf5c"},
     {file = "flake8-3.8.3.tar.gz", hash = "sha256:f04b9fcbac03b0a3e58c0ab3a0ecc462e023a9faf046d57794184028123aa208"},
@@ -457,6 +446,10 @@ mccabe = [
     {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"},
     {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"},
 ]
+ncm-database = [
+    {file = "ncm-database-0.2.0.tar.gz", hash = "sha256:d8db9be093dd8478f1727c446f9efd94f6a2cebcb31aa47139ab81bfa7b38737"},
+    {file = "ncm_database-0.2.0-py3-none-any.whl", hash = "sha256:06f649b49a14063aae0f1a900fe75206e9815f031bf78d96ed14053d0a3e82bd"},
+]
 netcdf4 = [
     {file = "netCDF4-1.5.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c4192fa17493783b409c726048e5297591b2938e19fe7ec8f2769c859290a404"},
     {file = "netCDF4-1.5.4-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a443c1523ec0449483e620ae17f92cfd59567bd50f8dfece6b7ee7a20e28249d"},
diff --git a/poetry.toml b/poetry.toml
index 8b276442814dfba51c7504dc5d302220b1ed6d03..49d49c40d2d2cbb61746390eb8b169708f5b18e8 100644
--- a/poetry.toml
+++ b/poetry.toml
@@ -1,5 +1,5 @@
 [repositories]
-[repositories.database]
+[repositories.ncm-database]
 url = "https://code.usgs.gov/api/v4/projects/2294/packages/pypi"
 
 [repositories.TherMod]
diff --git a/pyproject.toml b/pyproject.toml
index cc9a7a86d2d01ffa2f7fd87d5ffa8a51aa6a2992..629cb68494582e438bf585ef1f4996d9780098eb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ python = "^3.6"
 netCDF4 = "^1.5.4"
 numpy = "^1.19.1"
 scipy = "^1.5.2"
-database = "^0.1.0"
+ncm-database = "^0.2.0"
 
 [tool.poetry.dev-dependencies]
 pylint = "^2.5.3"
@@ -20,6 +20,7 @@ isort = "4.3"
 
 [tool.poetry.scripts]
 setup = "scripts:setup"
+database = "scripts:database"
 thermod = "scripts:thermod"
 example = "scripts:example"
 help = "scripts:help"
@@ -55,6 +56,6 @@ requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"
 
 [[tool.poetry.source]]
-name = "database"
+name = "ncm-database"
 url = "https://code.usgs.gov/api/v4/projects/2294/packages/pypi/simple"
 secondary = true
diff --git a/scripts.py b/scripts.py
index 9dafdce7398bbfac825457a1e349c5ee71b90a90..30c38488b14ced7b752bf1e0d739bbae28f0ab59 100644
--- a/scripts.py
+++ b/scripts.py
@@ -12,8 +12,12 @@ def setup():
     # Install database and dependencies
     os.system("git config core.hookspath .githooks")
     check_call(["poetry", "install"])
+    database()
+
+
+def database():
     print("\nDownloading TherMod database\n")
-    check_call(["python", "-m", "database", "--TherMod", "--clean"])
+    check_call(["python", "-m", "ncm_database", "--TherMod", "--clean"])
 
 
 def thermod():
diff --git a/thermod/ther_mod.py b/thermod/ther_mod.py
index 593ed4430fc4dd45a15bd17bf531ff4a7f3e87f8..a18ea8a98c4097f91f13163222711bd311e2f0f5 100644
--- a/thermod/ther_mod.py
+++ b/thermod/ther_mod.py
@@ -3,7 +3,7 @@ import os
 import sys
 
 import numpy as np
-from database import database_directory
+from ncm_database import database_directory
 from netCDF4 import Dataset
 from scipy import interpolate as interp
 from scipy import special as sp