Added AWS utils