Added some AWS stuff