Added some attempt at AWS support as an alternative