adding support for Amazon CloudWatch