Added more AWS vars