diff --git a/docs/pages/Site-Specification.md b/docs/pages/Site-Specification.md
index 2032f23752936ca1a11a8572a473f6e6024ee3ff..544130a53fc138a8384a7c5155b3058da61c1430 100644
--- a/docs/pages/Site-Specification.md
+++ b/docs/pages/Site-Specification.md
@@ -15,9 +15,9 @@ defaults are used:
 ```text
     name: Unnamed
     vs30: 760.0
-   vsInf: true
     z1p0: null (GMM will use default basin depth model)
     z2p5: null (GMM will use default basin depth model)
+    zSed: null
 ```
 
 For basin depth parameters `z1p0` and `z2p5`, a `null` value indicates that a GMM should use
@@ -27,7 +27,7 @@ it's 'default' basin depth scale factor, which is usually included in it's Vs30
 
 * Header row must identify columns.
 * Valid and [optional] column names are:
-  `[name,] lon, lat [, vs30] [, vsInf] [, z1p0] [, z2p5]`  
+  `[name,] lon, lat [, vs30] [, z1p0] [, z2p5]`  
 * At a minimum, `lon` and `lat` must be defined.
 * Columns can be in any order and any missing fields will be populated with the default values
   listed above.
@@ -57,7 +57,6 @@ A site list is expected as a `FeatureCollection` of `Point` features. For exampl
       "properties": {
         "title": "Oakland CA",
         "vs30": 760.0,
-        "vsInf": true,
         "z1p0": 0.048,
         "z2p5": 0.607
       }
diff --git a/etc/matlab/gmmExample.m b/etc/matlab/gmmExample.m
index 22cbd36331752982ce832b4e6d7fd45e1caf1376..ef643803018d3a8fd90b178486a7ff0a4de362a7 100644
--- a/etc/matlab/gmmExample.m
+++ b/etc/matlab/gmmExample.m
@@ -49,7 +49,6 @@ input.zTop  =   1.0; % in km
 input.zHyp  =   6.0; % in km
 input.rake  =   0.0; % in degrees
 input.vs30  = 760.0; % in m/s
-input.vsInf =  true; % boolean
 input.z2p5  =   NaN; % in km; NaN triggers default basin depth model
 input.z1p0  =   NaN; % in km; NaN triggers default basin depth model
 
diff --git a/etc/matlab/response_spectra.m b/etc/matlab/response_spectra.m
index a0943694b3c23eea527bee0958e589598ca1070c..bb9bc73c7228d8706d13fcd231d4ed37e3d64a38 100644
--- a/etc/matlab/response_spectra.m
+++ b/etc/matlab/response_spectra.m
@@ -31,13 +31,12 @@ rJB = 10;
 rRup = 10.012;
 rX = 10;
 vs30 = 760;
-vsInf = true;
 zHyp = 7.5;
 zTop = 0.5;
 
 url = createUrl( ...
     urlbase, gmms, ...
-    Mw, dip, rake, width, rJB, rRup, rX, vs30, vsInf, zHyp, zTop);
+    Mw, dip, rake, width, rJB, rRup, rX, vs30, zHyp, zTop);
 %% Call web service
 
 % Open a browser window with the web service URL to show the JSON response
@@ -116,7 +115,7 @@ set(l, 'Interpreter', 'none')
 
 function url = createUrl( ...
     urlbase, gmms, ...
-    Mw, dip, rake, width, rJB, rRup, rX, vs30, vsInf, zHyp, zTop)
+    Mw, dip, rake, width, rJB, rRup, rX, vs30, zHyp, zTop)
 
     url = urlbase;
     for i = 1:size(gmms, 2)
@@ -135,7 +134,6 @@ function url = createUrl( ...
         "&rRup=" + num2str(rRup) + ...
         "&rX=" + num2str(rX) + ...
         "&vs30=" + num2str(vs30) + ...
-        "&vsInf=" + string(vsInf) + ...
         "&zHyp=" + num2str(zHyp) + ...
         "&zTop=" + num2str(zTop);
-end
\ No newline at end of file
+end
diff --git a/etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json b/etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json
index 3425f0a5a3a608d9800b9d92761c45123a173e31..f04c7190b45da51b7725acabb77c9f279d5f4ec7 100644
--- a/etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json
+++ b/etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json
@@ -1,3 +1,3 @@
 [
-  { "id": "ASK_14_BASE", "weight": 1.0 }
+  { "id": "ASK_14_VS30_MEASURED", "weight": 1.0 }
 ]
diff --git a/etc/peer/models/Set2-Case2a-fast/sites.csv b/etc/peer/models/Set2-Case2a-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2a-fast/sites.csv
+++ b/etc/peer/models/Set2-Case2a-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json b/etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json
index 3425f0a5a3a608d9800b9d92761c45123a173e31..f04c7190b45da51b7725acabb77c9f279d5f4ec7 100644
--- a/etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json
+++ b/etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json
@@ -1,3 +1,3 @@
 [
-  { "id": "ASK_14_BASE", "weight": 1.0 }
+  { "id": "ASK_14_VS30_MEASURED", "weight": 1.0 }
 ]
diff --git a/etc/peer/models/Set2-Case2a/sites.csv b/etc/peer/models/Set2-Case2a/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2a/sites.csv
+++ b/etc/peer/models/Set2-Case2a/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2b-fast/sites.csv b/etc/peer/models/Set2-Case2b-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2b-fast/sites.csv
+++ b/etc/peer/models/Set2-Case2b-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2b/sites.csv b/etc/peer/models/Set2-Case2b/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2b/sites.csv
+++ b/etc/peer/models/Set2-Case2b/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2c-fast/sites.csv b/etc/peer/models/Set2-Case2c-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2c-fast/sites.csv
+++ b/etc/peer/models/Set2-Case2c-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2c/sites.csv b/etc/peer/models/Set2-Case2c/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2c/sites.csv
+++ b/etc/peer/models/Set2-Case2c/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json b/etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json
index 621c1ab1d988df52a31b7e0c0f55c6cf41de9d6d..b6df255630c09b5c554c1a8c55d138c3913bd9e9 100644
--- a/etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json
+++ b/etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json
@@ -1,3 +1,3 @@
 [
-  { "id": "CY_14_BASE", "weight": 1.0 }
+  { "id": "CY_14_VS30_MEASURED", "weight": 1.0 }
 ]
diff --git a/etc/peer/models/Set2-Case2d-fast/sites.csv b/etc/peer/models/Set2-Case2d-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2d-fast/sites.csv
+++ b/etc/peer/models/Set2-Case2d-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2d/active-crust/gmm-tree.json b/etc/peer/models/Set2-Case2d/active-crust/gmm-tree.json
index 621c1ab1d988df52a31b7e0c0f55c6cf41de9d6d..d0c44e6e4d4abb90cd03d7f57ac29f3171c8845e 100644
--- a/etc/peer/models/Set2-Case2d/active-crust/gmm-tree.json
+++ b/etc/peer/models/Set2-Case2d/active-crust/gmm-tree.json
@@ -1,3 +1,3 @@
 [
-  { "id": "CY_14_BASE", "weight": 1.0 }
+  { "id": "CY_14_BASE_VS30_MEASURED", "weight": 1.0 }
 ]
diff --git a/etc/peer/models/Set2-Case2d/sites.csv b/etc/peer/models/Set2-Case2d/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2d/sites.csv
+++ b/etc/peer/models/Set2-Case2d/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3a-fast/sites.csv b/etc/peer/models/Set2-Case3a-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3a-fast/sites.csv
+++ b/etc/peer/models/Set2-Case3a-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3a/sites.csv b/etc/peer/models/Set2-Case3a/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3a/sites.csv
+++ b/etc/peer/models/Set2-Case3a/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3b-fast/sites.csv b/etc/peer/models/Set2-Case3b-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3b-fast/sites.csv
+++ b/etc/peer/models/Set2-Case3b-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3b/sites.csv b/etc/peer/models/Set2-Case3b/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3b/sites.csv
+++ b/etc/peer/models/Set2-Case3b/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3c-fast/sites.csv b/etc/peer/models/Set2-Case3c-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3c-fast/sites.csv
+++ b/etc/peer/models/Set2-Case3c-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3c/sites.csv b/etc/peer/models/Set2-Case3c/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3c/sites.csv
+++ b/etc/peer/models/Set2-Case3c/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3d-fast/sites.csv b/etc/peer/models/Set2-Case3d-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3d-fast/sites.csv
+++ b/etc/peer/models/Set2-Case3d-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3d/sites.csv b/etc/peer/models/Set2-Case3d/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3d/sites.csv
+++ b/etc/peer/models/Set2-Case3d/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case4a-fast/sites.csv b/etc/peer/models/Set2-Case4a-fast/sites.csv
index 37f17e6637586ca5384a572aaf78a4731ec480f6..82ec41bbd5f5073c5b5af52c80218a2a7d002c7b 100644
--- a/etc/peer/models/Set2-Case4a-fast/sites.csv
+++ b/etc/peer/models/Set2-Case4a-fast/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault5-Site1,-65.00900, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault5-Site1,-65.00900, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case4a/sites.csv b/etc/peer/models/Set2-Case4a/sites.csv
index 37f17e6637586ca5384a572aaf78a4731ec480f6..82ec41bbd5f5073c5b5af52c80218a2a7d002c7b 100644
--- a/etc/peer/models/Set2-Case4a/sites.csv
+++ b/etc/peer/models/Set2-Case4a/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault5-Site1,-65.00900, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault5-Site1,-65.00900, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case4b-fast/sites.csv b/etc/peer/models/Set2-Case4b-fast/sites.csv
index 37f17e6637586ca5384a572aaf78a4731ec480f6..82ec41bbd5f5073c5b5af52c80218a2a7d002c7b 100644
--- a/etc/peer/models/Set2-Case4b-fast/sites.csv
+++ b/etc/peer/models/Set2-Case4b-fast/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault5-Site1,-65.00900, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault5-Site1,-65.00900, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case4b/sites.csv b/etc/peer/models/Set2-Case4b/sites.csv
index 37f17e6637586ca5384a572aaf78a4731ec480f6..82ec41bbd5f5073c5b5af52c80218a2a7d002c7b 100644
--- a/etc/peer/models/Set2-Case4b/sites.csv
+++ b/etc/peer/models/Set2-Case4b/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault5-Site1,-65.00900, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault5-Site1,-65.00900, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case5a/sites.csv b/etc/peer/models/Set2-Case5a/sites.csv
index a89656bccce20189ff44b4224bc46e1010589184..6d1f6f186dd52882cf8c4d4e6ce33cffd28d2739 100644
--- a/etc/peer/models/Set2-Case5a/sites.csv
+++ b/etc/peer/models/Set2-Case5a/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault6-Site1,-65.13490, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault6-Site1,-65.13490, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case5b/sites.csv b/etc/peer/models/Set2-Case5b/sites.csv
index a89656bccce20189ff44b4224bc46e1010589184..6d1f6f186dd52882cf8c4d4e6ce33cffd28d2739 100644
--- a/etc/peer/models/Set2-Case5b/sites.csv
+++ b/etc/peer/models/Set2-Case5b/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault6-Site1,-65.13490, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault6-Site1,-65.13490, 0.00000,760,0.048,0.607
diff --git a/gradle.properties b/gradle.properties
index 935b741dd56a4eb856d3e652512bd91a6e3106d9..04aad5c2edb660200c6760af7b5b14884839d76b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ micronautVersion = 3.2.3
 micronautRxVersion = 2.1.1
 nodePluginVersion = 3.0.1
 nodeVersion = 16.3.0
-nshmpLibVersion = 1.2.2
+nshmpLibVersion = 1.2.7
 nshmpWsUtilsVersion = 0.3.11
 openApiVersion = 4.0.0
 shadowVersion = 7.1.2
diff --git a/package-lock.json b/package-lock.json
index dc72624ba1f9b5786382c12356add218736ccc4b..fd03b78e351745759edce1f4fbeb016a832b3d8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "nshmp-haz",
       "version": "2.0.0",
       "devDependencies": {
         "markdownlint-cli": "^0.31.1",
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
index c98ce87010fdb04c897227cfe35d88ebf975834d..0c726e1992079a3b2c71dea971cf165be12eec85 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
@@ -70,34 +70,34 @@ public class DisaggCalc {
   /**
    * Entry point for the disaggregation of probabilisitic seismic hazard.
    *
-   * <p>Two approaches to disaggregation of seimic hazard are possible with this
-   * application. In the first approach, the 'sites' file is the same as it
+   * <p> Two approaches to disaggregation of seimic hazard are possible with
+   * this application. In the first approach, the 'sites' file is the same as it
    * would be for a hazard calculation, and disaggregation is performed for all
    * configured intensity measures at the 'returnPeriod' (in years) of interest
    * specified in the config file (default = 2475 years, equivalent to 2% in 50
    * years).
    *
-   * <p>In the second approach, the sites file includes columns for each
+   * <p> In the second approach, the sites file includes columns for each
    * spectral period or other intensity measure and the target ground motion
    * level to disaggregate for each. For example, the target values could be a
    * risk-targeted spectral accelerations, or they could be ground motion levels
    * precomputed for a specific return period.
    *
-   * <p>Note that the first approach will do the full hazard calculation and
+   * <p> Note that the first approach will do the full hazard calculation and
    * compute hazard curves from which the target disaggregation ground motion
    * level will be determined. In the second approach, the ground motion targets
    * are known and the time consuming hazard curve calculation can be avoided.
    *
-   * <p>Please refer to the nshmp-haz <a
+   * <p> Please refer to the nshmp-haz <a
    * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/docs">
    * docs</a> for comprehensive descriptions of source models, configuration
    * files, site files, and hazard calculations.
    *
-   * @see <a
-   *      href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Building-&-Running.md">
+   * @see <a href=
+   *      "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Building-&-Running.md">
    *      nshmp-haz Building & Running</a>
-   * @see <a
-   *      href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples">
+   * @see <a href=
+   *      "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples">
    *      example calculations</a>
    */
   public static void main(String[] args) {
@@ -224,7 +224,6 @@ public class DisaggCalc {
       Site.Key.LAT,
       Site.Key.LON,
       Site.Key.VS30,
-      Site.Key.VS_INF,
       Site.Key.Z1P0,
       Site.Key.Z2P5);
 
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/meta/MetaUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/www/meta/MetaUtil.java
index a1a2c068400b60b52532e01acb7d912b1dbde6e0..9c653fbea8f7f14180318e92b4b55a48cc4d7c80 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/meta/MetaUtil.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/meta/MetaUtil.java
@@ -39,7 +39,6 @@ public final class MetaUtil {
       JsonObject json = new JsonObject();
       json.add("location", loc);
       json.addProperty("vs30", site.vs30());
-      json.addProperty("vsInferred", site.vsInferred());
       json.addProperty("z1p0", Double.isNaN(site.z1p0()) ? null : site.z1p0());
       json.addProperty("z2p5", Double.isNaN(site.z2p5()) ? null : site.z2p5());
 
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeatureCollectionService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeatureCollectionService.java
new file mode 100644
index 0000000000000000000000000000000000000000..eb7bf05e76eb6edf929f1ed00cfe26dcada4cf2b
--- /dev/null
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeatureCollectionService.java
@@ -0,0 +1,51 @@
+package gov.usgs.earthquake.nshmp.www.source;
+
+import com.google.gson.JsonElement;
+
+import gov.usgs.earthquake.nshmp.geo.json.FeatureCollection;
+import gov.usgs.earthquake.nshmp.www.HazVersion;
+import gov.usgs.earthquake.nshmp.www.ResponseBody;
+import gov.usgs.earthquake.nshmp.www.ResponseMetadata;
+import gov.usgs.earthquake.nshmp.www.ServletUtil;
+
+import io.micronaut.http.HttpRequest;
+import jakarta.inject.Singleton;
+
+/**
+ * Handle feature collection services.
+ *
+ * @author U.S. Geological Survey
+ */
+@Singleton
+public class FeatureCollectionService {
+
+  static String handleFeatureCollection(
+      HttpRequest<?> http,
+      String name,
+      FeatureCollection fc,
+      Boolean raw) {
+    RequestData requestData = new RequestData(raw);
+
+    if (requestData.raw) {
+      return fc.toJson();
+    } else {
+      var response = ResponseBody.<RequestData, JsonElement> success()
+          .name(name)
+          .url(http.getUri().toString())
+          .metadata(new ResponseMetadata(HazVersion.appVersions()))
+          .request(requestData)
+          .response(fc.toJsonTree())
+          .build();
+
+      return ServletUtil.GSON2.toJson(response);
+    }
+  }
+
+  static class RequestData {
+    public boolean raw;
+
+    RequestData(Boolean raw) {
+      this.raw = raw == null ? false : raw;
+    }
+  }
+}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java
index 9c854547bc87a29b1bdbf37b61224db198708ce3..3ff3662e707c693096e788e8cc15fc4ac3b6ef53 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java
@@ -19,8 +19,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.inject.Inject;
 
 /**
- * Micronaut web service controller for the GeoJSON features in the current
- * installed model.
+ * Micronaut web service controller for the GeoJSON features in the installed
+ * model.
  *
  * <p>See src/main/resources/application.yml nshmp-haz.model-path for installed
  * model.
@@ -39,6 +39,13 @@ public class FeaturesController {
   @Inject
   private NshmpMicronautServlet servlet;
 
+  /*
+   * Not sure we need metadata for this. Issue #542 describes the various groups
+   * that could be supported. However instead of 'all' one could consider just
+   * having no argument such that the root endpoint path would just return all
+   * features.
+   */
+
   @Operation(
       summary = "Source model logic tree listing",
       description = "Returns the ID's of logic trees in the model",
@@ -50,6 +57,7 @@ public class FeaturesController {
           schema = @Schema(
               implementation = MetadataResponse.class)))
   @Get
+  @Deprecated
   public HttpResponse<String> doGetMetadata(HttpRequest<?> http) {
     try {
       return FeaturesService.getMetadata(http);
@@ -74,6 +82,7 @@ public class FeaturesController {
       content = @Content(
           schema = @Schema(implementation = TreeResponse.class)))
   @Get(uri = "/{id}")
+  @Deprecated
   public HttpResponse<String> doGetTree(HttpRequest<?> http, @PathVariable int id) {
     try {
       return FeaturesService.getTree(http, id);
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesService.java
index 786bafca4b3d0f955e91accaf7b6de3baa88d8ad..f21bf57dea1a34c4f0b406868b12005cdfb6004c 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesService.java
@@ -26,6 +26,7 @@ public class FeaturesService {
   static final String NAME = "Model Features";
   static final Logger LOG = LoggerFactory.getLogger(FeaturesService.class);
 
+  @Deprecated
   public static HttpResponse<String> getMetadata(HttpRequest<?> request) {
     var url = request.getUri().toString();
     var metadata = new Metadata(ServletUtil.model());
@@ -39,6 +40,7 @@ public class FeaturesService {
     return HttpResponse.ok(ServletUtil.GSON2.toJson(response));
   }
 
+  @Deprecated
   public static HttpResponse<String> getTree(HttpRequest<?> request, Integer id) {
     var url = request.getUri().toString();
     var features = Models.features(ServletUtil.model(), id);
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesController.java
similarity index 52%
rename from src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesController.java
rename to src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesController.java
index 971c66e80bbc529918c3c7b3427bbf83235870ce..6fd72aafedb76bcb97304a5e5f319144cdd9d1f6 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesController.java
@@ -3,8 +3,8 @@ package gov.usgs.earthquake.nshmp.www.source;
 import gov.usgs.earthquake.nshmp.www.NshmpMicronautServlet;
 import gov.usgs.earthquake.nshmp.www.ResponseBody;
 import gov.usgs.earthquake.nshmp.www.ServletUtil;
-import gov.usgs.earthquake.nshmp.www.source.SourceLogicTreesService.Metadata;
-import gov.usgs.earthquake.nshmp.www.source.SourceLogicTreesService.RequestData;
+import gov.usgs.earthquake.nshmp.www.source.LogicTreesService.Metadata;
+import gov.usgs.earthquake.nshmp.www.source.LogicTreesService.RequestData;
 
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
@@ -19,8 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.inject.Inject;
 
 /**
- * Micronaut web service controller for the source logic trees in the current
- * installed model.
+ * Micronaut web service controller for the source logic trees in the installed
+ * model. These endpoints return the GeoJSON features and Magnitude frequency
+ * distributions associated with the branches in a source logic tree.
  *
  * <p>See src/main/resources/application.yml nshmp-haz.model-path for installed
  * model.
@@ -31,17 +32,17 @@ import jakarta.inject.Inject;
  * @author U.S. Geological Survey
  */
 @Tag(
-    name = SourceLogicTreesService.NAME,
+    name = LogicTreesService.NAME,
     description = "USGS NSHM source model logic tree service")
 @Controller("/trees")
-public class SourceLogicTreesController {
+public class LogicTreesController {
 
   @Inject
   private NshmpMicronautServlet servlet;
 
   @Operation(
       summary = "Source model logic tree listing",
-      description = "Returns the ID's of logic trees in the model",
+      description = "Returns the IDs of logic trees in the model",
       operationId = "source-tree-metadata")
   @ApiResponse(
       description = "Source logic tree metadata",
@@ -52,11 +53,11 @@ public class SourceLogicTreesController {
   @Get
   public HttpResponse<String> doGetMetadata(HttpRequest<?> http) {
     try {
-      return SourceLogicTreesService.getMetadata(http);
+      return LogicTreesService.getMetadata(http);
     } catch (Exception e) {
       return ServletUtil.error(
-          SourceLogicTreesService.LOG, e,
-          SourceLogicTreesService.NAME,
+          LogicTreesService.LOG, e,
+          LogicTreesService.NAME,
           http.getUri().toString());
     }
   }
@@ -67,20 +68,69 @@ public class SourceLogicTreesController {
   @Operation(
       summary = "Get a source model MFD logic tree",
       description = "Returns the logic tree of MFDs for the supplied ID",
-      operationId = "source-tree-mfds")
+      operationId = "source-tree-mfds-old")
   @ApiResponse(
       description = "NSHM source logic tree",
       responseCode = "200",
       content = @Content(
           schema = @Schema(implementation = TreeResponse.class)))
   @Get(uri = "/{id}")
+  @Deprecated
   public HttpResponse<String> doGetTree(HttpRequest<?> http, @PathVariable int id) {
     try {
-      return SourceLogicTreesService.getTree(http, id);
+      return LogicTreesService.getMfdTree(http, id);
+    } catch (Exception e) {
+      return ServletUtil.error(
+          LogicTreesService.LOG, e,
+          LogicTreesService.NAME,
+          http.getUri().toString());
+    }
+  }
+
+  /**
+   * @param id Source logic tree id
+   */
+  @Operation(
+      summary = "Get a source model feature logic tree",
+      description = "Returns the logic tree of features for the supplied ID",
+      operationId = "source-tree-features")
+  @ApiResponse(
+      description = "NSHM source logic tree",
+      responseCode = "200",
+      content = @Content(
+          schema = @Schema(implementation = TreeResponse.class)))
+  @Get(uri = "/features/{id}")
+  public HttpResponse<String> doGetFeatureTree(HttpRequest<?> http, @PathVariable int id) {
+    try {
+      return LogicTreesService.getFeatureTree(http, id);
+    } catch (Exception e) {
+      return ServletUtil.error(
+          LogicTreesService.LOG, e,
+          LogicTreesService.NAME,
+          http.getUri().toString());
+    }
+  }
+
+  /**
+   * @param id Source logic tree id
+   */
+  @Operation(
+      summary = "Get a source model MFD logic tree",
+      description = "Returns the logic tree of MFDs for the supplied ID",
+      operationId = "source-tree-mfds")
+  @ApiResponse(
+      description = "NSHM source logic tree",
+      responseCode = "200",
+      content = @Content(
+          schema = @Schema(implementation = TreeResponse.class)))
+  @Get(uri = "/mfds/{id}")
+  public HttpResponse<String> doGetMfdTree(HttpRequest<?> http, @PathVariable int id) {
+    try {
+      return LogicTreesService.getMfdTree(http, id);
     } catch (Exception e) {
       return ServletUtil.error(
-          SourceLogicTreesService.LOG, e,
-          SourceLogicTreesService.NAME,
+          LogicTreesService.LOG, e,
+          LogicTreesService.NAME,
           http.getUri().toString());
     }
   }
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesService.java
similarity index 69%
rename from src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesService.java
rename to src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesService.java
index 3f0fe6541bf47166bda144fe12484924935ffe6c..1a679b0d96e9c296492537a2bd64baf5a2283fe3 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesService.java
@@ -16,15 +16,15 @@ import io.micronaut.http.HttpResponse;
 import jakarta.inject.Singleton;
 
 /**
- * Source model tree handler for {@link SourceLogicTreesController}
+ * Source model tree handler for {@link LogicTreesController}
  *
  * @author U.S. Geological Survey
  */
 @Singleton
-public class SourceLogicTreesService {
+public class LogicTreesService {
 
   static final String NAME = "Model Logic Trees";
-  static final Logger LOG = LoggerFactory.getLogger(SourceLogicTreesService.class);
+  static final Logger LOG = LoggerFactory.getLogger(LogicTreesService.class);
 
   public static HttpResponse<String> getMetadata(HttpRequest<?> request) {
     var url = request.getUri().toString();
@@ -39,16 +39,30 @@ public class SourceLogicTreesService {
     return HttpResponse.ok(ServletUtil.GSON2.toJson(response));
   }
 
-  public static HttpResponse<String> getTree(HttpRequest<?> request, Integer id) {
+  public static HttpResponse<String> getFeatureTree(HttpRequest<?> request, Integer id) {
     var url = request.getUri().toString();
-    var tree = Models.tree(ServletUtil.model(), id);
+    var featureTree = Models.features(ServletUtil.model(), id);
     var requestData = new RequestData(id);
     var response = ResponseBody.success()
         .name(NAME)
         .url(url)
         .metadata(new ResponseMetadata(HazVersion.appVersions()))
         .request(requestData)
-        .response(tree)
+        .response(featureTree)
+        .build();
+    return HttpResponse.ok(ServletUtil.GSON2.toJson(response));
+  }
+
+  public static HttpResponse<String> getMfdTree(HttpRequest<?> request, Integer id) {
+    var url = request.getUri().toString();
+    var mfdTree = Models.tree(ServletUtil.model(), id);
+    var requestData = new RequestData(id);
+    var response = ResponseBody.success()
+        .name(NAME)
+        .url(url)
+        .metadata(new ResponseMetadata(HazVersion.appVersions()))
+        .request(requestData)
+        .response(mfdTree)
         .build();
     return HttpResponse.ok(ServletUtil.GSON2.toJson(response));
   }
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/MapController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/MapController.java
new file mode 100644
index 0000000000000000000000000000000000000000..dffe697935206db22071c661dbfaeb25e47d3657
--- /dev/null
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/MapController.java
@@ -0,0 +1,94 @@
+package gov.usgs.earthquake.nshmp.www.source;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.usgs.earthquake.nshmp.geo.json.FeatureCollection;
+import gov.usgs.earthquake.nshmp.www.NshmpMicronautServlet;
+import gov.usgs.earthquake.nshmp.www.ResponseBody;
+import gov.usgs.earthquake.nshmp.www.ServletUtil;
+import gov.usgs.earthquake.nshmp.www.source.FeatureCollectionService.RequestData;
+
+import io.micronaut.core.annotation.Nullable;
+import io.micronaut.http.HttpRequest;
+import io.micronaut.http.HttpResponse;
+import io.micronaut.http.MediaType;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.PathVariable;
+import io.micronaut.http.annotation.QueryValue;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Inject;
+
+/**
+ * Micronaut web service controller for the GeoJSON map boundary associated with
+ * the current installed model.
+ *
+ * <p>See src/main/resources/application.yml nshmp-haz.model-path for installed
+ * model.
+ *
+ * <p>To run the Micronaut jar file with a model: java -jar
+ * path/to/nshmp-haz.jar --model=<path/to/model>
+ *
+ * @author U.S. Geological Survey
+ */
+@Tag(
+    name = MapController.NAME,
+    description = "NSHM map boundary")
+@Controller("/map")
+public class MapController {
+  static final Logger LOG = LoggerFactory.getLogger(MapController.class);
+  static final String NAME = "Map Boundary";
+
+  @Inject
+  private NshmpMicronautServlet servlet;
+
+  @Operation(
+      summary = "Get the GeoJSON map boundary",
+      description = "Returns the feature collection of NSHM map boundary",
+      operationId = "map")
+  @ApiResponse(
+      description = "NSHM map boundary",
+      responseCode = "200",
+      content = @Content(
+          schema = @Schema(implementation = Response.class)))
+  @Get(uri = "{?raw}", produces = MediaType.APPLICATION_JSON)
+  public HttpResponse<String> doGet(
+      HttpRequest<?> http,
+      @QueryValue(defaultValue = "false") @Nullable Boolean raw) {
+    try {
+      FeatureCollection map = ServletUtil.model().map().orElseThrow();
+      return HttpResponse
+          .ok(FeatureCollectionService.handleFeatureCollection(http, NAME, map, raw));
+    } catch (Exception e) {
+      return ServletUtil.error(
+          LOG,
+          e,
+          NAME,
+          http.getUri().toString());
+    }
+  }
+
+  @Operation(
+      summary = "Get the GeoJSON map boundary",
+      description = "Returns the feature collection of NSHM map boundary",
+      operationId = "map-slash")
+  @ApiResponse(
+      description = "NSHM map boundary",
+      responseCode = "200",
+      content = @Content(
+          schema = @Schema(implementation = Response.class)))
+  @Get(uri = "/{raw}", produces = MediaType.APPLICATION_JSON)
+  public HttpResponse<String> doGetSlash(
+      HttpRequest<?> http,
+      @PathVariable(defaultValue = "false") @Nullable Boolean raw) {
+    return doGet(http, raw);
+  }
+
+  // Swagger schema
+  private static class Response extends ResponseBody<RequestData, FeatureCollection> {};
+}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java
index dff841186857e4e6a5daec377d6fa986041ab7b2..6cedce847c694e6243773f74bde87e91ba7be2f5 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java
@@ -10,7 +10,6 @@ import java.util.stream.DoubleStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import gov.usgs.earthquake.nshmp.geo.json.FeatureCollection;
 import gov.usgs.earthquake.nshmp.gmm.Gmm;
 import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass;
 import gov.usgs.earthquake.nshmp.model.HazardModel;
@@ -74,8 +73,6 @@ public class SourceService {
     final Map<NehrpSiteClass, Double> siteClasses;
     final List<Parameter> imts;
     final List<Double> bounds;
-    final FeatureCollection map;
-    final FeatureCollection sites;
 
     public SourceModel(HazardModel model) {
       name = model.name();
@@ -89,8 +86,6 @@ public class SourceService {
           .map(imt -> new Parameter(ServletUtil.imtShortLabel(imt), imt.name()))
           .collect(toList());
       bounds = DoubleStream.of(model.bounds().toArray()).boxed().collect(toList());
-      map = model.map().orElseThrow();
-      sites = model.sites().orElseThrow();
     }
 
     public String getName() {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/TestSitesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/TestSitesController.java
new file mode 100644
index 0000000000000000000000000000000000000000..45fa30f2fff3a988bf69c2a7f4a33afd00c44434
--- /dev/null
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/TestSitesController.java
@@ -0,0 +1,94 @@
+package gov.usgs.earthquake.nshmp.www.source;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.usgs.earthquake.nshmp.geo.json.FeatureCollection;
+import gov.usgs.earthquake.nshmp.www.NshmpMicronautServlet;
+import gov.usgs.earthquake.nshmp.www.ResponseBody;
+import gov.usgs.earthquake.nshmp.www.ServletUtil;
+import gov.usgs.earthquake.nshmp.www.source.FeatureCollectionService.RequestData;
+
+import io.micronaut.core.annotation.Nullable;
+import io.micronaut.http.HttpRequest;
+import io.micronaut.http.HttpResponse;
+import io.micronaut.http.MediaType;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.PathVariable;
+import io.micronaut.http.annotation.QueryValue;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Inject;
+
+/**
+ * Micronaut web service controller for the GeoJSON test sites associated with
+ * the current installed model.
+ *
+ * <p>See src/main/resources/application.yml nshmp-haz.model-path for installed
+ * model.
+ *
+ * <p>To run the Micronaut jar file with a model: java -jar
+ * path/to/nshmp-haz.jar --model=<path/to/model>
+ *
+ * @author U.S. Geological Survey
+ */
+@Tag(
+    name = TestSitesController.NAME,
+    description = "NSHM test sites")
+@Controller("/sites")
+public class TestSitesController {
+  static final Logger LOG = LoggerFactory.getLogger(TestSitesController.class);
+  static final String NAME = "Test Sites";
+
+  @Inject
+  private NshmpMicronautServlet servlet;
+
+  @Operation(
+      summary = "Get the GeoJSON Feature Collection of test sites",
+      description = "Returns the feature collection of test sites",
+      operationId = "test-sites")
+  @ApiResponse(
+      description = "NSHM test sites",
+      responseCode = "200",
+      content = @Content(
+          schema = @Schema(implementation = Response.class)))
+  @Get(uri = "{?raw}", produces = MediaType.APPLICATION_JSON)
+  public HttpResponse<String> doGet(
+      HttpRequest<?> http,
+      @QueryValue(defaultValue = "false") @Nullable Boolean raw) {
+    try {
+      FeatureCollection sites = ServletUtil.model().sites().orElseThrow();
+      return HttpResponse
+          .ok(FeatureCollectionService.handleFeatureCollection(http, NAME, sites, raw));
+    } catch (Exception e) {
+      return ServletUtil.error(
+          LOG,
+          e,
+          NAME,
+          http.getUri().toString());
+    }
+  }
+
+  @Operation(
+      summary = "Get the GeoJSON Feature Collection of test sites",
+      description = "Returns the feature collection of test sites",
+      operationId = "test-sites-slash")
+  @ApiResponse(
+      description = "NSHM test sites",
+      responseCode = "200",
+      content = @Content(
+          schema = @Schema(implementation = Response.class)))
+  @Get(uri = "/{raw}", produces = MediaType.APPLICATION_JSON)
+  public HttpResponse<String> doGetSlash(
+      HttpRequest<?> http,
+      @PathVariable(defaultValue = "false") @Nullable Boolean raw) {
+    return doGet(http, raw);
+  }
+
+  // Swagger schema
+  private static class Response extends ResponseBody<RequestData, FeatureCollection> {};
+}