Improvement of AWS driver