Migrate to AWS SDK