diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.17.0
+
+* Fix JSON instances for non-codegen code.
+* Allow the `Split` function to use `Val a` in its second argument.
+
 ## 0.16.0
 
 * **BREAKING CHANGE**: Renamed lenses for non-generated code to match naming
diff --git a/library/Stratosphere/Helpers.hs b/library/Stratosphere/Helpers.hs
--- a/library/Stratosphere/Helpers.hs
+++ b/library/Stratosphere/Helpers.hs
@@ -45,7 +45,7 @@
 -- in a separate module.
 modTemplateJSONField :: String -> String
 modTemplateJSONField "templateFormatVersion" = "AWSTemplateFormatVersion"
-modTemplateJSONField s = drop 8 s
+modTemplateJSONField s = drop 9 s
 
 
 -- | This class defines items with names in them. It is used to extract the
diff --git a/library/Stratosphere/Values.hs b/library/Stratosphere/Values.hs
--- a/library/Stratosphere/Values.hs
+++ b/library/Stratosphere/Values.hs
@@ -121,7 +121,7 @@
   = ValList [Val a]
   | RefList Text
   | ImportValueList Text
-  | Split Text Text
+  | Split Text (Val a)
   | GetAZs (Val Text)
   deriving (Show, Eq)
 
diff --git a/stratosphere.cabal b/stratosphere.cabal
--- a/stratosphere.cabal
+++ b/stratosphere.cabal
@@ -2,10 +2,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 210233c3ab823f6f277a3e01b794d1f9e1163a15d6cef4ee8765336f1687776a
+-- hash: b0fa589c66137f3d3ff2b85a4acb18660d78ce0c2ea15ddd72e07d85c8633fe1
 
 name:           stratosphere
-version:        0.16.0
+version:        0.17.0
 synopsis:       EDSL for AWS CloudFormation
 description:    EDSL for AWS CloudFormation
 category:       AWS, Cloud