Update for newer AWS-SDK API