Updated for latest version of AWS SDK