Updated for compatibility with AWS .NET SDK 2.0