Added AWS support