Added support for Amazon CloudWatch