Added stuff for AWS access