Updating to work with the Command Line Interface [http://aws.amazon.com/cli/]