Updated to use Amazon SDK 2.3.5.0