Updated to the latest AmazonSDK