Changed to newer AWS Lib