Add support for --aws