Changed AWS constants