Update for aws2