Updating to conform to Amazon Services