Added AWS support.