diff --git a/aws/common/cloudwatch_queries.tf b/aws/common/cloudwatch_queries.tf
new file mode 100644
index 000000000..47035733a
--- /dev/null
+++ b/aws/common/cloudwatch_queries.tf
@@ -0,0 +1,118 @@
+resource "aws_cloudwatch_query_definition" "sms-sns-blocked-as-spam" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (SNS) / Block as spam"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.sns_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+fields @timestamp as Timestamp, delivery.phoneCarrier as Carrier, delivery.providerResponse as `Provider response`, delivery.destination as `Destination phone number`
+| filter delivery.providerResponse like 'spam'
+| sort Timestamp desc
+| limit 100
+}
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "sms-sns-carrier-dwell-times" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (SNS) / Carrier dwell times"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.sns_deliveries[0].name,
+    aws_cloudwatch_log_group.sns_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+stats avg(delivery.dwellTimeMsUntilDeviceAck / 1000 / 60) as Avg_carrier_time_minutes, 
+| count(*) as Number by delivery.phoneCarrier as Carrier
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "sms-sns-get-failures" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (SNS) / Get failures"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.sns_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+fields @timestamp as Timestamp, status, delivery.phoneCarrier as Carrier, delivery.providerResponse as `Provider response`, delivery.destination as `Destination phone number`, notification.messageId as messageId, @message
+| filter status = 'FAILURE'
+| sort Timestamp desc
+| limit 200
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "sms-sns-get-sms-logs-by-phone-number" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (SNS) / Get SMS logs by phone number"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.sns_deliveries[0].name,
+    aws_cloudwatch_log_group.sns_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+fields @timestamp as Timestamp, status as Status, notification.messageId as `Message ID`,
+    delivery.destination as `Destination phone number`, delivery.providerResponse as `Provider response`,
+    delivery.smsType as `Message type`
+| filter delivery.destination like '1416xxxxxxx'
+| sort Timestamp desc
+| limit 100
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "sms-sns-international-sending-status" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (SNS) / International sending status"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.sns_deliveries[0].name,
+    aws_cloudwatch_log_group.sns_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+fields @timestamp, @message, delivery.mcc as CountryCode, status
+| stats count(*) as Event_Count by CountryCode, status
+| display CountryCode, status, Event_Count
+| sort CountryCode asc
+| limit 200
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "sms-sns-success-vs-unreachable" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (SNS) / Success vs Unreachable"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.sns_deliveries[0].name,
+    aws_cloudwatch_log_group.sns_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+fields @timestamp, delivery.providerResponse
+| parse delivery.providerResponse "Phone is currently unreachable/*" as @unavailable
+| parse delivery.providerResponse "Message has been * by phone" as @available
+| sort @timestamp desc
+| stats count(@unavailable), count(@available), count(*) by bin(1h)
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "sms-sns-unreachable-phone-numbers" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (SNS) / Unreachable phone numbers"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.sns_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+fields @timestamp, delivery.providerResponse
+| filter delivery.providerResponse like "Phone is currently unreachable/unavailable"
+| sort @timestamp desc
+| limit 20
+QUERY
+}
diff --git a/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_alarms.tf b/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_alarms.tf
index 89c830f5c..52d306670 100644
--- a/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_alarms.tf
+++ b/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_alarms.tf
@@ -149,6 +149,195 @@ resource "aws_cloudwatch_metric_alarm" "total-sms-spending-critical" {
   }
 }
 
+resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-failures-bell-warning" {
+  count               = var.cloudwatch_enabled ? 1 : 0
+  alarm_name          = "pinpoint-sms-failures-bell-warning"
+  alarm_description   = "Pinpoint SMS failures are more than 50 for Bell Cellular Inc. / Aliant Telecom."
+  comparison_operator = "GreaterThanThreshold"
+  evaluation_periods  = "1"
+  metric_name         = aws_cloudwatch_log_metric_filter.pinpoint-sms-failures-carriers[0].metric_transformation[0].name
+  namespace           = "LogMetrics"
+  period              = "300"
+  statistic           = "Sum"
+  threshold           = "50" # 50 over a period of 5 minutes
+  treat_missing_data  = "notBreaching"
+
+  dimensions = {
+    Carrier = "Bell Cellular Inc. / Aliant Telecom"
+  }
+
+  alarm_actions = [var.sns_alert_warning_arn]
+  ok_actions    = [var.sns_alert_warning_arn]
+}
+
+resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-failures-bragg-warning" {
+  count               = var.cloudwatch_enabled ? 1 : 0
+  alarm_name          = "pinpoint-sms-failures-bragg-warning"
+  alarm_description   = "Pinpoint SMS failures are more than 50 for BRAGG Communications INC."
+  comparison_operator = "GreaterThanThreshold"
+  evaluation_periods  = "1"
+  metric_name         = aws_cloudwatch_log_metric_filter.pinpoint-sms-failures-carriers[0].metric_transformation[0].name
+  namespace           = "LogMetrics"
+  period              = "300"
+  statistic           = "Sum"
+  threshold           = "50" # 50 over a period of 5 minutes
+  treat_missing_data  = "notBreaching"
+
+  dimensions = {
+    Carrier = "BRAGG Communications INC."
+  }
+
+  alarm_actions = [var.sns_alert_warning_arn]
+  ok_actions    = [var.sns_alert_warning_arn]
+}
+
+resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-failures-freedom-warning" {
+  count               = var.cloudwatch_enabled ? 1 : 0
+  alarm_name          = "pinpoint-sms-failures-freedom-warning"
+  alarm_description   = "Pinpoint SMS failures are more than 50 for Freedom Mobile Inc."
+  comparison_operator = "GreaterThanThreshold"
+  evaluation_periods  = "1"
+  metric_name         = aws_cloudwatch_log_metric_filter.pinpoint-sms-failures-carriers[0].metric_transformation[0].name
+  namespace           = "LogMetrics"
+  period              = "300"
+  statistic           = "Sum"
+  threshold           = "50" # 50 over a period of 5 minutes
+  treat_missing_data  = "notBreaching"
+
+  dimensions = {
+    Carrier = "Freedom Mobile Inc."
+  }
+
+  alarm_actions = [var.sns_alert_warning_arn]
+  ok_actions    = [var.sns_alert_warning_arn]
+}
+
+resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-failures-iristel-warning" {
+  count               = var.cloudwatch_enabled ? 1 : 0
+  alarm_name          = "pinpoint-sms-failures-iristel-warning"
+  alarm_description   = "Pinpoint SMS failures are more than 50 for Iristel Inc."
+  comparison_operator = "GreaterThanThreshold"
+  evaluation_periods  = "1"
+  metric_name         = aws_cloudwatch_log_metric_filter.pinpoint-sms-failures-carriers[0].metric_transformation[0].name
+  namespace           = "LogMetrics"
+  period              = "300"
+  statistic           = "Sum"
+  threshold           = "50" # 50 over a period of 5 minutes
+  treat_missing_data  = "notBreaching"
+
+  dimensions = {
+    Carrier = "Iristel Inc."
+  }
+
+  alarm_actions = [var.sns_alert_warning_arn]
+  ok_actions    = [var.sns_alert_warning_arn]
+}
+
+resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-failures-maritime-warning" {
+  count               = var.cloudwatch_enabled ? 1 : 0
+  alarm_name          = "pinpoint-sms-failures-maritime-warning"
+  alarm_description   = "Pinpoint SMS failures are more than 50 for Maritime Telephone & Telegraph Ltd."
+  comparison_operator = "GreaterThanThreshold"
+  evaluation_periods  = "1"
+  metric_name         = aws_cloudwatch_log_metric_filter.pinpoint-sms-failures-carriers[0].metric_transformation[0].name
+  namespace           = "LogMetrics"
+  period              = "300"
+  statistic           = "Sum"
+  threshold           = "50" # 50 over a period of 5 minutes
+  treat_missing_data  = "notBreaching"
+
+  dimensions = {
+    Carrier = "Maritime Telephone & Telegraph Ltd"
+  }
+
+  alarm_actions = [var.sns_alert_warning_arn]
+  ok_actions    = [var.sns_alert_warning_arn]
+}
+
+resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-failures-mts-warning" {
+  count               = var.cloudwatch_enabled ? 1 : 0
+  alarm_name          = "pinpoint-sms-failures-mts-warning"
+  alarm_description   = "Pinpoint SMS failures are more than 50 for MTS Communications Inc."
+  comparison_operator = "GreaterThanThreshold"
+  evaluation_periods  = "1"
+  metric_name         = aws_cloudwatch_log_metric_filter.pinpoint-sms-failures-carriers[0].metric_transformation[0].name
+  namespace           = "LogMetrics"
+  period              = "300"
+  statistic           = "Sum"
+  threshold           = "50" # 50 over a period of 5 minutes
+  treat_missing_data  = "notBreaching"
+
+  dimensions = {
+    Carrier = "MTS Communications Inc."
+  }
+
+  alarm_actions = [var.sns_alert_warning_arn]
+  ok_actions    = [var.sns_alert_warning_arn]
+}
+
+resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-failures-rogers-warning" {
+  count               = var.cloudwatch_enabled ? 1 : 0
+  alarm_name          = "pinpoint-sms-failures-rogers-warning"
+  alarm_description   = "Pinpoint SMS failures are more than 50 for Rogers Communications Canada Inc."
+  comparison_operator = "GreaterThanThreshold"
+  evaluation_periods  = "1"
+  metric_name         = aws_cloudwatch_log_metric_filter.pinpoint-sms-failures-carriers[0].metric_transformation[0].name
+  namespace           = "LogMetrics"
+  period              = "300"
+  statistic           = "Sum"
+  threshold           = "50" # 50 over a period of 5 minutes
+  treat_missing_data  = "notBreaching"
+
+  dimensions = {
+    Carrier = "Rogers Communications Canada Inc."
+  }
+
+  alarm_actions = [var.sns_alert_warning_arn]
+  ok_actions    = [var.sns_alert_warning_arn]
+}
+
+resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-failures-telus-warning" {
+  count               = var.cloudwatch_enabled ? 1 : 0
+  alarm_name          = "pinpoint-sms-failures-telus-warning"
+  alarm_description   = "Pinpoint SMS failures are more than 50 for Telus Communications"
+  comparison_operator = "GreaterThanThreshold"
+  evaluation_periods  = "1"
+  metric_name         = aws_cloudwatch_log_metric_filter.pinpoint-sms-failures-carriers[0].metric_transformation[0].name
+  namespace           = "LogMetrics"
+  period              = "300"
+  statistic           = "Sum"
+  threshold           = "50" # 50 over a period of 5 minutes
+  treat_missing_data  = "notBreaching"
+
+  dimensions = {
+    Carrier = "Telus Communications"
+  }
+
+  alarm_actions = [var.sns_alert_warning_arn]
+  ok_actions    = [var.sns_alert_warning_arn]
+}
+
+resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-failures-videotron-warning" {
+  count               = var.cloudwatch_enabled ? 1 : 0
+  alarm_name          = "pinpoint-sms-failures-videotron-warning"
+  alarm_description   = "Pinpoint SMS failures are more than 50 for Videotron Ltd."
+  comparison_operator = "GreaterThanThreshold"
+  evaluation_periods  = "1"
+  metric_name         = aws_cloudwatch_log_metric_filter.pinpoint-sms-failures-carriers[0].metric_transformation[0].name
+  namespace           = "LogMetrics"
+  period              = "300"
+  statistic           = "Sum"
+  threshold           = "50" # 50 over a period of 5 minutes
+  treat_missing_data  = "notBreaching"
+
+  dimensions = {
+    Carrier = "Videotron Ltd."
+  }
+
+  alarm_actions = [var.sns_alert_warning_arn]
+  ok_actions    = [var.sns_alert_warning_arn]
+}
+
 resource "aws_cloudwatch_metric_alarm" "pinpoint-sms-success-rate-warning" {
   count               = var.cloudwatch_enabled ? 1 : 0
   alarm_name          = "pinpoint-sms-success-rate-warning"
diff --git a/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_logs.tf b/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_logs.tf
index 754a887c7..8144b4c18 100644
--- a/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_logs.tf
+++ b/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_logs.tf
@@ -3,6 +3,7 @@
 #
 
 resource "aws_cloudwatch_log_group" "pinpoint_deliveries" {
+  count             = var.cloudwatch_enabled ? 1 : 0
   name              = "sns/${var.region}/${var.account_id}/PinpointDirectPublishToPhoneNumber"
   retention_in_days = var.sensitive_log_retention_period_days
   tags = {
@@ -11,6 +12,7 @@ resource "aws_cloudwatch_log_group" "pinpoint_deliveries" {
 }
 
 resource "aws_cloudwatch_log_group" "pinpoint_deliveries_failures" {
+  count             = var.cloudwatch_enabled ? 1 : 0
   name              = "sns/${var.region}/${var.account_id}/PinpointDirectPublishToPhoneNumber/Failure"
   retention_in_days = var.sensitive_log_retention_period_days
   tags = {
@@ -54,7 +56,7 @@ resource "aws_cloudwatch_log_metric_filter" "pinpoint-sms-blocked-as-spam" {
   name  = "pinpoint-sms-blocked-as-spam"
   # See https://docs.aws.amazon.com/sms-voice/latest/userguide/configuration-sets-event-format.html
   pattern        = "{ $.messageStatus = \"SPAM\" }"
-  log_group_name = aws_cloudwatch_log_group.pinpoint_deliveries_failures.name
+  log_group_name = aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
 
   metric_transformation {
     name          = "pinpoint-sms-blocked-as-spam"
@@ -69,7 +71,7 @@ resource "aws_cloudwatch_log_metric_filter" "pinpoint-sms-phone-carrier-unavaila
   name  = "pinpoint-sms-phone-carrier-unavailable"
   # See https://docs.aws.amazon.com/sms-voice/latest/userguide/configuration-sets-event-format.html
   pattern        = "{ $.messageStatus = \"CARRIER_UNREACHABLE\" }"
-  log_group_name = aws_cloudwatch_log_group.pinpoint_deliveries_failures.name
+  log_group_name = aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
 
   metric_transformation {
     name          = "pinpoint-sms-phone-carrier-unavailable"
@@ -85,7 +87,7 @@ resource "aws_cloudwatch_log_metric_filter" "pinpoint-sms-rate-exceeded" {
   # https://docs.aws.amazon.com/sns/latest/dg/channels-sms-originating-identities-long-codes.html
   # Canadian long code numbers are limited at 1 SMS per second/number
   pattern        = "{ $.messageStatusDescription = \"Rate exceeded.\" }"
-  log_group_name = aws_cloudwatch_log_group.pinpoint_deliveries_failures.name
+  log_group_name = aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
 
   metric_transformation {
     name          = "pinpoint-sms-rate-exceeded"
@@ -99,7 +101,7 @@ resource "aws_cloudwatch_log_metric_filter" "pinpoint-sms-successes" {
   count          = var.cloudwatch_enabled ? 1 : 0
   name           = "pinpoint-sms-successes"
   pattern        = "{ ($.isFinal IS TRUE) && ( ($.messageStatus = \"SUCCESSFUL\") || ($.messageStatus = \"DELIVERED\") ) }"
-  log_group_name = aws_cloudwatch_log_group.pinpoint_deliveries.name
+  log_group_name = aws_cloudwatch_log_group.pinpoint_deliveries[0].name
 
   metric_transformation {
     name          = "pinpoint-sms-successes"
@@ -113,7 +115,7 @@ resource "aws_cloudwatch_log_metric_filter" "pinpoint-sms-failures" {
   count          = var.cloudwatch_enabled ? 1 : 0
   name           = "pinpoint-sms-failures"
   pattern        = "{ ($.isFinal IS TRUE) && ( ($.messageStatus != \"SUCCESSFUL\") && ($.messageStatus != \"DELIVERED\") ) }"
-  log_group_name = aws_cloudwatch_log_group.pinpoint_deliveries_failures.name
+  log_group_name = aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
 
   metric_transformation {
     name          = "pinpoint-sms-failures"
@@ -122,3 +124,20 @@ resource "aws_cloudwatch_log_metric_filter" "pinpoint-sms-failures" {
     default_value = "0"
   }
 }
+
+resource "aws_cloudwatch_log_metric_filter" "pinpoint-sms-failures-carriers" {
+  count          = var.cloudwatch_enabled ? 1 : 0
+  log_group_name = aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
+
+  name    = "pinpoint-sms-failures-carriers"
+  pattern = "{ ($.isFinal IS TRUE) && ($.carrierName != \"\" && ( ($.messageStatus != \"SUCCESSFUL\") && ($.messageStatus != \"DELIVERED\") )) }"
+
+  metric_transformation {
+    name      = "pinpoint-sms-failures-carriers"
+    namespace = "LogMetrics"
+    value     = "1"
+    dimensions = {
+      Carrier = "$.carrierName"
+    }
+  }
+}
diff --git a/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_queries.tf b/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_queries.tf
index 59f6a733b..4a03798a7 100644
--- a/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_queries.tf
+++ b/aws/pinpoint_to_sqs_sms_callbacks/cloudwatch_queries.tf
@@ -1,15 +1,176 @@
-resource "aws_cloudwatch_query_definition" "pinpoint-logs" {
+resource "aws_cloudwatch_query_definition" "pinpoint-sms-blocked-as-spam" {
   count = var.cloudwatch_enabled ? 1 : 0
-  name  = "SMS / Pinpoint logs"
+  name  = "SMS (Pinpoint) / Block as spam"
 
   log_group_names = [
-    aws_cloudwatch_log_group.pinpoint_deliveries.name
+    aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
   ]
 
   query_string = <<QUERY
-fields @timestamp, destinationPhoneNumber, messageStatus, messageStatusDescription, @logStream
+fields @timestamp as Timestamp, carrierName as Carrier, messageStatus as `Provider response`, 
+originationPhoneNumber as `Origination phone number`, destinationPhoneNumber as `Destination phone number`, 
+messageId as `Message ID`, messageStatus as `Message Status`, 
+messageStatusDescription as `Message status description`, @message
+| filter isFinal
+| filter eventType = 'TEXT_SPAM'
+| sort Timestamp desc
+| limit 100
+}
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "pinpoint-sms-carrier-dwell-times" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (Pinpoint) / Carrier dwell times"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.pinpoint_deliveries[0].name,
+    aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name,
+  ]
+
+  query_string = <<QUERY
+stats avg((eventTimestamp - messageRequestTimestamp) / 1000 / 60) as Avg_carrier_time_minutes,
+count(*) as Number by carrierName as Carrier
+| filter isFinal
+| sort by Avg_carrier_time_minutes desc
+| limit 100
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "pinpoint-sms-failures-by-carrier" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (Pinpoint) / Failures by carrier"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.pinpoint_deliveries[0].name,
+    aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name,
+  ]
+
+  query_string = <<QUERY
+filter isFinal
+| filter messageStatus not like /DELIVERED|SUCCESSFUL/
+| stats count(*) as Total by coalesce(carrierName, 'Unknown/VOIP') as Carrier, messageStatus as MessageStatus
+| sort by Total desc
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "pinpoint-sms-get-failures" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (Pinpoint) / Get failures"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+fields @timestamp as Timestamp, carrierName as Carrier, messageStatus as `Provider response`, 
+originationPhoneNumber as `Origination phone number`, destinationPhoneNumber as `Destination phone number`, 
+messageId as `Message ID`, messageStatus as `Message Status`, 
+messageStatusDescription as `Message status description`, @message
 | filter isFinal
 | sort @timestamp desc
 | limit 100
 QUERY
 }
+
+resource "aws_cloudwatch_query_definition" "pinpoint-sms-international-sending-status" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (Pinpoint) / International sending status"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.pinpoint_deliveries[0].name,
+    aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+fields @timestamp, @message
+| parse @message /"isoCountryCode":"(?<Country>[^"]+)"/
+| parse @message /"eventType":"(?<Event_Type>[^"]+)"/
+| parse @message /"isFinal":(?<Is_Final>\w+)/
+| filter Is_Final = "true"
+| stats count(*) as Event_Count by Country, Event_Type
+| display Country, Event_Type, Event_Count
+| sort Country asc
+| limit 100
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "pinpoint-sms-get-sms-logs-by-dest-phone-number" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (Pinpoint) / Get SMS logs by destination phone number"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.pinpoint_deliveries[0].name,
+    aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+fields @timestamp as Timestamp, carrierName as Carrier, messageStatus as `Provider response`, 
+originationPhoneNumber as `Origination phone number`, destinationPhoneNumber as `Destination phone number`, 
+messageId as `Message ID`, messageStatus as `Message Status`, 
+messageStatusDescription as `Message status description`, @message
+| filter destinationPhoneNumber like '+1416xxxxxxx'
+| sort Timestamp desc
+| limit 100
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "pinpoint-sms-get-sms-logs-by-orig-phone-number" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (Pinpoint) / Get SMS logs by origination phone number"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.pinpoint_deliveries[0].name,
+    aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+fields @timestamp as Timestamp, carrierName as Carrier, messageStatus as `Provider response`, 
+originationPhoneNumber as `Origination phone number`, destinationPhoneNumber as `Destination phone number`, 
+messageId as `Message ID`, messageStatus as `Message Status`, 
+messageStatusDescription as `Message status description`, @message
+| filter originationPhoneNumber like '237762'
+| sort Timestamp desc
+| limit 100
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "pinpoint-sms-get-logs" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (Pinpoint) / Logs"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.pinpoint_deliveries[0].name,
+    aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+fields @timestamp as Timestamp, carrierName as Carrier, messageStatus as `Provider response`, 
+originationPhoneNumber as `Origination phone number`, destinationPhoneNumber as `Destination phone number`, 
+messageId as `Message ID`, messageStatus as `Message Status`, 
+messageStatusDescription as `Message status description`, @message
+| filter isFinal
+| sort @timestamp desc
+| limit 100
+QUERY
+}
+
+resource "aws_cloudwatch_query_definition" "pinpoint-sms-success-vs-unreachable" {
+  count = var.cloudwatch_enabled ? 1 : 0
+  name  = "SMS (Pinpoint) / Success vs Unreachable"
+
+  log_group_names = [
+    aws_cloudwatch_log_group.pinpoint_deliveries[0].name,
+    aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
+  ]
+
+  query_string = <<QUERY
+fields @timestamp as Timestamp, carrierName as Carrier, messageStatus as `Provider response`, 
+originationPhoneNumber as `Origination phone number`, destinationPhoneNumber as `Destination phone number`, 
+messageId as `Message ID`, messageStatus as `Message Status`, 
+messageStatusDescription as `Message status description`, @message
+| parse messageStatusDescription "Phone is currently unreachable/*" as @unavailable
+| parse messageStatusDescription "Message has been * by phone" as @available
+| stats count(@unavailable) as Unavailable, count(@available) as Available, count(*) as Total by bin(1h)
+QUERY
+}
diff --git a/aws/pinpoint_to_sqs_sms_callbacks/iam.tf b/aws/pinpoint_to_sqs_sms_callbacks/iam.tf
index 78fcf90ae..b0e63e2b2 100644
--- a/aws/pinpoint_to_sqs_sms_callbacks/iam.tf
+++ b/aws/pinpoint_to_sqs_sms_callbacks/iam.tf
@@ -48,8 +48,8 @@ data "aws_iam_policy_document" "pinpoint_logs" {
       "logs:PutLogEvents"
     ]
     resources = [
-      "${aws_cloudwatch_log_group.pinpoint_deliveries.arn}:*",
-      "${aws_cloudwatch_log_group.pinpoint_deliveries_failures.arn}:*"
+      "${aws_cloudwatch_log_group.pinpoint_deliveries[0].arn}:*",
+      "${aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].arn}:*"
     ]
   }
 }
diff --git a/aws/pinpoint_to_sqs_sms_callbacks/lambda.tf b/aws/pinpoint_to_sqs_sms_callbacks/lambda.tf
index 3d5890c2a..77a86cc8a 100644
--- a/aws/pinpoint_to_sqs_sms_callbacks/lambda.tf
+++ b/aws/pinpoint_to_sqs_sms_callbacks/lambda.tf
@@ -30,13 +30,13 @@ resource "aws_lambda_permission" "allow_cloudwatch_logs_pinpoint_successes" {
   action        = "lambda:InvokeFunction"
   function_name = module.pinpoint_to_sqs_sms_callbacks.function_name
   principal     = "logs.${var.region}.amazonaws.com"
-  source_arn    = "${aws_cloudwatch_log_group.pinpoint_deliveries.arn}:*"
+  source_arn    = "${aws_cloudwatch_log_group.pinpoint_deliveries[0].arn}:*"
 }
 
 resource "aws_cloudwatch_log_subscription_filter" "pinpoint_deliveries_ca_central_to_lambda" {
   count           = var.cloudwatch_enabled ? 1 : 0
   name            = "pinpoint_deliveries_ca_central"
-  log_group_name  = aws_cloudwatch_log_group.pinpoint_deliveries.name
+  log_group_name  = aws_cloudwatch_log_group.pinpoint_deliveries[0].name
   filter_pattern  = ""
   destination_arn = module.pinpoint_to_sqs_sms_callbacks.function_arn
 }
@@ -46,13 +46,13 @@ resource "aws_lambda_permission" "allow_cloudwatch_logs_pinpoint_failures" {
   action        = "lambda:InvokeFunction"
   function_name = module.pinpoint_to_sqs_sms_callbacks.function_name
   principal     = "logs.${var.region}.amazonaws.com"
-  source_arn    = "${aws_cloudwatch_log_group.pinpoint_deliveries_failures.arn}:*"
+  source_arn    = "${aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].arn}:*"
 }
 
 resource "aws_cloudwatch_log_subscription_filter" "pinpoint_deliveries_failures_ca_central_to_lambda" {
   count           = var.cloudwatch_enabled ? 1 : 0
   name            = "pinpoint_deliveries_failures_ca_central"
-  log_group_name  = aws_cloudwatch_log_group.pinpoint_deliveries_failures.name
+  log_group_name  = aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].name
   filter_pattern  = ""
   destination_arn = module.pinpoint_to_sqs_sms_callbacks.function_arn
 }
diff --git a/aws/pinpoint_to_sqs_sms_callbacks/pools.tf b/aws/pinpoint_to_sqs_sms_callbacks/pools.tf
index 322620f0d..e3f663027 100644
--- a/aws/pinpoint_to_sqs_sms_callbacks/pools.tf
+++ b/aws/pinpoint_to_sqs_sms_callbacks/pools.tf
@@ -2,6 +2,6 @@ resource "null_resource" "create_pools" {
   depends_on = [aws_iam_role.pinpoint_logs, aws_cloudwatch_log_group.pinpoint_deliveries, aws_cloudwatch_log_group.pinpoint_deliveries_failures]
 
   provisioner "local-exec" {
-    command = "./create_pinpoint_pools.sh ${aws_iam_role.pinpoint_logs.arn} ${aws_cloudwatch_log_group.pinpoint_deliveries.arn} ${aws_cloudwatch_log_group.pinpoint_deliveries_failures.arn}"
+    command = "./create_pinpoint_pools.sh ${aws_iam_role.pinpoint_logs.arn} ${aws_cloudwatch_log_group.pinpoint_deliveries[0].arn} ${aws_cloudwatch_log_group.pinpoint_deliveries_failures[0].arn}"
   }
 }
diff --git a/aws/quicksight/dataset_sms_usage_notifications.tf b/aws/quicksight/dataset_sms_usage_notifications.tf
index 9d4a03d35..42ef1618e 100644
--- a/aws/quicksight/dataset_sms_usage_notifications.tf
+++ b/aws/quicksight/dataset_sms_usage_notifications.tf
@@ -50,7 +50,6 @@ resource "aws_cloudformation_stack" "sms-usage-notifications" {
             }
           ],
 
-
           LogicalTableMap = {
 
             sms-usage-notifications = {