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-swf.cabal b/amazonka-swf.cabal
--- a/amazonka-swf.cabal
+++ b/amazonka-swf.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-swf
-version:               1.3.6
+version:               1.3.7
 synopsis:              Amazon Simple Workflow Service SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -96,7 +96,7 @@
         , Network.AWS.SWF.Types.Sum
 
     build-depends:
-          amazonka-core == 1.3.6.*
+          amazonka-core == 1.3.7.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-swf-test
@@ -116,12 +116,11 @@
         , Test.AWS.SWF.Internal
 
     build-depends:
-          amazonka-core == 1.3.6.*
-        , amazonka-test == 1.3.6.*
-        , amazonka-swf == 1.3.6.*
+          amazonka-core == 1.3.7.*
+        , amazonka-test == 1.3.7.*
+        , amazonka-swf == 1.3.7.*
         , base
         , bytestring
-        , lens
         , tasty
         , tasty-hunit
         , text
diff --git a/gen/Network/AWS/SWF/CountClosedWorkflowExecutions.hs b/gen/Network/AWS/SWF/CountClosedWorkflowExecutions.hs
--- a/gen/Network/AWS/SWF/CountClosedWorkflowExecutions.hs
+++ b/gen/Network/AWS/SWF/CountClosedWorkflowExecutions.hs
@@ -72,6 +72,7 @@
     , wecCount
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/CountOpenWorkflowExecutions.hs b/gen/Network/AWS/SWF/CountOpenWorkflowExecutions.hs
--- a/gen/Network/AWS/SWF/CountOpenWorkflowExecutions.hs
+++ b/gen/Network/AWS/SWF/CountOpenWorkflowExecutions.hs
@@ -70,6 +70,7 @@
     , wecCount
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/CountPendingActivityTasks.hs b/gen/Network/AWS/SWF/CountPendingActivityTasks.hs
--- a/gen/Network/AWS/SWF/CountPendingActivityTasks.hs
+++ b/gen/Network/AWS/SWF/CountPendingActivityTasks.hs
@@ -61,6 +61,7 @@
     , ptcCount
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/CountPendingDecisionTasks.hs b/gen/Network/AWS/SWF/CountPendingDecisionTasks.hs
--- a/gen/Network/AWS/SWF/CountPendingDecisionTasks.hs
+++ b/gen/Network/AWS/SWF/CountPendingDecisionTasks.hs
@@ -61,6 +61,7 @@
     , ptcCount
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/DeprecateActivityType.hs b/gen/Network/AWS/SWF/DeprecateActivityType.hs
--- a/gen/Network/AWS/SWF/DeprecateActivityType.hs
+++ b/gen/Network/AWS/SWF/DeprecateActivityType.hs
@@ -64,6 +64,7 @@
     , DeprecateActivityTypeResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/DeprecateDomain.hs b/gen/Network/AWS/SWF/DeprecateDomain.hs
--- a/gen/Network/AWS/SWF/DeprecateDomain.hs
+++ b/gen/Network/AWS/SWF/DeprecateDomain.hs
@@ -60,6 +60,7 @@
     , DeprecateDomainResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/DeprecateWorkflowType.hs b/gen/Network/AWS/SWF/DeprecateWorkflowType.hs
--- a/gen/Network/AWS/SWF/DeprecateWorkflowType.hs
+++ b/gen/Network/AWS/SWF/DeprecateWorkflowType.hs
@@ -65,6 +65,7 @@
     , DeprecateWorkflowTypeResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/DescribeActivityType.hs b/gen/Network/AWS/SWF/DescribeActivityType.hs
--- a/gen/Network/AWS/SWF/DescribeActivityType.hs
+++ b/gen/Network/AWS/SWF/DescribeActivityType.hs
@@ -64,6 +64,7 @@
     , datrsConfiguration
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/DescribeDomain.hs b/gen/Network/AWS/SWF/DescribeDomain.hs
--- a/gen/Network/AWS/SWF/DescribeDomain.hs
+++ b/gen/Network/AWS/SWF/DescribeDomain.hs
@@ -57,6 +57,7 @@
     , ddrsConfiguration
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/DescribeWorkflowExecution.hs b/gen/Network/AWS/SWF/DescribeWorkflowExecution.hs
--- a/gen/Network/AWS/SWF/DescribeWorkflowExecution.hs
+++ b/gen/Network/AWS/SWF/DescribeWorkflowExecution.hs
@@ -64,6 +64,7 @@
     , dwersOpenCounts
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/DescribeWorkflowType.hs b/gen/Network/AWS/SWF/DescribeWorkflowType.hs
--- a/gen/Network/AWS/SWF/DescribeWorkflowType.hs
+++ b/gen/Network/AWS/SWF/DescribeWorkflowType.hs
@@ -64,6 +64,7 @@
     , dwtrsConfiguration
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/GetWorkflowExecutionHistory.hs b/gen/Network/AWS/SWF/GetWorkflowExecutionHistory.hs
--- a/gen/Network/AWS/SWF/GetWorkflowExecutionHistory.hs
+++ b/gen/Network/AWS/SWF/GetWorkflowExecutionHistory.hs
@@ -67,6 +67,7 @@
     , gwehrsEvents
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/SWF/ListActivityTypes.hs b/gen/Network/AWS/SWF/ListActivityTypes.hs
--- a/gen/Network/AWS/SWF/ListActivityTypes.hs
+++ b/gen/Network/AWS/SWF/ListActivityTypes.hs
@@ -68,6 +68,7 @@
     , latrsTypeInfos
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/SWF/ListClosedWorkflowExecutions.hs b/gen/Network/AWS/SWF/ListClosedWorkflowExecutions.hs
--- a/gen/Network/AWS/SWF/ListClosedWorkflowExecutions.hs
+++ b/gen/Network/AWS/SWF/ListClosedWorkflowExecutions.hs
@@ -79,6 +79,7 @@
     , weiExecutionInfos
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/SWF/ListDomains.hs b/gen/Network/AWS/SWF/ListDomains.hs
--- a/gen/Network/AWS/SWF/ListDomains.hs
+++ b/gen/Network/AWS/SWF/ListDomains.hs
@@ -68,6 +68,7 @@
     , ldrsDomainInfos
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/SWF/ListOpenWorkflowExecutions.hs b/gen/Network/AWS/SWF/ListOpenWorkflowExecutions.hs
--- a/gen/Network/AWS/SWF/ListOpenWorkflowExecutions.hs
+++ b/gen/Network/AWS/SWF/ListOpenWorkflowExecutions.hs
@@ -77,6 +77,7 @@
     , weiExecutionInfos
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/SWF/ListWorkflowTypes.hs b/gen/Network/AWS/SWF/ListWorkflowTypes.hs
--- a/gen/Network/AWS/SWF/ListWorkflowTypes.hs
+++ b/gen/Network/AWS/SWF/ListWorkflowTypes.hs
@@ -65,6 +65,7 @@
     , lwtrsTypeInfos
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
diff --git a/gen/Network/AWS/SWF/PollForActivityTask.hs b/gen/Network/AWS/SWF/PollForActivityTask.hs
--- a/gen/Network/AWS/SWF/PollForActivityTask.hs
+++ b/gen/Network/AWS/SWF/PollForActivityTask.hs
@@ -67,15 +67,16 @@
     , pollForActivityTaskResponse
     , PollForActivityTaskResponse
     -- * Response Lenses
+    , pfatrsActivityId
     , pfatrsInput
-    , pfatrsResponseStatus
     , pfatrsTaskToken
-    , pfatrsActivityId
+    , pfatrsResponseStatus
     , pfatrsStartedEventId
     , pfatrsWorkflowExecution
     , pfatrsActivityType
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
@@ -137,9 +138,9 @@
           = receiveJSON
               (\ s h x ->
                  PollForActivityTaskResponse' <$>
-                   (x .?> "input") <*> (pure (fromEnum s)) <*>
-                     (x .:> "taskToken")
-                     <*> (x .:> "activityId")
+                   (x .?> "activityId") <*> (x .?> "input") <*>
+                     (x .?> "taskToken")
+                     <*> (pure (fromEnum s))
                      <*> (x .:> "startedEventId")
                      <*> (x .:> "workflowExecution")
                      <*> (x .:> "activityType"))
@@ -172,10 +173,10 @@
 --
 -- /See:/ 'pollForActivityTaskResponse' smart constructor.
 data PollForActivityTaskResponse = PollForActivityTaskResponse'
-    { _pfatrsInput             :: !(Maybe Text)
+    { _pfatrsActivityId        :: !(Maybe Text)
+    , _pfatrsInput             :: !(Maybe Text)
+    , _pfatrsTaskToken         :: !(Maybe Text)
     , _pfatrsResponseStatus    :: !Int
-    , _pfatrsTaskToken         :: !Text
-    , _pfatrsActivityId        :: !Text
     , _pfatrsStartedEventId    :: !Integer
     , _pfatrsWorkflowExecution :: !WorkflowExecution
     , _pfatrsActivityType      :: !ActivityType
@@ -185,13 +186,13 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'pfatrsInput'
+-- * 'pfatrsActivityId'
 --
--- * 'pfatrsResponseStatus'
+-- * 'pfatrsInput'
 --
 -- * 'pfatrsTaskToken'
 --
--- * 'pfatrsActivityId'
+-- * 'pfatrsResponseStatus'
 --
 -- * 'pfatrsStartedEventId'
 --
@@ -200,42 +201,40 @@
 -- * 'pfatrsActivityType'
 pollForActivityTaskResponse
     :: Int -- ^ 'pfatrsResponseStatus'
-    -> Text -- ^ 'pfatrsTaskToken'
-    -> Text -- ^ 'pfatrsActivityId'
     -> Integer -- ^ 'pfatrsStartedEventId'
     -> WorkflowExecution -- ^ 'pfatrsWorkflowExecution'
     -> ActivityType -- ^ 'pfatrsActivityType'
     -> PollForActivityTaskResponse
-pollForActivityTaskResponse pResponseStatus_ pTaskToken_ pActivityId_ pStartedEventId_ pWorkflowExecution_ pActivityType_ =
+pollForActivityTaskResponse pResponseStatus_ pStartedEventId_ pWorkflowExecution_ pActivityType_ =
     PollForActivityTaskResponse'
-    { _pfatrsInput = Nothing
+    { _pfatrsActivityId = Nothing
+    , _pfatrsInput = Nothing
+    , _pfatrsTaskToken = Nothing
     , _pfatrsResponseStatus = pResponseStatus_
-    , _pfatrsTaskToken = pTaskToken_
-    , _pfatrsActivityId = pActivityId_
     , _pfatrsStartedEventId = pStartedEventId_
     , _pfatrsWorkflowExecution = pWorkflowExecution_
     , _pfatrsActivityType = pActivityType_
     }
 
+-- | The unique ID of the task.
+pfatrsActivityId :: Lens' PollForActivityTaskResponse (Maybe Text)
+pfatrsActivityId = lens _pfatrsActivityId (\ s a -> s{_pfatrsActivityId = a});
+
 -- | The inputs provided when the activity task was scheduled. The form of
 -- the input is user defined and should be meaningful to the activity
 -- implementation.
 pfatrsInput :: Lens' PollForActivityTaskResponse (Maybe Text)
 pfatrsInput = lens _pfatrsInput (\ s a -> s{_pfatrsInput = a});
 
--- | The response status code.
-pfatrsResponseStatus :: Lens' PollForActivityTaskResponse Int
-pfatrsResponseStatus = lens _pfatrsResponseStatus (\ s a -> s{_pfatrsResponseStatus = a});
-
 -- | The opaque string used as a handle on the task. This token is used by
 -- workers to communicate progress and response information back to the
 -- system about the task.
-pfatrsTaskToken :: Lens' PollForActivityTaskResponse Text
+pfatrsTaskToken :: Lens' PollForActivityTaskResponse (Maybe Text)
 pfatrsTaskToken = lens _pfatrsTaskToken (\ s a -> s{_pfatrsTaskToken = a});
 
--- | The unique ID of the task.
-pfatrsActivityId :: Lens' PollForActivityTaskResponse Text
-pfatrsActivityId = lens _pfatrsActivityId (\ s a -> s{_pfatrsActivityId = a});
+-- | The response status code.
+pfatrsResponseStatus :: Lens' PollForActivityTaskResponse Int
+pfatrsResponseStatus = lens _pfatrsResponseStatus (\ s a -> s{_pfatrsResponseStatus = a});
 
 -- | The ID of the 'ActivityTaskStarted' event recorded in the history.
 pfatrsStartedEventId :: Lens' PollForActivityTaskResponse Integer
diff --git a/gen/Network/AWS/SWF/PollForDecisionTask.hs b/gen/Network/AWS/SWF/PollForDecisionTask.hs
--- a/gen/Network/AWS/SWF/PollForDecisionTask.hs
+++ b/gen/Network/AWS/SWF/PollForDecisionTask.hs
@@ -85,14 +85,15 @@
     -- * Response Lenses
     , pfdtrsNextPageToken
     , pfdtrsPreviousStartedEventId
-    , pfdtrsResponseStatus
     , pfdtrsTaskToken
+    , pfdtrsResponseStatus
     , pfdtrsStartedEventId
     , pfdtrsWorkflowExecution
     , pfdtrsWorkflowType
     , pfdtrsEvents
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Pager
 import           Network.AWS.Prelude
 import           Network.AWS.Request
@@ -211,8 +212,8 @@
                  PollForDecisionTaskResponse' <$>
                    (x .?> "nextPageToken") <*>
                      (x .?> "previousStartedEventId")
+                     <*> (x .?> "taskToken")
                      <*> (pure (fromEnum s))
-                     <*> (x .:> "taskToken")
                      <*> (x .:> "startedEventId")
                      <*> (x .:> "workflowExecution")
                      <*> (x .:> "workflowType")
@@ -252,8 +253,8 @@
 data PollForDecisionTaskResponse = PollForDecisionTaskResponse'
     { _pfdtrsNextPageToken          :: !(Maybe Text)
     , _pfdtrsPreviousStartedEventId :: !(Maybe Integer)
+    , _pfdtrsTaskToken              :: !(Maybe Text)
     , _pfdtrsResponseStatus         :: !Int
-    , _pfdtrsTaskToken              :: !Text
     , _pfdtrsStartedEventId         :: !Integer
     , _pfdtrsWorkflowExecution      :: !WorkflowExecution
     , _pfdtrsWorkflowType           :: !WorkflowType
@@ -268,10 +269,10 @@
 --
 -- * 'pfdtrsPreviousStartedEventId'
 --
--- * 'pfdtrsResponseStatus'
---
 -- * 'pfdtrsTaskToken'
 --
+-- * 'pfdtrsResponseStatus'
+--
 -- * 'pfdtrsStartedEventId'
 --
 -- * 'pfdtrsWorkflowExecution'
@@ -281,17 +282,16 @@
 -- * 'pfdtrsEvents'
 pollForDecisionTaskResponse
     :: Int -- ^ 'pfdtrsResponseStatus'
-    -> Text -- ^ 'pfdtrsTaskToken'
     -> Integer -- ^ 'pfdtrsStartedEventId'
     -> WorkflowExecution -- ^ 'pfdtrsWorkflowExecution'
     -> WorkflowType -- ^ 'pfdtrsWorkflowType'
     -> PollForDecisionTaskResponse
-pollForDecisionTaskResponse pResponseStatus_ pTaskToken_ pStartedEventId_ pWorkflowExecution_ pWorkflowType_ =
+pollForDecisionTaskResponse pResponseStatus_ pStartedEventId_ pWorkflowExecution_ pWorkflowType_ =
     PollForDecisionTaskResponse'
     { _pfdtrsNextPageToken = Nothing
     , _pfdtrsPreviousStartedEventId = Nothing
+    , _pfdtrsTaskToken = Nothing
     , _pfdtrsResponseStatus = pResponseStatus_
-    , _pfdtrsTaskToken = pTaskToken_
     , _pfdtrsStartedEventId = pStartedEventId_
     , _pfdtrsWorkflowExecution = pWorkflowExecution_
     , _pfdtrsWorkflowType = pWorkflowType_
@@ -315,15 +315,15 @@
 pfdtrsPreviousStartedEventId :: Lens' PollForDecisionTaskResponse (Maybe Integer)
 pfdtrsPreviousStartedEventId = lens _pfdtrsPreviousStartedEventId (\ s a -> s{_pfdtrsPreviousStartedEventId = a});
 
--- | The response status code.
-pfdtrsResponseStatus :: Lens' PollForDecisionTaskResponse Int
-pfdtrsResponseStatus = lens _pfdtrsResponseStatus (\ s a -> s{_pfdtrsResponseStatus = a});
-
 -- | The opaque string used as a handle on the task. This token is used by
 -- workers to communicate progress and response information back to the
 -- system about the task.
-pfdtrsTaskToken :: Lens' PollForDecisionTaskResponse Text
+pfdtrsTaskToken :: Lens' PollForDecisionTaskResponse (Maybe Text)
 pfdtrsTaskToken = lens _pfdtrsTaskToken (\ s a -> s{_pfdtrsTaskToken = a});
+
+-- | The response status code.
+pfdtrsResponseStatus :: Lens' PollForDecisionTaskResponse Int
+pfdtrsResponseStatus = lens _pfdtrsResponseStatus (\ s a -> s{_pfdtrsResponseStatus = a});
 
 -- | The ID of the 'DecisionTaskStarted' event recorded in the history.
 pfdtrsStartedEventId :: Lens' PollForDecisionTaskResponse Integer
diff --git a/gen/Network/AWS/SWF/RecordActivityTaskHeartbeat.hs b/gen/Network/AWS/SWF/RecordActivityTaskHeartbeat.hs
--- a/gen/Network/AWS/SWF/RecordActivityTaskHeartbeat.hs
+++ b/gen/Network/AWS/SWF/RecordActivityTaskHeartbeat.hs
@@ -85,6 +85,7 @@
     , rathrsCancelRequested
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/RegisterActivityType.hs b/gen/Network/AWS/SWF/RegisterActivityType.hs
--- a/gen/Network/AWS/SWF/RegisterActivityType.hs
+++ b/gen/Network/AWS/SWF/RegisterActivityType.hs
@@ -71,6 +71,7 @@
     , RegisterActivityTypeResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/RegisterDomain.hs b/gen/Network/AWS/SWF/RegisterDomain.hs
--- a/gen/Network/AWS/SWF/RegisterDomain.hs
+++ b/gen/Network/AWS/SWF/RegisterDomain.hs
@@ -55,6 +55,7 @@
     , RegisterDomainResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/RegisterWorkflowType.hs b/gen/Network/AWS/SWF/RegisterWorkflowType.hs
--- a/gen/Network/AWS/SWF/RegisterWorkflowType.hs
+++ b/gen/Network/AWS/SWF/RegisterWorkflowType.hs
@@ -74,6 +74,7 @@
     , RegisterWorkflowTypeResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/RequestCancelWorkflowExecution.hs b/gen/Network/AWS/SWF/RequestCancelWorkflowExecution.hs
--- a/gen/Network/AWS/SWF/RequestCancelWorkflowExecution.hs
+++ b/gen/Network/AWS/SWF/RequestCancelWorkflowExecution.hs
@@ -66,6 +66,7 @@
     , RequestCancelWorkflowExecutionResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/RespondActivityTaskCanceled.hs b/gen/Network/AWS/SWF/RespondActivityTaskCanceled.hs
--- a/gen/Network/AWS/SWF/RespondActivityTaskCanceled.hs
+++ b/gen/Network/AWS/SWF/RespondActivityTaskCanceled.hs
@@ -69,6 +69,7 @@
     , RespondActivityTaskCanceledResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/RespondActivityTaskCompleted.hs b/gen/Network/AWS/SWF/RespondActivityTaskCompleted.hs
--- a/gen/Network/AWS/SWF/RespondActivityTaskCompleted.hs
+++ b/gen/Network/AWS/SWF/RespondActivityTaskCompleted.hs
@@ -69,6 +69,7 @@
     , RespondActivityTaskCompletedResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/RespondActivityTaskFailed.hs b/gen/Network/AWS/SWF/RespondActivityTaskFailed.hs
--- a/gen/Network/AWS/SWF/RespondActivityTaskFailed.hs
+++ b/gen/Network/AWS/SWF/RespondActivityTaskFailed.hs
@@ -64,6 +64,7 @@
     , RespondActivityTaskFailedResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/RespondDecisionTaskCompleted.hs b/gen/Network/AWS/SWF/RespondDecisionTaskCompleted.hs
--- a/gen/Network/AWS/SWF/RespondDecisionTaskCompleted.hs
+++ b/gen/Network/AWS/SWF/RespondDecisionTaskCompleted.hs
@@ -53,6 +53,7 @@
     , RespondDecisionTaskCompletedResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/SignalWorkflowExecution.hs b/gen/Network/AWS/SWF/SignalWorkflowExecution.hs
--- a/gen/Network/AWS/SWF/SignalWorkflowExecution.hs
+++ b/gen/Network/AWS/SWF/SignalWorkflowExecution.hs
@@ -67,6 +67,7 @@
     , SignalWorkflowExecutionResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/StartWorkflowExecution.hs b/gen/Network/AWS/SWF/StartWorkflowExecution.hs
--- a/gen/Network/AWS/SWF/StartWorkflowExecution.hs
+++ b/gen/Network/AWS/SWF/StartWorkflowExecution.hs
@@ -79,6 +79,7 @@
     , swersResponseStatus
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/TerminateWorkflowExecution.hs b/gen/Network/AWS/SWF/TerminateWorkflowExecution.hs
--- a/gen/Network/AWS/SWF/TerminateWorkflowExecution.hs
+++ b/gen/Network/AWS/SWF/TerminateWorkflowExecution.hs
@@ -72,6 +72,7 @@
     , TerminateWorkflowExecutionResponse
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Request
 import           Network.AWS.Response
diff --git a/gen/Network/AWS/SWF/Types.hs b/gen/Network/AWS/SWF/Types.hs
--- a/gen/Network/AWS/SWF/Types.hs
+++ b/gen/Network/AWS/SWF/Types.hs
@@ -870,6 +870,7 @@
     , wtiCreationDate
     ) where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.Sign.V4
 import           Network.AWS.SWF.Types.Product
diff --git a/gen/Network/AWS/SWF/Types/Product.hs b/gen/Network/AWS/SWF/Types/Product.hs
--- a/gen/Network/AWS/SWF/Types/Product.hs
+++ b/gen/Network/AWS/SWF/Types/Product.hs
@@ -17,6 +17,7 @@
 --
 module Network.AWS.SWF.Types.Product where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.SWF.Types.Sum
 
diff --git a/gen/Network/AWS/SWF/Types/Sum.hs b/gen/Network/AWS/SWF/Types/Sum.hs
--- a/gen/Network/AWS/SWF/Types/Sum.hs
+++ b/gen/Network/AWS/SWF/Types/Sum.hs
@@ -24,7 +24,7 @@
     | ATTTScheduleToClose
     | ATTTScheduleToStart
     | ATTTStartToClose
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText ActivityTaskTimeoutType where
     parser = takeLowerText >>= \case
@@ -53,7 +53,7 @@
 data CancelTimerFailedCause
     = CTFCOperationNotPermitted
     | CTFCTimerIdUnknown
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText CancelTimerFailedCause where
     parser = takeLowerText >>= \case
@@ -78,7 +78,7 @@
 data CancelWorkflowExecutionFailedCause
     = COperationNotPermitted
     | CUnhandledDecision
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText CancelWorkflowExecutionFailedCause where
     parser = takeLowerText >>= \case
@@ -104,7 +104,7 @@
     = Abandon
     | RequestCancel
     | Terminate
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText ChildPolicy where
     parser = takeLowerText >>= \case
@@ -138,7 +138,7 @@
     | Failed
     | Terminated
     | TimedOut
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText CloseStatus where
     parser = takeLowerText >>= \case
@@ -174,7 +174,7 @@
 data CompleteWorkflowExecutionFailedCause
     = CWEFCOperationNotPermitted
     | CWEFCUnhandledDecision
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText CompleteWorkflowExecutionFailedCause where
     parser = takeLowerText >>= \case
@@ -206,7 +206,7 @@
     | CANWEFCUnhandledDecision
     | CANWEFCWorkflowTypeDeprecated
     | CANWEFCWorkflowTypeDoesNotExist
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText ContinueAsNewWorkflowExecutionFailedCause where
     parser = takeLowerText >>= \case
@@ -244,7 +244,7 @@
 
 data DecisionTaskTimeoutType =
     StartToClose
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText DecisionTaskTimeoutType where
     parser = takeLowerText >>= \case
@@ -278,7 +278,7 @@
     | SignalExternalWorkflowExecution
     | StartChildWorkflowExecution
     | StartTimer
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText DecisionType where
     parser = takeLowerText >>= \case
@@ -377,7 +377,7 @@
     | WorkflowExecutionStarted
     | WorkflowExecutionTerminated
     | WorkflowExecutionTimedOut
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText EventType where
     parser = takeLowerText >>= \case
@@ -506,7 +506,7 @@
 data ExecutionStatus
     = Closed
     | Open
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText ExecutionStatus where
     parser = takeLowerText >>= \case
@@ -531,7 +531,7 @@
 data FailWorkflowExecutionFailedCause
     = FWEFCOperationNotPermitted
     | FWEFCUnhandledDecision
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText FailWorkflowExecutionFailedCause where
     parser = takeLowerText >>= \case
@@ -555,7 +555,7 @@
 
 data LambdaFunctionTimeoutType =
     LFTTStartToClose
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText LambdaFunctionTimeoutType where
     parser = takeLowerText >>= \case
@@ -577,7 +577,7 @@
 
 data RecordMarkerFailedCause =
     OperationNotPermitted
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText RecordMarkerFailedCause where
     parser = takeLowerText >>= \case
@@ -600,7 +600,7 @@
 data RegistrationStatus
     = Deprecated
     | Registered
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText RegistrationStatus where
     parser = takeLowerText >>= \case
@@ -628,7 +628,7 @@
 data RequestCancelActivityTaskFailedCause
     = RCATFCActivityIdUnknown
     | RCATFCOperationNotPermitted
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText RequestCancelActivityTaskFailedCause where
     parser = takeLowerText >>= \case
@@ -654,7 +654,7 @@
     = RCEWEFCOperationNotPermitted
     | RCEWEFCRequestCancelExternalWorkflowExecutionRateExceeded
     | RCEWEFCUnknownExternalWorkflowExecution
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText RequestCancelExternalWorkflowExecutionFailedCause where
     parser = takeLowerText >>= \case
@@ -690,7 +690,7 @@
     | SATFCDefaultTaskListUndefined
     | SATFCOpenActivitiesLimitExceeded
     | SATFCOperationNotPermitted
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText ScheduleActivityTaskFailedCause where
     parser = takeLowerText >>= \case
@@ -735,7 +735,7 @@
     | LambdaFunctionCreationRateExceeded
     | LambdaServiceNotAvailableInRegion
     | OpenLambdaFunctionsLimitExceeded
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText ScheduleLambdaFunctionFailedCause where
     parser = takeLowerText >>= \case
@@ -765,7 +765,7 @@
     = SEWEFCOperationNotPermitted
     | SEWEFCSignalExternalWorkflowExecutionRateExceeded
     | SEWEFCUnknownExternalWorkflowExecution
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText SignalExternalWorkflowExecutionFailedCause where
     parser = takeLowerText >>= \case
@@ -801,7 +801,7 @@
     | SCWEFCWorkflowAlreadyRunning
     | SCWEFCWorkflowTypeDeprecated
     | SCWEFCWorkflowTypeDoesNotExist
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText StartChildWorkflowExecutionFailedCause where
     parser = takeLowerText >>= \case
@@ -843,7 +843,7 @@
 
 data StartLambdaFunctionFailedCause =
     AssumeRoleFailed
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText StartLambdaFunctionFailedCause where
     parser = takeLowerText >>= \case
@@ -868,7 +868,7 @@
     | STFCOperationNotPermitted
     | STFCTimerCreationRateExceeded
     | STFCTimerIdAlreadyInUse
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText StartTimerFailedCause where
     parser = takeLowerText >>= \case
@@ -896,7 +896,7 @@
 
 data WorkflowExecutionCancelRequestedCause =
     ChildPolicyApplied
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText WorkflowExecutionCancelRequestedCause where
     parser = takeLowerText >>= \case
@@ -920,7 +920,7 @@
     = WETCChildPolicyApplied
     | WETCEventLimitExceeded
     | WETCOperatorInitiated
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText WorkflowExecutionTerminatedCause where
     parser = takeLowerText >>= \case
@@ -946,7 +946,7 @@
 
 data WorkflowExecutionTimeoutType =
     WETTStartToClose
-    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+    deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic)
 
 instance FromText WorkflowExecutionTimeoutType where
     parser = takeLowerText >>= \case
diff --git a/gen/Network/AWS/SWF/Waiters.hs b/gen/Network/AWS/SWF/Waiters.hs
--- a/gen/Network/AWS/SWF/Waiters.hs
+++ b/gen/Network/AWS/SWF/Waiters.hs
@@ -15,6 +15,7 @@
 --
 module Network.AWS.SWF.Waiters where
 
+import           Network.AWS.Lens
 import           Network.AWS.Prelude
 import           Network.AWS.SWF.Types
 import           Network.AWS.Waiter
diff --git a/test/Test/AWS/SWF.hs b/test/Test/AWS/SWF.hs
--- a/test/Test/AWS/SWF.hs
+++ b/test/Test/AWS/SWF.hs
@@ -21,7 +21,6 @@
 import           Network.AWS.SWF
 import           Test.AWS.Gen.SWF
 import           Test.AWS.Prelude
-import           Test.Tasty
 
 tests :: [TestTree]
 tests = []
@@ -30,20 +29,21 @@
 fixtures =
     [ testGroup "response"
         [ testPollForActivityTaskResponse $
-            pollForActivityTaskResponse 200
-                "AAAAKgAAAAEAAAAAAAAAATZDvCYwk/hP/X1ZGdJhb+T6OWzcBx2DPhsIi5HF4aGQI4OXrDE7Ny3uM+aiAhGrmeNyVAa4yNIBQuoZuJA5G+BoaB0JuHFBOynHDTnm7ayNH43KhMkfdrDG4elfHSz3m/EtbLnFGueAr7+3NKDG6x4sTKg3cZpOtSguSx05yI1X3AtscS8ATcLB2Y3Aub1YonN/i/k67voca/GFsSiwSz3AAnJj1IPvrujgIj9KUvckwRPC5ET7d33XJcRp+gHYzZsBLVBaRmV3gEYAnp2ICslFn4YSjGy+dFXCNpOa4G1O8pczCbFUGbQ3+5wf0RSaa/xMq2pfdBKnuFp0wp8kw1k+5ZsbtDZeZn8g5GyKCLiLms/xD0OxugGGUe5ZlAoHEkTWGxZj/G32P7cMoCgrcACfFPdx1LNYYEre7YiGiyjGnfW2t5mW7VK9Np28vcXVbdpH4JNEB9OuB1xqL8N8ifPVtc72uxB1i9XEdq/8rkXasSEw4TubB2FwgqnuJstmfEhpOdb5HfhR6OwmnHuk9eszO/fUkGucTUXQP2hhB+Gz"
-                "verification-27"
-                11
+            pollForActivityTaskResponse 200 11
                 (workflowExecution "20110927-T-1" "cfa2bd33-31b0-4b75-b131-255bb0d97b3f")
                 (activityType "activityVerify" "1.0")
-                & pfatrsInput ?~ "5634-0056-4367-0923,12/12,437"
+                & pfatrsInput      ?~ "5634-0056-4367-0923,12/12,437"
+                & pfatrsActivityId ?~ "verification-27"
+                & pfatrsTaskToken  ?~
+                    "AAAAKgAAAAEAAAAAAAAAATZDvCYwk/hP/X1ZGdJhb+T6OWzcBx2DPhsIi5HF4aGQI4OXrDE7Ny3uM+aiAhGrmeNyVAa4yNIBQuoZuJA5G+BoaB0JuHFBOynHDTnm7ayNH43KhMkfdrDG4elfHSz3m/EtbLnFGueAr7+3NKDG6x4sTKg3cZpOtSguSx05yI1X3AtscS8ATcLB2Y3Aub1YonN/i/k67voca/GFsSiwSz3AAnJj1IPvrujgIj9KUvckwRPC5ET7d33XJcRp+gHYzZsBLVBaRmV3gEYAnp2ICslFn4YSjGy+dFXCNpOa4G1O8pczCbFUGbQ3+5wf0RSaa/xMq2pfdBKnuFp0wp8kw1k+5ZsbtDZeZn8g5GyKCLiLms/xD0OxugGGUe5ZlAoHEkTWGxZj/G32P7cMoCgrcACfFPdx1LNYYEre7YiGiyjGnfW2t5mW7VK9Np28vcXVbdpH4JNEB9OuB1xqL8N8ifPVtc72uxB1i9XEdq/8rkXasSEw4TubB2FwgqnuJstmfEhpOdb5HfhR6OwmnHuk9eszO/fUkGucTUXQP2hhB+Gz"
 
         , testPollForDecisionTaskResponse $
             pollForDecisionTaskResponse 200
-                "AAAAKgAAAAEAAAAAAAAAATZDvCYwk/hP/X1ZGdJhb+T6OWzcBx2DPhsIi5HF4aGQI4OXrDE7Ny3uM+aiAhGrmeNyVAa4yNIBQuoZuJA5G+BoaB0JuHFBOynHDTnm7ayNH43KhMkfdrDG4elfHSz3m/EtbLnFGueAr7+3NKDG6x4sTKg3cZpOtSguSx05yI1X3AtscS8ATcLB2Y3Aub1YonN/i/k67voca/GFsSiwSz3AAnJj1IPvrujgIj9KUvckwRPC5ET7d33XJcRp+gHYzZsBLVBaRmV3gEYAnp2ICslFn4YSjGy+dFXCNpOa4G1O8pczCbFUGbQ3+5wf0RSaa/xMq2pfdBKnuFp0wp8kw1k+5ZsbtDZeZn8g5GyKCLiLms/xD0OxugGGUe5ZlAoHEkTWGxZj/G32P7cMoCgrcACfFPdx1LNYYEre7YiGiyjGnfW2t5mW7VK9Np28vcXVbdpH4JNEB9OuB1xqL8N8ifPVtc72uxB1i9XEdq/8rkXasSEw4TubB2FwgqnuJstmfEhpOdb5HfhR6OwmnHuk9eszO/fUkGucTUXQP2hhB+Gz"
                 3
                 (workflowExecution "20110927-T-1" "06b8f87a-24b3-40b6-9ceb-9676f28e9493")
                 (workflowType "customerOrderWorkflow" "1.0")
+                & pfdtrsTaskToken              ?~
+                    "AAAAKgAAAAEAAAAAAAAAATZDvCYwk/hP/X1ZGdJhb+T6OWzcBx2DPhsIi5HF4aGQI4OXrDE7Ny3uM+aiAhGrmeNyVAa4yNIBQuoZuJA5G+BoaB0JuHFBOynHDTnm7ayNH43KhMkfdrDG4elfHSz3m/EtbLnFGueAr7+3NKDG6x4sTKg3cZpOtSguSx05yI1X3AtscS8ATcLB2Y3Aub1YonN/i/k67voca/GFsSiwSz3AAnJj1IPvrujgIj9KUvckwRPC5ET7d33XJcRp+gHYzZsBLVBaRmV3gEYAnp2ICslFn4YSjGy+dFXCNpOa4G1O8pczCbFUGbQ3+5wf0RSaa/xMq2pfdBKnuFp0wp8kw1k+5ZsbtDZeZn8g5GyKCLiLms/xD0OxugGGUe5ZlAoHEkTWGxZj/G32P7cMoCgrcACfFPdx1LNYYEre7YiGiyjGnfW2t5mW7VK9Np28vcXVbdpH4JNEB9OuB1xqL8N8ifPVtc72uxB1i9XEdq/8rkXasSEw4TubB2FwgqnuJstmfEhpOdb5HfhR6OwmnHuk9eszO/fUkGucTUXQP2hhB+Gz"
                 & pfdtrsPreviousStartedEventId ?~ 0
                 & pfdtrsEvents                 .~
                     [ historyEvent $(mkTime "2012-01-15T03:09:54.566+01:00") DecisionTaskStarted 3
