Added support for CloudWatch.