Improve aws utility.