diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.3.6`
+`1.3.7`
 
 
 ## Description
diff --git a/amazonka-sqs.cabal b/amazonka-sqs.cabal
--- a/amazonka-sqs.cabal
+++ b/amazonka-sqs.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-sqs
-version:               1.3.6
+version:               1.3.7
 synopsis:              Amazon Simple Queue Service SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -94,7 +94,7 @@
         , Network.AWS.SQS.Types.Sum
 
     build-depends:
-          amazonka-core == 1.3.6.*
+          amazonka-core == 1.3.7.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-sqs-test
@@ -114,12 +114,11 @@
         , Test.AWS.SQS.Internal
 
     build-depends:
-          amazonka-core == 1.3.6.*
-        , amazonka-test == 1.3.6.*
-        , amazonka-sqs == 1.3.6.*
+          amazonka-core == 1.3.7.*
+        , amazonka-test == 1.3.7.*
+        , amazonka-sqs == 1.3.7.*
         , base
         , bytestring
-        , lens
         , tasty
         , tasty-hunit
         , text
diff --git a/gen/Network/AWS/SQS/AddPermission.hs b/gen/Network/AWS/SQS/AddPermission.hs
--- a/gen/Network/AWS/SQS/AddPermission.hs
+++ b/gen/Network/AWS/SQS/AddPermission.hs
@@ -59,6 +59,7 @@
     , AddPermissionResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/ChangeMessageVisibility.hs b/gen/Network/AWS/SQS/ChangeMessageVisibility.hs
--- a/gen/Network/AWS/SQS/ChangeMessageVisibility.hs
+++ b/gen/Network/AWS/SQS/ChangeMessageVisibility.hs
@@ -71,6 +71,7 @@
     , ChangeMessageVisibilityResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs b/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs
--- a/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs
+++ b/gen/Network/AWS/SQS/ChangeMessageVisibilityBatch.hs
@@ -55,6 +55,7 @@
     , cmvbrsFailed
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/CreateQueue.hs b/gen/Network/AWS/SQS/CreateQueue.hs
--- a/gen/Network/AWS/SQS/CreateQueue.hs
+++ b/gen/Network/AWS/SQS/CreateQueue.hs
@@ -66,6 +66,7 @@
     , cqrsResponseStatus
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/DeleteMessage.hs b/gen/Network/AWS/SQS/DeleteMessage.hs
--- a/gen/Network/AWS/SQS/DeleteMessage.hs
+++ b/gen/Network/AWS/SQS/DeleteMessage.hs
@@ -56,6 +56,7 @@
     , DeleteMessageResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/DeleteMessageBatch.hs b/gen/Network/AWS/SQS/DeleteMessageBatch.hs
--- a/gen/Network/AWS/SQS/DeleteMessageBatch.hs
+++ b/gen/Network/AWS/SQS/DeleteMessageBatch.hs
@@ -53,6 +53,7 @@
     , dmbrsFailed
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/DeleteQueue.hs b/gen/Network/AWS/SQS/DeleteQueue.hs
--- a/gen/Network/AWS/SQS/DeleteQueue.hs
+++ b/gen/Network/AWS/SQS/DeleteQueue.hs
@@ -51,6 +51,7 @@
     , DeleteQueueResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/GetQueueAttributes.hs b/gen/Network/AWS/SQS/GetQueueAttributes.hs
--- a/gen/Network/AWS/SQS/GetQueueAttributes.hs
+++ b/gen/Network/AWS/SQS/GetQueueAttributes.hs
@@ -86,6 +86,7 @@
     , gqarsResponseStatus
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/GetQueueURL.hs b/gen/Network/AWS/SQS/GetQueueURL.hs
--- a/gen/Network/AWS/SQS/GetQueueURL.hs
+++ b/gen/Network/AWS/SQS/GetQueueURL.hs
@@ -47,6 +47,7 @@
     , gqursQueueURL
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs b/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs
--- a/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs
+++ b/gen/Network/AWS/SQS/ListDeadLetterSourceQueues.hs
@@ -41,6 +41,7 @@
     , ldlsqrsQueueURLs
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/ListQueues.hs b/gen/Network/AWS/SQS/ListQueues.hs
--- a/gen/Network/AWS/SQS/ListQueues.hs
+++ b/gen/Network/AWS/SQS/ListQueues.hs
@@ -40,6 +40,7 @@
     , lqrsResponseStatus
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/PurgeQueue.hs b/gen/Network/AWS/SQS/PurgeQueue.hs
--- a/gen/Network/AWS/SQS/PurgeQueue.hs
+++ b/gen/Network/AWS/SQS/PurgeQueue.hs
@@ -44,6 +44,7 @@
     , PurgeQueueResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/ReceiveMessage.hs b/gen/Network/AWS/SQS/ReceiveMessage.hs
--- a/gen/Network/AWS/SQS/ReceiveMessage.hs
+++ b/gen/Network/AWS/SQS/ReceiveMessage.hs
@@ -86,6 +86,7 @@
     , rmrsResponseStatus
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/RemovePermission.hs b/gen/Network/AWS/SQS/RemovePermission.hs
--- a/gen/Network/AWS/SQS/RemovePermission.hs
+++ b/gen/Network/AWS/SQS/RemovePermission.hs
@@ -36,6 +36,7 @@
     , RemovePermissionResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/SendMessage.hs b/gen/Network/AWS/SQS/SendMessage.hs
--- a/gen/Network/AWS/SQS/SendMessage.hs
+++ b/gen/Network/AWS/SQS/SendMessage.hs
@@ -54,6 +54,7 @@
     , smrsResponseStatus
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/SendMessageBatch.hs b/gen/Network/AWS/SQS/SendMessageBatch.hs
--- a/gen/Network/AWS/SQS/SendMessageBatch.hs
+++ b/gen/Network/AWS/SQS/SendMessageBatch.hs
@@ -69,6 +69,7 @@
     , smbrsFailed
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/SetQueueAttributes.hs b/gen/Network/AWS/SQS/SetQueueAttributes.hs
--- a/gen/Network/AWS/SQS/SetQueueAttributes.hs
+++ b/gen/Network/AWS/SQS/SetQueueAttributes.hs
@@ -42,6 +42,7 @@
     , SetQueueAttributesResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SQS/Types.hs b/gen/Network/AWS/SQS/Types.hs
--- a/gen/Network/AWS/SQS/Types.hs
+++ b/gen/Network/AWS/SQS/Types.hs
@@ -107,6 +107,7 @@
     , smbreMD5OfMessageBody
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Sign.V4
 import           Network.AWS.SQS.Types.Product
diff --git a/gen/Network/AWS/SQS/Types/Product.hs b/gen/Network/AWS/SQS/Types/Product.hs
--- a/gen/Network/AWS/SQS/Types/Product.hs
+++ b/gen/Network/AWS/SQS/Types/Product.hs
@@ -17,6 +17,7 @@
 --
 module Network.AWS.SQS.Types.Product where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.SQS.Types.Sum
 
diff --git a/gen/Network/AWS/SQS/Types/Sum.hs b/gen/Network/AWS/SQS/Types/Sum.hs
--- a/gen/Network/AWS/SQS/Types/Sum.hs
+++ b/gen/Network/AWS/SQS/Types/Sum.hs
@@ -25,7 +25,7 @@
     | ApproximateReceiveCount
     | SenderId
     | SentTimestamp
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText MessageAttribute where
     parser = takeLowerText >>= \case
@@ -67,7 +67,7 @@
     | ReceiveMessageWaitTimeSeconds
     | RedrivePolicy
     | VisibilityTimeout
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText QueueAttributeName where
     parser = takeLowerText >>= \case
diff --git a/gen/Network/AWS/SQS/Waiters.hs b/gen/Network/AWS/SQS/Waiters.hs
--- a/gen/Network/AWS/SQS/Waiters.hs
+++ b/gen/Network/AWS/SQS/Waiters.hs
@@ -15,6 +15,7 @@
 --
 module Network.AWS.SQS.Waiters where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.SQS.Types
 import           Network.AWS.Waiter
diff --git a/test/Test/AWS/SQS.hs b/test/Test/AWS/SQS.hs
--- a/test/Test/AWS/SQS.hs
+++ b/test/Test/AWS/SQS.hs
@@ -13,10 +13,10 @@
     , fixtures
     ) where
 
-import           Control.Lens
 import qualified Data.HashMap.Strict as Map
 import           Data.Monoid
 import           Data.Text           (Text)
+import           Network.AWS.Lens    ((&), (.~), (?~))
 import           Network.AWS.SQS
 import           Test.AWS.Gen.SQS
 import           Test.Tasty