diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.3.1
+
+* Updated resource specification document to version 1.1.1.
+
 ## 0.3.0
 
 * **Backwards-incompatible**: We now use the official AWS JSON spec document to
diff --git a/library-gen/Stratosphere/ResourceProperties/EC2DHCPOptionsTag.hs b/library-gen/Stratosphere/ResourceProperties/EC2DHCPOptionsTag.hs
deleted file mode 100644
--- a/library-gen/Stratosphere/ResourceProperties/EC2DHCPOptionsTag.hs
+++ /dev/null
@@ -1,49 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE OverloadedStrings #-}
-
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html
-
-module Stratosphere.ResourceProperties.EC2DHCPOptionsTag where
-
-import Control.Lens
-import Data.Aeson
-import Data.Aeson.Types
-import Data.Text
-import GHC.Generics
-
-import Stratosphere.Values
-
-
--- | Full data type definition for EC2DHCPOptionsTag. See 'ec2DHCPOptionsTag'
--- | for a more convenient constructor.
-data EC2DHCPOptionsTag =
-  EC2DHCPOptionsTag
-  { _eC2DHCPOptionsTagKey :: Val Text
-  , _eC2DHCPOptionsTagValue :: Val Text
-  } deriving (Show, Generic)
-
-instance ToJSON EC2DHCPOptionsTag where
-  toJSON = genericToJSON defaultOptions { fieldLabelModifier = Prelude.drop 18, omitNothingFields = True }
-
-instance FromJSON EC2DHCPOptionsTag where
-  parseJSON = genericParseJSON defaultOptions { fieldLabelModifier = Prelude.drop 18, omitNothingFields = True }
-
--- | Constructor for 'EC2DHCPOptionsTag' containing required fields as
--- | arguments.
-ec2DHCPOptionsTag
-  :: Val Text -- ^ 'ecdhcpotKey'
-  -> Val Text -- ^ 'ecdhcpotValue'
-  -> EC2DHCPOptionsTag
-ec2DHCPOptionsTag keyarg valuearg =
-  EC2DHCPOptionsTag
-  { _eC2DHCPOptionsTagKey = keyarg
-  , _eC2DHCPOptionsTagValue = valuearg
-  }
-
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html#cfn-resource-tags-key
-ecdhcpotKey :: Lens' EC2DHCPOptionsTag (Val Text)
-ecdhcpotKey = lens _eC2DHCPOptionsTagKey (\s a -> s { _eC2DHCPOptionsTagKey = a })
-
--- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html#cfn-resource-tags-value
-ecdhcpotValue :: Lens' EC2DHCPOptionsTag (Val Text)
-ecdhcpotValue = lens _eC2DHCPOptionsTagValue (\s a -> s { _eC2DHCPOptionsTagValue = a })
diff --git a/library-gen/Stratosphere/Resources.hs b/library-gen/Stratosphere/Resources.hs
--- a/library-gen/Stratosphere/Resources.hs
+++ b/library-gen/Stratosphere/Resources.hs
@@ -302,7 +302,6 @@
 import Stratosphere.ResourceProperties.DynamoDBTableProjection as X
 import Stratosphere.ResourceProperties.DynamoDBTableProvisionedThroughput as X
 import Stratosphere.ResourceProperties.DynamoDBTableStreamSpecification as X
-import Stratosphere.ResourceProperties.EC2DHCPOptionsTag as X
 import Stratosphere.ResourceProperties.EC2InstanceAssociationParameter as X
 import Stratosphere.ResourceProperties.EC2InstanceBlockDeviceMapping as X
 import Stratosphere.ResourceProperties.EC2InstanceEbs as X
diff --git a/library-gen/Stratosphere/Resources/EC2DHCPOptions.hs b/library-gen/Stratosphere/Resources/EC2DHCPOptions.hs
--- a/library-gen/Stratosphere/Resources/EC2DHCPOptions.hs
+++ b/library-gen/Stratosphere/Resources/EC2DHCPOptions.hs
@@ -23,7 +23,7 @@
   , _eC2DHCPOptionsNetbiosNameServers :: Maybe [Val Text]
   , _eC2DHCPOptionsNetbiosNodeType :: Maybe (Val Integer')
   , _eC2DHCPOptionsNtpServers :: Maybe (Val Text)
-  , _eC2DHCPOptionsTags :: Maybe Tag
+  , _eC2DHCPOptionsTags :: Maybe [Tag]
   } deriving (Show, Generic)
 
 instance ToJSON EC2DHCPOptions where
@@ -66,5 +66,5 @@
 ecdhcpoNtpServers = lens _eC2DHCPOptionsNtpServers (\s a -> s { _eC2DHCPOptionsNtpServers = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcp-options.html#cfn-ec2-dhcpoptions-tags
-ecdhcpoTags :: Lens' EC2DHCPOptions (Maybe Tag)
+ecdhcpoTags :: Lens' EC2DHCPOptions (Maybe [Tag])
 ecdhcpoTags = lens _eC2DHCPOptionsTags (\s a -> s { _eC2DHCPOptionsTags = a })
diff --git a/library-gen/Stratosphere/Resources/EC2SubnetRouteTableAssociation.hs b/library-gen/Stratosphere/Resources/EC2SubnetRouteTableAssociation.hs
--- a/library-gen/Stratosphere/Resources/EC2SubnetRouteTableAssociation.hs
+++ b/library-gen/Stratosphere/Resources/EC2SubnetRouteTableAssociation.hs
@@ -19,7 +19,7 @@
 data EC2SubnetRouteTableAssociation =
   EC2SubnetRouteTableAssociation
   { _eC2SubnetRouteTableAssociationRouteTableId :: Val Text
-  , _eC2SubnetRouteTableAssociationSubnetId :: Maybe (Val Text)
+  , _eC2SubnetRouteTableAssociationSubnetId :: Val Text
   } deriving (Show, Generic)
 
 instance ToJSON EC2SubnetRouteTableAssociation where
@@ -32,11 +32,12 @@
 -- | fields as arguments.
 ec2SubnetRouteTableAssociation
   :: Val Text -- ^ 'ecsrtaRouteTableId'
+  -> Val Text -- ^ 'ecsrtaSubnetId'
   -> EC2SubnetRouteTableAssociation
-ec2SubnetRouteTableAssociation routeTableIdarg =
+ec2SubnetRouteTableAssociation routeTableIdarg subnetIdarg =
   EC2SubnetRouteTableAssociation
   { _eC2SubnetRouteTableAssociationRouteTableId = routeTableIdarg
-  , _eC2SubnetRouteTableAssociationSubnetId = Nothing
+  , _eC2SubnetRouteTableAssociationSubnetId = subnetIdarg
   }
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html#cfn-ec2-subnetroutetableassociation-routetableid
@@ -44,5 +45,5 @@
 ecsrtaRouteTableId = lens _eC2SubnetRouteTableAssociationRouteTableId (\s a -> s { _eC2SubnetRouteTableAssociationRouteTableId = a })
 
 -- | http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-route-table-assoc.html#cfn-ec2-subnetroutetableassociation-subnetid
-ecsrtaSubnetId :: Lens' EC2SubnetRouteTableAssociation (Maybe (Val Text))
+ecsrtaSubnetId :: Lens' EC2SubnetRouteTableAssociation (Val Text)
 ecsrtaSubnetId = lens _eC2SubnetRouteTableAssociationSubnetId (\s a -> s { _eC2SubnetRouteTableAssociationSubnetId = a })
diff --git a/stratosphere.cabal b/stratosphere.cabal
--- a/stratosphere.cabal
+++ b/stratosphere.cabal
@@ -3,7 +3,7 @@
 -- see: https://github.com/sol/hpack
 
 name:           stratosphere
-version:        0.3.0
+version:        0.3.1
 synopsis:       EDSL for AWS CloudFormation
 description:    EDSL for AWS CloudFormation
 category:       AWS, Cloud
@@ -140,7 +140,6 @@
       Stratosphere.ResourceProperties.DynamoDBTableProjection
       Stratosphere.ResourceProperties.DynamoDBTableProvisionedThroughput
       Stratosphere.ResourceProperties.DynamoDBTableStreamSpecification
-      Stratosphere.ResourceProperties.EC2DHCPOptionsTag
       Stratosphere.ResourceProperties.EC2InstanceAssociationParameter
       Stratosphere.ResourceProperties.EC2InstanceBlockDeviceMapping
       Stratosphere.ResourceProperties.EC2InstanceEbs