Switch to Amazon SDK