Added AWS and AUTH